From 6e7a671ec02adc404e5ab9701b9d3b5ea834c04c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com>
Date: Tue, 21 May 2024 16:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=8A=A8=E5=BB=BA=E8=A1=A8?=
 =?UTF-8?q?=E3=80=91=E5=85=B6=E4=BB=96=E7=BB=84=E4=BB=B6=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?bug=EF=BC=8C=E3=80=90=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E3=80=91=E6=A0=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/demo/formScheme.ts                    | 11 ++++
 .../VFormDesign/components/FormItemProps.vue  | 21 +++---
 .../demo/onlineform/formModule/FormModal.vue  |  1 +
 .../onlineform/formModule/config/leftTree.vue |  4 +-
 .../onlineform/formModule/modalDesign.vue     | 65 ++++++++++++++-----
 .../demo/onlineform/formdesign/FormModal.vue  |  8 +++
 .../formdesign/modal/AutomaticModal.vue       | 22 +++++++
 7 files changed, 104 insertions(+), 28 deletions(-)

diff --git a/src/api/demo/formScheme.ts b/src/api/demo/formScheme.ts
index be858f39..4c957db4 100644
--- a/src/api/demo/formScheme.ts
+++ b/src/api/demo/formScheme.ts
@@ -258,6 +258,17 @@ export function AddTable(params) {
     isPrimarykey: 0,
     decimalDigits: 0,
   });
+  params.dbColumnInfoList.push({
+    tableName: params.tableName,
+    dbColumnName: 'geomLabelField',
+    dataType: 'varchar',
+    length: 200,
+    columnDescription: '地图组件-标注字段',
+    isNullable: 0,
+    isIdentity: 0,
+    isPrimarykey: 0,
+    decimalDigits: 0,
+  });
   return defHttp.post({
     url: Api.AddTable + '?dbCode=' + params.dbCode,
     params,
diff --git a/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue b/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
index bc18ad9d..7082e2ec 100644
--- a/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
+++ b/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
@@ -36,16 +36,15 @@
               v-model:value="formConfig.currentItem.mapSetData.layerFields.gidField"
               placeholder="请输入GID字段"
             />
-          </FormItem> -->
-        <FormItem label="标注字段">
-          <a-select
-            v-model:value="formConfig.currentItem.mapSetData.layerFields.labelField"
-            :options="formConfig.currentItem.mapSetData.layerFields.labelFieldOptions"
-            size="middle"
-            placeholder="请选择标注字段"
-          />
-        </FormItem>
-        <!--
+          </FormItem>
+          <FormItem label="标注字段">
+            <a-select
+              v-model:value="formConfig.currentItem.mapSetData.layerFields.labelField"
+              :options="formConfig.currentItem.mapSetData.layerFields.labelFieldOptions"
+              size="middle"
+              placeholder="请选择标注字段"
+            />
+          </FormItem>
           <FormItem label="geom字段">
             <a-input
               v-model:value="formConfig.currentItem.mapSetData.layerFields.geomField"
@@ -140,7 +139,7 @@
 
   const { formConfig } = useFormDesignState();
 
-  const options = [...Array(25)].map((_, i) => ({ value: (i + 10).toString(36) + (i + 1) }));
+  // const options = [...Array(25)].map((_, i) => ({ value: (i + 10).toString(36) + (i + 1) }));
 
   watch(
     () => formConfig.value,
diff --git a/src/views/demo/onlineform/formModule/FormModal.vue b/src/views/demo/onlineform/formModule/FormModal.vue
index 579c804f..0cec7f6a 100644
--- a/src/views/demo/onlineform/formModule/FormModal.vue
+++ b/src/views/demo/onlineform/formModule/FormModal.vue
@@ -51,6 +51,7 @@
           :modalFormVerison="modalFormVerison"
           :editData="editData"
           :isEdit="isEdit"
+          :formVerison_now="formVerison_now"
         />
       </div>
     </div>
diff --git a/src/views/demo/onlineform/formModule/config/leftTree.vue b/src/views/demo/onlineform/formModule/config/leftTree.vue
index e56471f4..a1f67c51 100644
--- a/src/views/demo/onlineform/formModule/config/leftTree.vue
+++ b/src/views/demo/onlineform/formModule/config/leftTree.vue
@@ -145,7 +145,7 @@
   const labelCol = { span: 4 };
   const wrapperCol = { span: 20 };
   // config
-  const config = inject('formConfig');
+  const config: any = inject('formConfig');
   // message
   const { createMessage } = useMessage();
 
@@ -219,7 +219,7 @@
   // 子节点添加弹窗
   function handleNodeAdd(data) {
     pData = data;
-    dialogTitle = `添加【${data.label}】的子选项`;
+    dialogTitle = `添加子选项`;
     dialogVisible.value = true;
   }
   // 子节点添加
diff --git a/src/views/demo/onlineform/formModule/modalDesign.vue b/src/views/demo/onlineform/formModule/modalDesign.vue
index 29dea1f8..27acfb77 100644
--- a/src/views/demo/onlineform/formModule/modalDesign.vue
+++ b/src/views/demo/onlineform/formModule/modalDesign.vue
@@ -22,6 +22,7 @@
 
 <script lang="ts" setup>
   import { ref, provide, defineExpose, watch, defineProps } from 'vue';
+  import { cloneDeep } from 'lodash-es';
   import WebcodeLayout from './config/layout.vue';
   import webcodeLefttree from './config/leftTree.vue';
   import webcodeColumns from './config/columns.vue';
@@ -43,6 +44,10 @@
       type: Boolean,
       default: () => false,
     },
+    formVerison_now: {
+      type: String,
+      default: () => '',
+    },
   });
 
   watch(
@@ -93,7 +98,7 @@
     'StrengthMeter',
   ];
 
