From fb218fd3540f5efe0be1da8f27bf72a85e35678a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com>
Date: Thu, 16 May 2024 18:00:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A1=A8=E6=A0=BC=E9=A1=B5=E9=9D=A2=E6=A0=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BF=AE=E6=AD=A3=E3=80=812.=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=9F=BA=E7=A1=80=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E6=8E=A7=E4=BB=B6=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?bug=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/demo/formScheme.ts                    |  2 +-
 .../VFormDesign/components/ComponentProps.vue |  4 +-
 .../components/VFormDesign/index.vue          | 57 +++++++++++--------
 .../components/VFormItem/index.vue            |  1 -
 .../demo/form-design/core/formItemConfig.ts   | 45 +++++++--------
 .../demo/onlineform/formModule/FormModal.vue  |  1 -
 .../onlineform/formModule/config/columns.vue  |  2 +-
 .../demo/onlineform/formModule/index.vue      | 15 ++++-
 .../onlineform/formModule/modalDesign.vue     | 51 ++++++++++-------
 .../onlineform/formModule/modalForm-Modal.vue |  3 +-
 .../demo/onlineform/formModule/modalForm.vue  |  5 +-
 .../demo/onlineform/formdesign/index.vue      | 15 ++++-
 .../formdesign/modal/AutomaticModal.vue       |  3 +-
 13 files changed, 123 insertions(+), 81 deletions(-)

diff --git a/src/api/demo/formScheme.ts b/src/api/demo/formScheme.ts
index 47324c86..aeb8dea0 100644
--- a/src/api/demo/formScheme.ts
+++ b/src/api/demo/formScheme.ts
@@ -88,7 +88,7 @@ export function functionLoadFormSort(params: AccountParams) {
 
 export function functionAddFormSort(params: FromSortModel) {
   return defHttp.post({
-    url: Api.AddFormSort,
+    url: Api.AddFormSort + '?code=FormSort',
     params,
   });
 }
diff --git a/src/views/demo/form-design/components/VFormDesign/components/ComponentProps.vue b/src/views/demo/form-design/components/VFormDesign/components/ComponentProps.vue
index 945dafed..9b4feff5 100644
--- a/src/views/demo/form-design/components/VFormDesign/components/ComponentProps.vue
+++ b/src/views/demo/form-design/components/VFormDesign/components/ComponentProps.vue
@@ -171,7 +171,7 @@
         });
       };
       const handleFieldTableChange = (e) => {
-        console.log('cccccc', e);
+        // console.log('cccccc', e);
         fieldTableValue.value = e;
         fetch();
         inputOptions.value.forEach((item) => {
@@ -289,6 +289,8 @@
           if (func) {
             func(formConfig.value.currentItem!.componentProps, allOptions.value);
           }
+          fieldTableValue.value = formConfig.value?.currentItem?.componentProps?.dataTable;
+          handleFieldTableChange(formConfig.value?.currentItem?.componentProps?.dataTable);
         },
         {
           immediate: true,
diff --git a/src/views/demo/form-design/components/VFormDesign/index.vue b/src/views/demo/form-design/components/VFormDesign/index.vue
index 6e757ee7..b1e9405e 100644
--- a/src/views/demo/form-design/components/VFormDesign/index.vue
+++ b/src/views/demo/form-design/components/VFormDesign/index.vue
@@ -4,37 +4,39 @@
       :class="`left ${prefixCls}-sider`"
       collapsible
       collapsedWidth="0"
-      width="270"
+      width="300"
       :zeroWidthTriggerStyle="{
         'margin-top': '-70px',
         'background-color': 'gray',
       }"
       breakpoint="md"
     >
-      <CollapseContainer title="基础控件">
-        <CollapseItem
-          :list="baseComponents"
-          :handleListPush="handleListPushDrag"
-          @add-attrs="handleAddAttrs"
-          @handle-list-push="handleListPush"
-        />
-      </CollapseContainer>
-      <CollapseContainer title="自定义控件">
-        <CollapseItem
-          :list="customComponents"
-          @add-attrs="handleAddAttrs"
-          :handleListPush="handleListPushDrag"
-          @handle-list-push="handleListPush"
-        />
-      </CollapseContainer>
-      <CollapseContainer title="布局控件">
-        <CollapseItem
-          :list="layoutComponents"
-          :handleListPush="handleListPushDrag"
-          @add-attrs="handleAddAttrs"
-          @handle-list-push="handleListPush"
-        />
-      </CollapseContainer>
+      <div class="collapseItem-box">
+        <CollapseContainer title="基础控件">
+          <CollapseItem
+            :list="baseComponents"
+            :handleListPush="handleListPushDrag"
+            @add-attrs="handleAddAttrs"
+            @handle-list-push="handleListPush"
+          />
+        </CollapseContainer>
+        <CollapseContainer title="自定义控件">
+          <CollapseItem
+            :list="customComponents"
+            @add-attrs="handleAddAttrs"
+            :handleListPush="handleListPushDrag"
+            @handle-list-push="handleListPush"
+          />
+        </CollapseContainer>
+        <CollapseContainer title="布局控件">
+          <CollapseItem
+            :list="layoutComponents"
+            :handleListPush="handleListPushDrag"
+            @add-attrs="handleAddAttrs"
+            @handle-list-push="handleListPush"
+          />
+        </CollapseContainer>
+      </div>
     </LayoutSider>
     <LayoutContent>
       <Toolbar
@@ -396,4 +398,9 @@
       background-color: #fff;
     }
   }
