From 2bffff786971ce85ca991d4f8c722362bc669eda Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Tue, 1 Aug 2023 18:11:32 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=85=BC=E5=AE=B9ant3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/common/project/project.data.ts      |  1 -
 src/views/system/config/config.data.ts        |  2 +-
 src/views/system/config/index.vue             | 40 ++++++++++---------
 src/views/system/dept/dept.data.ts            |  1 -
 src/views/system/region/region.data.ts        |  1 -
 .../workflow/extension/form/form.data.ts      | 18 ++-------
 src/views/workflow/extension/form/index.vue   | 35 ++++++++++------
 7 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/src/views/common/project/project.data.ts b/src/views/common/project/project.data.ts
index 3faf8d3..f010931 100644
--- a/src/views/common/project/project.data.ts
+++ b/src/views/common/project/project.data.ts
@@ -100,7 +100,6 @@ export const formSchema: FormSchema[] = [
         key: 'id',
         value: 'id',
       },
-      getPopupContainer: () => document.body,
     }
   },
   {
diff --git a/src/views/system/config/config.data.ts b/src/views/system/config/config.data.ts
index 1808a64..04e7942 100644
--- a/src/views/system/config/config.data.ts
+++ b/src/views/system/config/config.data.ts
@@ -53,7 +53,7 @@ export const columns: ColumnProps<any>[] = [
     title: '操作',
     align: 'center',
     dataIndex: 'action',
-    slots: { customRender: 'action' },
+    //slots: { customRender: 'action' },
     fixed: false
   }
 ];
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 9fce66e..0594c63 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -144,25 +144,27 @@
           </div>
         </div>
       </template>
-      <template #action="{ record }">
-        <div :class="[`${prefixCls}__action`, 'center']">
-          <a-button
-            v-auth="['config_edit']"
-            type="link"
-            size="small"
-            @click="handleEdit(record)"
-          ><Icon icon="fa6-regular:pen-to-square" :size="14"/>修改
-          </a-button>
-          <ADivider type="vertical" class="action-divider"/>
-          <a-button
-            v-auth="['config_del']"
-            type="link"
-            size="small"
-            color="error"
-            @click="handleDel(record)"
-          ><Icon icon="ant-design:delete-outlined" :size="15"/>删除
-          </a-button>
-        </div>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.dataIndex === 'action'">
+          <div :class="[`${prefixCls}__action`, 'center']">
+            <a-button
+              v-auth="['config_edit']"
+              type="link"
+              size="small"
+              @click="handleEdit(record)"
+            ><Icon icon="fa6-regular:pen-to-square" :size="14"/>修改
+            </a-button>
+            <ADivider type="vertical" class="action-divider"/>
+            <a-button
+              v-auth="['config_del']"
+              type="link"
+              size="small"
+              color="error"
+              @click="handleDel(record)"
+            ><Icon icon="ant-design:delete-outlined" :size="15"/>删除
+            </a-button>
+          </div>
+        </template>
       </template>
     </ATable>
     <!--弹出窗体区域-->
diff --git a/src/views/system/dept/dept.data.ts b/src/views/system/dept/dept.data.ts
index 725298b..72e191b 100644
--- a/src/views/system/dept/dept.data.ts
+++ b/src/views/system/dept/dept.data.ts
@@ -100,7 +100,6 @@ export const formSchema: FormSchema[] = [
         key: 'deptId',
         value: 'deptId',
       },