-  const config: any = ref({
+  const config_backups: any = {
     layoutType: 1,
     queryType: 1,
     left: {
@@ -172,7 +177,9 @@
         sort: 5,
       },
     ],
-  });
+  };
+  const config: any = ref();
+  config.value = cloneDeep(config_backups);
 
   const formScheme: any = ref('');
 
@@ -194,11 +201,6 @@
       }
     });
 
-    const colunmsMap = {};
-    columns.forEach((item) => {
-      colunmsMap[item.field] = item;
-    });
-
     // 左侧树形设置
     colslist.value = columns.map((t) => {
       return { value: t.field, label: t.label };
@@ -246,7 +248,7 @@
       if (
         (typeof props.editData.record.formVerison == 'string'
           ? props.editData.record.formVerison
-          : props.editData.record.formVerison.value) === formVerison
+          : props.editData.record.formVerison.value) === props.formVerison_now
       ) {
         const editDataScheme = JSON.parse(props.editData.record.scheme);
 
@@ -256,29 +258,62 @@
         config.value.queryType = editDataScheme.queryType;
         // 左边树
         config.value.left = editDataScheme.left;
+        // 常用按钮-树
+        btnsTree.value.forEach((tree1, index) => {
+          editDataScheme.table.btns.forEach((tree2) => {
+            if (tree1.id === tree2.id) {
+              btnsTree.value[index] = tree2;
+            }
+          });
+        });
         // 列表设置-表
         config.value.table.columns = editDataScheme.table.columns;
         // 查询设置-表
         config.value.table.querys = editDataScheme.table.querys;
         // 常用按钮-表
         config.value.table.btns = editDataScheme.table.btns;
+
+        setCheckedKeys();
+      } else {
+        defaultConfig();
+        setCheckedKeys();
       }
     } else {
-      // 列表设置-表
-      config.value.table.columns = columnsTree.value[0].children;
-      // 查询设置-表
-      config.value.table.querys = queryTree.value[0].children;
-      // 常用按钮-表
-      config.value.table.btns = btnsTree.value;
+      defaultConfig();
+      setCheckedKeys();
     }
 