+
+  .collapseItem-box {
+    height: calc(100vh - 60px);
+    overflow: auto;
+  }
 </style>
diff --git a/src/views/demo/form-design/components/VFormItem/index.vue b/src/views/demo/form-design/components/VFormItem/index.vue
index 70290d97..e8844fec 100644
--- a/src/views/demo/form-design/components/VFormItem/index.vue
+++ b/src/views/demo/form-design/components/VFormItem/index.vue
@@ -23,7 +23,6 @@
         v-else-if="schema.component == 'Divider' && schema.label && !formItemProps.hiddenLabel"
         >{{ schema.label }}
       </Divider>
-      <div v-if="schema.component == 'Divider'"> 123 </div>
 
       <!-- 部分控件需要一个空div -->
       <div>
diff --git a/src/views/demo/form-design/core/formItemConfig.ts b/src/views/demo/form-design/core/formItemConfig.ts
index 305d086a..d3d23f6c 100644
--- a/src/views/demo/form-design/core/formItemConfig.ts
+++ b/src/views/demo/form-design/core/formItemConfig.ts
@@ -8,43 +8,42 @@ import { ComponentType } from '@/components/Form/src/types';
 
 import { componentMap as Cmp } from '../components';
 import { Component } from 'vue';
-import { getDeptList,getAccountList,getPosGroupList } from '@/api/demo/system';
+import { getDeptList, getAccountList, getPosGroupList } from '@/api/demo/system';
 
 //获取部门列表数据
