From cf22cbc2e876629100dd4c1d3f5f1a3ef0d8fb4d Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 19 Aug 2022 17:24:02 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/components/ApiCascader.vue       | 18 ++++++++++-
 src/views/common/org/OrgModal.vue             | 30 +++++++++----------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/components/Form/src/components/ApiCascader.vue b/src/components/Form/src/components/ApiCascader.vue
index f772b28..26aaa3f 100644
--- a/src/components/Form/src/components/ApiCascader.vue
+++ b/src/components/Form/src/components/ApiCascader.vue
@@ -5,6 +5,7 @@
     :options="options"
     :load-data="loadData"
     change-on-select
+    :displayRender="handleRenderDisplay"
     @change="handleChange"
   >
     <template v-if="loading" #suffixIcon>
@@ -65,7 +66,10 @@
       isLeaf: {
         type: Function as PropType<(arg: Recordable) => boolean>,
         default: null,
-      }
+      },
+      displayRenderArray: {
+        type: Array,
+      },
     },
     emits: ['change', 'defaultChange'],
     setup(props, { emit }) {
@@ -172,11 +176,23 @@
         emit('defaultChange', keys, args);
       }
 
+      function handleRenderDisplay({ labels, selectedOptions }) {
+        if (unref(emitData).length === selectedOptions.length) {
+          return labels.join(' / ');
+        }
+        if (props.displayRenderArray) {
+          return props.displayRenderArray.join(' / ');
+        }
+        return '';
+      }
+
+
       return {
         state,
         options,
         loading,
         t,
+        handleRenderDisplay,
         handleChange,
         loadData,
       };
diff --git a/src/views/common/org/OrgModal.vue b/src/views/common/org/OrgModal.vue
index 01bd908..77d222d 100644
--- a/src/views/common/org/OrgModal.vue
+++ b/src/views/common/org/OrgModal.vue
@@ -14,14 +14,16 @@
    * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
    * author entfrm开发团队-王翔
    */
-  import { ref, unref} from 'vue';
+  import { reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { institutionFormSchema } from './org.data';
   import { addOrg, getOrg, editOrg } from '/@/api/platform/common/controller/org';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
 
   /** 通用变量统一声明区域 */
-  const tag = ref<Nullable<string>>('');
+  const state = reactive({
+    tag: ''
+  });
   /** https://v3.cn.vuejs.org/api/options-data.html#emits */
   const emit = defineEmits(['success', 'register']);
   const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
@@ -35,11 +37,11 @@
     await resetFields();
     await clearValidate();
     // 处理设置数据
-    tag.value = data._tag;
+    state.tag = data._tag;
     const id = data.record?.id;
     const props: Partial<ModalProps> = { confirmLoading: false };
     // 采用tag标签区分操作
-    switch (unref(tag)) {
+    switch (state.tag) {
       case 'add':
         props.title = '新增机构';
         break;
@@ -47,16 +49,13 @@
         props.title = '编辑机构';
         const result = await getOrg(id);
         const org = result.result;
-        if (result?.extend) {
-          await updateSchema({
-            field: 'regionIds',
-            componentProps: {
-              displayRender: value => {
-                result?.extend.join(' / ');
-              }
-            }
-          });
-        }
+        org.regionIds = result.extend;
+        await updateSchema({
+          field: 'regionIds',
+          componentProps: {
+            displayRenderArray: result.extend
+          }
+        });
         await setFieldsValue(org);
         break;
     }
@@ -71,8 +70,9 @@
       const formData = await validate();
       // 处理提交之前逻辑
       setModalProps({ confirmLoading: true });
+      formData.regionIds = formData.regionIds.join();
       // 采用tag标签区分操作
-      switch (unref(tag)) {
+      switch (state.tag) {
         case 'add':
           await addOrg(formData);
           break;