-      getPopupContainer: () => document.body,
     }
   },
   {
diff --git a/src/views/system/region/region.data.ts b/src/views/system/region/region.data.ts
index 3f24c03..8358673 100644
--- a/src/views/system/region/region.data.ts
+++ b/src/views/system/region/region.data.ts
@@ -76,7 +76,6 @@ export const regionFormSchema: FormSchema[] = [
         key: 'id',
         value: 'id'
       },
-      getPopupContainer: () => document.body,
     }
   },
   {
diff --git a/src/views/workflow/extension/form/form.data.ts b/src/views/workflow/extension/form/form.data.ts
index 1fd7e88..8808df6 100644
--- a/src/views/workflow/extension/form/form.data.ts
+++ b/src/views/workflow/extension/form/form.data.ts
@@ -48,20 +48,10 @@ export const columns: BasicColumn[] = [
 /** 搜索表单配置 */
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'categoryId',
     label: '表单分类',
-    component: 'ApiTreeSelect',
-    componentProps: {
-      placeholder: '请选择分类',
-      fieldNames: {
-        label: 'name',
-        key: 'id',
-        value: 'id'
-      },
-      getPopupContainer: () => document.body,
-      api: listFormCategory,
-      listToTree: true,
-    },
+    field: 'categoryId',
+    slot: 'categoryId',
+    component: 'Input',
     colProps: { span: 8 }
   },
   {
@@ -93,7 +83,6 @@ export const formSchema: FormSchema[] = [
         key: 'id',
         value: 'id'
       },
-      getPopupContainer: () => document.body,
       api: listFormCategory,
       listToTree: true,
     },
@@ -128,7 +117,6 @@ export const formCategorySchema: FormSchema[] = [
         key: 'id',
         value: 'id'
       },
-      getPopupContainer: () => document.body,
     },
     required: true,
   },
diff --git a/src/views/workflow/extension/form/index.vue b/src/views/workflow/extension/form/index.vue
index 7e455af..040a084 100644
--- a/src/views/workflow/extension/form/index.vue
+++ b/src/views/workflow/extension/form/index.vue
@@ -99,6 +99,19 @@
           />
         </template>
       </template>
+      <template #form-categoryId>
+        <ApiTreeSelect
+          ref="formCategoryIdElRef"
+          placeholder="请选择表单分类"
+          :fieldNames="{
+            label: 'name',
+            key: 'id',
+            value: 'id'
+          }"
+          :api="listFormCategory"
+          :listToTree="true"
+        />
+      </template>
     </BasicTable>
     <FormModal @register="registerModal" @success="handleRefreshTable"/>
     <FormCategoryModal @register="registerFormCategoryModal" @success="handleRefreshTree"/>
@@ -107,7 +120,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, reactive, toRaw, onMounted } from 'vue';
+  import { defineComponent, reactive, toRaw, onMounted, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { listFormDefinition, delFormDefinition, } from '/@/api/platform/workflow/extension/controller/formDefinition';
   import { PageWrapper } from '/@/components/Page';
@@ -122,13 +135,13 @@
   import { listFormCategory, delFormCategory } from '/@/api/platform/workflow/extension/controller/formCategory';
   import { PlusOutlined, FormOutlined, DeleteOutlined } from '@ant-design/icons-vue';
   import { useRouter } from 'vue-router';
+  import ApiTreeSelect from '/@/components/Form/src/components/ApiTreeSelect.vue';
 
   /** 类型规范统一声明定义区域 */
   interface TableState {
     ids: string[];
     single: boolean;
     multiple: boolean;
-    searchInfo: Recordable;
     treeData: TreeItem[];
   }
 
@@ -144,7 +157,8 @@
       FormOutlined,
       DeleteOutlined,
       WorkflowFormDesign,
-      FormCategoryModal
+      FormCategoryModal,
+      ApiTreeSelect
     },
     setup() {
 
@@ -156,11 +170,10 @@
         single: true,
         // 非多个禁用
         multiple: true,
-        // 搜索信息
-        searchInfo: {},
         treeData: []
       });
       const { push } = useRouter();
+      const formCategoryIdElRef = ref();
       const { createConfirm, createMessage } = useMessage();
       const [registerModal, { openModal }] = useModal();
       const [registerFormCategoryModal, { openModal: openFormCategoryModal }] = useModal();
@@ -184,7 +197,6 @@
         bordered: true,
         clickToRowSelect: false,
         showIndexColumn: false,
-        searchInfo: state.searchInfo,
         actionColumn: {
           width: 220,
           title: '操作',
@@ -266,12 +278,7 @@
       /** 处理树形列表刷新 */
       async function handleRefreshTree() {
         state.treeData = listToTree(await listFormCategory());
-        await getForm().updateSchema({
-          field: 'categoryId',
-          componentProps: {
-            treeData: state.treeData
-          }
-        });
+        await getForm().resetFields();
       }
 
       /** 处理工作流表单设计 */
@@ -309,7 +316,9 @@
         handleRefreshTree,
         handleFormCategoryAdd,
         handleFormCategoryEdit,
-        handleFormCategoryDel
+        handleFormCategoryDel,
+        listFormCategory,
+        formCategoryIdElRef
       };
     }
   });