-const deptTreeData = await Promise.all([getDeptListData()])
-function getDeptListData(){
+const deptTreeData = await Promise.all([getDeptListData()]);
+function getDeptListData() {
   let param = {
     page: 1,
-    limit: 9999
+    limit: 9999,
   };
-  return getDeptList( param ).then( data => {
-    return data
-  })
+  return getDeptList(param).then((data) => {
+    return data;
+  });
 }
-
 //获取职级列表数据
-const positionTreeData = await Promise.all([getPositionListData()])
-function getPositionListData(){
+const positionTreeData = await Promise.all([getPositionListData()]);
+function getPositionListData() {
   let param = {
     page: 1,
-    limit: 9999
+    limit: 9999,
   };
-  return getPosGroupList( param ).then( data => {
-    return data
-  })
+  return getPosGroupList(param).then((data) => {
+    return data;
+  });
 }
 //获取人员选择列表数据
-const userTreeData = await Promise.all([getUserListData()])
-function getUserListData(){
+const userTreeData = await Promise.all([getUserListData()]);
+function getUserListData() {
   let param = {
     page: 1,
-    limit: 9999
+    limit: 9999,
   };
-  return getAccountList( param ).then( data => {
-    return data.items
-  })
+  return getAccountList(param).then((data) => {
+    return data.items;
+  });
 }
- 
+
 const componentMap = new Map<string, Component>();
 
 //如果有其它控件，可以在这里初始化
@@ -98,7 +97,7 @@ export const customComponents: IVFormComponent[] = [
     field: '',
     colProps: { span: 24 },
     componentProps: {
-      fieldNames:{
+      fieldNames: {
         children: 'children',
         label: 'name',
         value: 'id',
@@ -113,7 +112,7 @@ export const customComponents: IVFormComponent[] = [
     field: '',
     colProps: { span: 24 },
     componentProps: {
-      fieldNames:{
+      fieldNames: {
         children: 'children',
         label: 'name',
         value: 'id',
diff --git a/src/views/demo/onlineform/formModule/FormModal.vue b/src/views/demo/onlineform/formModule/FormModal.vue
index cc207e56..f369b62c 100644
--- a/src/views/demo/onlineform/formModule/FormModal.vue
+++ b/src/views/demo/onlineform/formModule/FormModal.vue
@@ -181,7 +181,6 @@
     let sysModuleElement: any = [];
     if (config.table.btns) {
       config.table.btns.forEach((t) => {
-        console.log(t);
         let temp: any = {};
         temp.id = '';
         temp.domId = t.prop;
diff --git a/src/views/demo/onlineform/formModule/config/columns.vue b/src/views/demo/onlineform/formModule/config/columns.vue
index f4628528..750f72de 100644
--- a/src/views/demo/onlineform/formModule/config/columns.vue
+++ b/src/views/demo/onlineform/formModule/config/columns.vue
@@ -73,7 +73,7 @@
   });
 
   // config
-  const config = inject('formConfig');
+  const config: any = inject('formConfig');
   const columnsData = ref(config.table.columns);
   // 展开全部
   const columnsTreeRef = ref<Nullable<TreeActionType>>(null);
diff --git a/src/views/demo/onlineform/formModule/index.vue b/src/views/demo/onlineform/formModule/index.vue
index 1cb1958c..e8ca4d76 100644
--- a/src/views/demo/onlineform/formModule/index.vue
+++ b/src/views/demo/onlineform/formModule/index.vue
@@ -8,7 +8,8 @@
       :searchInfo="searchInfo"
     >
       <template #toolbar>
-        <a-button type="primary" @click="handleAddForm">新增</a-button>
+        <PermissionBtn @btn-event="onBtnClicked" />
+        <!-- <a-button type="primary" @click="handleAddForm">新增</a-button> -->
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'pmoduleId'">
@@ -45,7 +46,7 @@
 </template>
 <script lang="ts" setup>
   import { reactive, nextTick, ref, onMounted } from 'vue';
-
+  import { PermissionBtn } from '@/components/PermissionBtn/index';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { PageWrapper } from '@/components/Page';
   import { useMessage } from '@/hooks/web/useMessage';
@@ -175,6 +176,16 @@
     reload();
   }
 
+  function onBtnClicked(domId) {
+    switch (domId) {
+      case 'btnAdd':
+        handleAddForm();
+        break;
+      default:
+        break;
+    }
+  }
+
   onMounted(() => {
     fetch();
   });
diff --git a/src/views/demo/onlineform/formModule/modalDesign.vue b/src/views/demo/onlineform/formModule/modalDesign.vue
index 254bb323..4fd683ef 100644
--- a/src/views/demo/onlineform/formModule/modalDesign.vue
+++ b/src/views/demo/onlineform/formModule/modalDesign.vue
@@ -62,22 +62,32 @@
     },
   ]);
   // 列表设置Checked
-  const columnsCheckedKeys = ref([]);
+  const columnsCheckedKeys: any = ref([]);
   // 查询设置tree
-  const queryTree = ref([
+  const queryTree: any = ref([
     {
       label: '全选',
       children: [],
     },
   ]);
   // 查询设置Checked
-  const queryCheckedKeys = ref([]);
+  const queryCheckedKeys: any = ref([]);
   // 按钮设置tree
-  const btnsTree = ref([]);
+  const btnsTree: any = ref([]);
   // 按钮设置Checked
-  const btnsCheckedKeys = ref([]);
+  const btnsCheckedKeys: any = ref([]);
 
-  const config = ref({
+  const notInColumns = [
+    'Divider',
+    'InputGuid',
+    'MapGemo',
+    'Upload',
+    'slot',
+    'Grid',
+    'StrengthMeter',
+  ];
+
+  const config: any = ref({
     layoutType: 1,
     queryType: 1,
     left: {
@@ -158,7 +168,7 @@
     ],
   });
 
-  const formScheme = ref('');
+  const formScheme: any = ref('');
 
   // 表单验证
   async function validateSteps(formVerison) {
@@ -167,18 +177,19 @@
     }
     // 选中的历史记录表单
     let keyValue = typeof formVerison === 'string' ? formVerison : formVerison.value;
-    const scheme = await functionGetPreviewForm({ keyValue: keyValue });
-    // const scheme = await functionGetPreviewForm({ keyValue: formVerison });
-    // console.log(scheme);
+    let query: any = { keyValue: keyValue };
+    const scheme: any = await functionGetPreviewForm(query);
     formScheme.value = JSON.parse(scheme.scheme);
 
-    const columns = [];
-    formScheme.value.formInfo.schemas.forEach((tab) => {
-      if (!(tab.component in ['Gridtable', 'Divider', 'Password', 'Viewtable', 'Card', 'Btn'])) {
+    const columns: any = [];
+    formScheme.value.formInfo.schemas.forEach((tab: any) => {
+      if (!notInColumns.includes(tab.component)) {
         columns.push(tab);
       }
     });
 
+    console.log(columns);
+
     const colunmsMap = {};
     columns.forEach((item) => {
       colunmsMap[item.field] = item;
@@ -192,14 +203,15 @@
     // 列表设置-树
     columnsTree.value[0].children = [];
     columns.map((t) => {
-      columnsTree.value[0].children.push({
+      let temp: any = {
         key: t.field,
         label: t.label,
         value: t.label,
         width: 120,
         align: 'left',
         isMinWidth: false,
-      });
+      };
+      columnsTree.value[0].children.push(temp);
     });
 
     // 查询设置-树
@@ -214,7 +226,8 @@
       });
 
     // 常用按钮-树
-    const schemeInfo = await functionGetSchemeInfoEntity({ id: scheme.schemeInfoId });
+    let query2: any = { id: scheme.schemeInfoId };
+    const schemeInfo: any = await functionGetSchemeInfoEntity(query2);
     if (schemeInfo.formType === 1) {
       // 如果是视图表单就关闭部分按钮
       btnsTree.value = config.value.btns.filter((t) =>
@@ -251,13 +264,13 @@
     }
 
     // 设置预选的单选项
-    config.value.table.columns.forEach((t) => {
+    config.value.table.columns.forEach((t: any) => {
       columnsCheckedKeys.value.push(t.key);
     });
-    config.value.table.querys.forEach((t) => {
+    config.value.table.querys.forEach((t: any) => {
       queryCheckedKeys.value.push(t.key);
     });
-    config.value.table.btns.forEach((t) => {
+    config.value.table.btns.forEach((t: any) => {
       btnsCheckedKeys.value.push(t.id);
     });
   }
diff --git a/src/views/demo/onlineform/formModule/modalForm-Modal.vue b/src/views/demo/onlineform/formModule/modalForm-Modal.vue
index 84a232ea..1dc0df5e 100644
--- a/src/views/demo/onlineform/formModule/modalForm-Modal.vue
+++ b/src/views/demo/onlineform/formModule/modalForm-Modal.vue
@@ -152,7 +152,8 @@
   });
   // 预览
   async function previewModal(record, Modal: IToolbarMethods) {
-    const preview = await functionGetPreviewForm({ keyValue: record.schemeId });
+    let query: any = { keyValue: record.schemeId };
+    const preview: any = await functionGetPreviewForm(query);
     let scheme = JSON.parse(preview.scheme);
     formConfig.value.schemas = scheme.formInfo.schemas;
     Modal?.showModal(cloneDeep(formConfig.value));
diff --git a/src/views/demo/onlineform/formModule/modalForm.vue b/src/views/demo/onlineform/formModule/modalForm.vue
index 6424425c..e590966d 100644
--- a/src/views/demo/onlineform/formModule/modalForm.vue
+++ b/src/views/demo/onlineform/formModule/modalForm.vue
@@ -190,7 +190,8 @@
     formData.value.formCode = row.id;
     formData.value.formCodeName = row.name;
     // 表单选择回传数据变化后，版本变化
-    const historyData = await functionGetSchemePageList({ schemeInfoId: row.id });
+    let query: any = { schemeInfoId: row.id };
+    const historyData = await functionGetSchemePageList(query);
     historyData.items.forEach((t) => {
       formVerisons_temp.push({ label: t.createDate, value: t.id });
     });
@@ -221,7 +222,7 @@
   async function setFormData(record) {
     // info和scheme
     let query: any = { id: record.formCode };
-    const result = await functionGetForm(query);
+    const result: any = await functionGetForm(query);
     record.isSys = true;
     formData.value = record;
     formData.value.formVerison = result.info.schemeId;
diff --git a/src/views/demo/onlineform/formdesign/index.vue b/src/views/demo/onlineform/formdesign/index.vue
index b6e6de15..684f20d4 100644
--- a/src/views/demo/onlineform/formdesign/index.vue
+++ b/src/views/demo/onlineform/formdesign/index.vue
@@ -14,8 +14,7 @@
       :searchInfo="searchInfo"
     >
       <template #toolbar>
-        <!-- <PermissionBtn @btn-event="onBtnClicked" /> -->
-        <a-button type="primary" @click="handleAddForm">新增</a-button>
+        <PermissionBtn @btn-event="onBtnClicked" />
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'category'">
@@ -65,7 +64,7 @@
 </template>
 <script lang="ts" setup>
   import { reactive, nextTick, ref, onMounted } from 'vue';
-
+  import { PermissionBtn } from '@/components/PermissionBtn/index';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { TreeItem } from '@/components/Tree';
   import { PageWrapper } from '@/components/Page';
@@ -262,6 +261,16 @@
     treeData.value = await functionLoadFormSort();
   }
 
+  function onBtnClicked(domId) {
+    switch (domId) {
+      case 'btnAdd':
+        handleAddForm();
+        break;
+      default:
+        break;
+    }
+  }
+
   onMounted(() => {
     fetch();
   });
diff --git a/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue b/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue
index 2437bf3c..0bd046d5 100644
--- a/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue
+++ b/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue
@@ -114,7 +114,8 @@
   // 异步传参
   const [automaticModal, { closeModal }] = useModalInner(async (data) => {
     if (!props.isAddVisible) {
-      let result = await functionGetForm({ id: data.saveFormDatas.info.id });
+      let query: any = { id: data.saveFormDatas.info.id };
+      let result = await functionGetForm(query);
       let result_json = JSON.parse(result.scheme.scheme);
       let data_json = JSON.parse(data.saveFormDatas.scheme.scheme);
       data_json.db = result_json.db;