-    // 设置预选的单选项
+    pageActiveName = 'tab01';
+  }
+
+  function defaultConfig() {
+    // 布局
+    config.value.layoutType = 1;
+    // 左侧-父子树：默认为[]
+    colslist.value = [];
+    // 常用按钮-树
+    btnsTree.value = cloneDeep(config_backups).btns;
+    // 列表设置-表
+    config.value.table.columns = columnsTree.value[0].children;
+    // 查询设置-表
+    config.value.table.querys = queryTree.value[0].children;
+    // 常用按钮-表
+    config.value.table.btns = btnsTree.value;
+  }
+
+  function setCheckedKeys() {
+    // 列表设置-树-选项
+    columnsCheckedKeys.value = [];
     config.value.table.columns.forEach((t: any) => {
       columnsCheckedKeys.value.push(t.key);
     });
+    // 查询设置-树-选项
+    queryCheckedKeys.value = [];
     config.value.table.querys.forEach((t: any) => {
       queryCheckedKeys.value.push(t.key);
     });
+    // 常用按钮-树-选项
+    btnsCheckedKeys.value = [];
     config.value.table.btns.forEach((t: any) => {
       btnsCheckedKeys.value.push(t.id);
     });
diff --git a/src/views/demo/onlineform/formdesign/FormModal.vue b/src/views/demo/onlineform/formdesign/FormModal.vue
index 310c7636..6eac638a 100644
--- a/src/views/demo/onlineform/formdesign/FormModal.vue
+++ b/src/views/demo/onlineform/formdesign/FormModal.vue
@@ -145,6 +145,14 @@
       openModal(true, { saveFormDatas: saveFormDatas.value });
     } else if (saveFormDatas.value.info.formType == 2 && isStageClick.value) {
       setTimeout(() => {
+        if (isAddVisible.value) {
+          schems.db.push({
+            name: 'table' + new Date().getTime(),
+            type: 'main',
+            tableName: 'table' + new Date().getTime(),
+            description: '',
+          });
+        }
         saveFormDatas.value.scheme.scheme = JSON.stringify(schems);
         submitSaveClick();
       }, 500);
diff --git a/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue b/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue
index e3273572..fd5f4187 100644
--- a/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue
+++ b/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue
@@ -137,12 +137,15 @@
     }
     // 表名和备注
     let scheme = JSON.parse(data.saveFormDatas.scheme.scheme);
+
     tableInfo.value.tableName = scheme.db[0].tableName;
     tableInfo.value.description = scheme.db[0].description;
     tableInfo.value.dbCode = data.saveFormDatas.info.DbCode;
+
     // 制作表格
     let schemas = scheme.formInfo.schemas;
     tableInfo.value.dbColumnInfoList = [];
+
     schemas.forEach((item: any) => {
       if (!item.component.includes(componentArray)) {
         if (fieldArray.includes(item.field)) {
@@ -159,6 +162,23 @@
           tableInfo.value.dbColumnInfoList.push(temp);
           item.dbColumnInfo = temp;
 
+          // 编辑-添加新的行
+          dbColumnInfo_new.value.push(temp);
+          dbColumnInfo_new_list.push(temp.dbColumnName + temp.columnDescription);
+          item.componentProps.dataTable = tableInfo.value.tableName;
+          item.componentProps.fieldName = temp.dbColumnName;
+        } else if (item.dbColumnInfo.dbColumnName != item.component + item.field) {
+          // 复制按钮产生的组件
+          // 初始默认值
+          let temp = cloneDeep(dbColumnInfo);
+          temp.tableName = tableInfo.value.tableName;
+          temp.dbColumnName = item.component + item.field;
+          temp.length = 200;
+          temp.dataType = 'varchar';
+          temp.columnDescription = item.label;
+          tableInfo.value.dbColumnInfoList.push(temp);
+          item.dbColumnInfo = temp;
+
           // 编辑-添加新的行
           dbColumnInfo_new.value.push(temp);
           dbColumnInfo_new_list.push(temp.dbColumnName + temp.columnDescription);
@@ -199,6 +219,8 @@
   // 把弹窗的信息写入saveFormDatas
   function getFromAndTable() {
     let schems = JSON.parse(saveFormDatas.scheme.scheme);
+    console.log(schems);
+
     // db
     schems.db[0].tableName = tableInfo.value.tableName;
     schems.db[0].description = tableInfo.value.description;