From 7373fa488ff386ca2e9f455c806438d4883f1919 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 18 Aug 2022 17:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AC=E6=9B=B4=E6=96=B0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/platform/common/controller/org.ts     |  3 ++-
 .../Form/src/components/ApiCascader.vue       | 19 +++----------------
 src/views/common/org/OrgModal.vue             | 16 ++++++++++++++--
 src/views/common/org/org.data.ts              |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/api/platform/common/controller/org.ts b/src/api/platform/common/controller/org.ts
index dde00cf..fa66841 100644
--- a/src/api/platform/common/controller/org.ts
+++ b/src/api/platform/common/controller/org.ts
@@ -1,4 +1,5 @@
 import { OrgParams, Org, OrgResult } from '/@/api/platform/common/entity/org';
+import { ResultVo } from '/@/api/common/base/entity';
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
@@ -15,6 +16,6 @@ export const addOrg = (params: Partial<Org>) => defHttp.post({ url: Api.save, da
 
 export const editOrg = (params: Partial<Org>) => defHttp.put({ url: Api.edit, data: params });
 
-export const getOrg = (id: string) => defHttp.get<Org>({ url: `${Api.get}/${id}` });
+export const getOrg = (id: string) => defHttp.get<ResultVo>({ url: `${Api.get}/${id}` });
 
 export const delOrg = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });
diff --git a/src/components/Form/src/components/ApiCascader.vue b/src/components/Form/src/components/ApiCascader.vue
index 7e869f7..f772b28 100644
--- a/src/components/Form/src/components/ApiCascader.vue
+++ b/src/components/Form/src/components/ApiCascader.vue
@@ -1,10 +1,10 @@
 <template>
   <a-cascader
     v-model:value="state"
+    v-bind="$attrs"
     :options="options"
     :load-data="loadData"
     change-on-select
-    :displayRender="handleRenderDisplay"
     @change="handleChange"
   >
     <template v-if="loading" #suffixIcon>
@@ -40,6 +40,7 @@
       LoadingOutlined,
       [Cascader.name]: Cascader,
     },
+    inheritAttrs: false,
     props: {
       value: {
         type: Array,
@@ -64,10 +65,7 @@
       isLeaf: {
         type: Function as PropType<(arg: Recordable) => boolean>,
         default: null,
-      },
-      displayRenderArray: {
-        type: Array,
-      },
+      }
     },
     emits: ['change', 'defaultChange'],
     setup(props, { emit }) {
@@ -174,16 +172,6 @@
         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,
@@ -191,7 +179,6 @@
         t,
         handleChange,
         loadData,
-        handleRenderDisplay,
       };
     },
   });
diff --git a/src/views/common/org/OrgModal.vue b/src/views/common/org/OrgModal.vue
index 8ba4639..01bd908 100644
--- a/src/views/common/org/OrgModal.vue
+++ b/src/views/common/org/OrgModal.vue
@@ -14,7 +14,7 @@
    * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
    * author entfrm开发团队-王翔
    */
-  import { ref, unref } from 'vue';
+  import { ref, unref} from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { institutionFormSchema } from './org.data';
   import { addOrg, getOrg, editOrg } from '/@/api/platform/common/controller/org';
@@ -45,7 +45,19 @@
         break;
       case 'edit':
         props.title = '编辑机构';
-        await setFieldsValue(await getOrg(id));
+        const result = await getOrg(id);
+        const org = result.result;
+        if (result?.extend) {
+          await updateSchema({
+            field: 'regionIds',
+            componentProps: {
+              displayRender: value => {
+                result?.extend.join(' / ');
+              }
+            }
+          });
+        }
+        await setFieldsValue(org);
         break;
     }
     // 尾部:设置处理后的最终配置数据
diff --git a/src/views/common/org/org.data.ts b/src/views/common/org/org.data.ts
index 92b574f..6cc9e9a 100644
--- a/src/views/common/org/org.data.ts
+++ b/src/views/common/org/org.data.ts
@@ -173,7 +173,7 @@ export const institutionFormSchema: FormSchema[] = [
     required: true
   },
   {
-    field: 'addressIds',
+    field: 'regionIds',
     label: '城市地址',
     component: 'ApiCascader',
     componentProps: {