From 356e8abf04a50fe0a092554b12f58304a89e1516 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Thu, 6 Jun 2024 17:28:42 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E3=80=90=E8=A1=A8=E5=8D=95=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E3=80=91=E5=8C=BA=E5=88=86=E6=A0=85=E6=A0=BC=E5=92=8C?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/onlineform/formdesign/FormModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/onlineform/formdesign/FormModal.vue b/src/views/demo/onlineform/formdesign/FormModal.vue
index afec3d3d..7db8d923 100644
--- a/src/views/demo/onlineform/formdesign/FormModal.vue
+++ b/src/views/demo/onlineform/formdesign/FormModal.vue
@@ -141,7 +141,7 @@
           if (['Grid', 'Card'].includes(item.component)) {
             item.columns[0].children = changeCardStructure(item.columns[0].children);
             if (
-              (item.component === 'Card' || item.component === 'Grid') &&
+              (item.component === 'Card' || (item.component === 'Grid' && !item.type)) &&
               item.columns[0].children
             ) {
               item.columns[0].children.forEach((childItem) => {

From 87570a20719822242ef725e88593192f185c7ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com>
Date: Thu, 6 Jun 2024 17:33:46 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E5=9B=BE=E5=BD=A2=E5=8C=96=E5=BB=BA?=
 =?UTF-8?q?=E8=A1=A8-geom=E5=94=AF=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/graphicaltable/modal/index.vue     | 128 ++++++++++++++----
 1 file changed, 105 insertions(+), 23 deletions(-)

diff --git a/src/views/demo/system/graphicaltable/modal/index.vue b/src/views/demo/system/graphicaltable/modal/index.vue
index f39212c6..a1d49284 100644
--- a/src/views/demo/system/graphicaltable/modal/index.vue
+++ b/src/views/demo/system/graphicaltable/modal/index.vue
@@ -10,7 +10,7 @@
     :draggable="false"
     :title="getTitle"
     :useWrapper="true"
-    :width="700"
+    :width="900"
     @ok="handleOk"
   >
     <div class="box-container">
@@ -26,7 +26,18 @@
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'name' && !isDetail">
-          <a-input v-model:value="record.name" placeholder="请输入字段名" />
+          <a-input
+            v-model:value="record.name"
+            placeholder="请输入字段名"
+            :disabled="record.name == 'geom'"
+            @change="
+              if (changeNameAndType()) {
+                if (record.name == 'geom' && record.type != 'geometry(GEOMETRY)') {
+                  record.type = 'geometry(GEOMETRY)';
+                }
+              }
+            "
+          />
         </template>
         <template v-if="column.key === 'type' && !isDetail">
           <a-select
@@ -35,16 +46,22 @@
             placeholder="请选择"
             v-model:value="record.type"
             :options="codesTypeArr"
+            @change="
+              if (changeNameAndType()) {
+                if (record.type == 'geometry(GEOMETRY)') {
+                  record.name = 'geom';
+                } else if (record.name && record.name == 'geom') {
+                  record.name = '';
+                }
+              }
+            "
           />
         </template>
         <template v-if="column.key === 'type' && isDetail">
           {{ getCodesTypeArrByType(record.type) }}
         </template>
         <template v-if="column.key === 'explanation' && !isDetail">
-          <a-input
-            v-model:value="record.explanation"
-            placeholder="请输入备注，备注内不能含有英文字符的,和:"
-          />
+          <a-input v-model:value="record.explanation" placeholder="不能含有英文字符的,和:" />
         </template>
         <template v-if="column.key === 'action' && (!record.isOldColumn || !isUpdate)">
           <TableAction
@@ -64,7 +81,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, onMounted, defineEmits } from 'vue';
+  import { ref, onMounted, defineEmits, watch } from 'vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { columns, columns_isDetail } from './modal.data';
@@ -72,6 +89,7 @@
   // api
   import { createPicTable, updateTable } from '@/api/database/index';
   import { getLoad } from '@/api/sys/sysDataItemDetail';
+  import { array } from 'vue-types';
 
   const emit = defineEmits(['submit']);
   const { createMessage } = useMessage();
@@ -164,30 +182,65 @@
   }
   // 提交
   function handleOk() {
+    // 检测：表名
+    if (!tableName.value) {
+      createMessage.warn('表名是必填项!');
+      return;
+    }
+    // 检测：数据库表名的命名规则
+    if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(tableName.value)) {
+      createMessage.warn('表名不符合数据库表名的命名规则!');
+      return;
+    }
     let arr = getDataSource();
-    // console.log('record', arr);
-    let newArr: any = [];
+    // 检测：字段行
+    if (!arr || arr.length == 0) {
+      createMessage.warn('至少输入一行字段!');
+      return;
+    }
     let flag = true;
-    arr.forEach((item) => {
-      if (
-        item.explanation &&
-        (item.explanation.indexOf(':') > -1 || item.explanation.indexOf(',') > -1)
-      ) {
-        createMessage.warn('备注内不能含有英文字符的,和:');
-        flag = false;
-      }
-      newArr.push({
-        name: item.name,
-        type: item.type,
-        explanation: item.explanation,
+    if (arr) {
+      arr.forEach((item) => {
+        // 检测：字段名和字段类型不为空
+        if (item.name == '' || item.type == '') {
+          createMessage.warn('字段名和字段类型都是必填项!');
+          flag = false;
+        }
+        // 检测：字段名中不能含有中文!
+        if (/[\u4e00-\u9fa5]/.test(item.name)) {
+          createMessage.warn('字段名中不能含有中文!');
+          flag = false;
+        }
+        // 检测：数据库字段名的命名规则
+        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(item.name)) {
+          createMessage.warn('字段名不符合数据库字段名的命名规则!');
+          flag = false;
+        }
+        // 检测：备注不能含有英文字符的,和:
+        if (
+          item.explanation &&
+          (item.explanation.indexOf(':') > -1 || item.explanation.indexOf(',') > -1)
+        ) {
+          createMessage.warn('备注内不能含有英文字符的,和:');
+          flag = false;
+        }
       });
-    });
+    }
+    // 无错误才能继续进行
     if (flag) {
+      let newArr: any = [];
+      arr.forEach((item) => {
+        newArr.push({
+          name: item.name,
+          type: item.type,
+          explanation: item.explanation,
+        });
+      });
       const param: any = {
         tableName: tableName.value,
         tableInfos: newArr,
       };
-      console.log('param', param);
+      // console.log('param', param);
       if (isUpdate.value) {
         updateTable(param).then((res: Recordable) => {
           console.log('res', res);
@@ -227,6 +280,35 @@
     }
     return '';
   }
+  // 检测：只能有一个geom和geometry(GEOMETRY)
+  function changeNameAndType() {
+    let arr = getDataSource();
+    // geom出现的次数
+    let geomNumber = 0;
+    // geom当前出现的数组
+    let geomShowIndex = 0;
+    arr.forEach((item, index) => {
+      if (item.name == 'geom' || item.type == 'geometry(GEOMETRY)') {
+        geomNumber++;
+        geomShowIndex = index;
+      }
+    });
+    if (geomNumber < 2) {
+      return true;
+    } else {
+      createMessage.warn('一个表同时只能有一个geom和空间类型！');
+      // 赋值
+      arr[geomShowIndex] = {
+        name: '',
+        type: '',
+        explanation: arr[geomShowIndex].explanation,
+        length: arr[geomShowIndex].length,
+        id: arr[geomShowIndex].id,
+      };
+      setTableData(arr);
+      return false;
+    }
+  }
   onMounted(() => {
     getCodesTypeArr();
   });

From dcb3f5ceabe9391fad1b6f4eff391fa77c0586a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Thu, 6 Jun 2024 17:40:33 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BB=91=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E4=BC=98=E5=8C=96=EF=BC=8C=E5=AD=90=E8=A1=A8=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E7=AD=89=E6=95=B0=E6=8D=AE=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormViewer/index.vue           |  2 --
 src/components/FormViewer/subTable.vue        | 20 +++++++++++++------
 .../package/penal/startEvent/index.vue        |  1 -
 .../package/penal/userTask/index.vue          |  1 -
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue
index 165ee9ba..c2b447ab 100644
--- a/src/components/FormViewer/index.vue
+++ b/src/components/FormViewer/index.vue
@@ -148,7 +148,6 @@
           multiterm: '',
         });
         tabElement.schemas.forEach((element) => {
-          console.log(element);
           if (element.field == props.formRelationId) {
             keyValue.value = element.componentProps.fieldName;
             getFormDetail();
@@ -220,7 +219,6 @@
           }
           // 卡片组布局
           if (element.component === 'CardGroup') {
-            console.log(element);
             cardGroupData.value.push({
               ...element,
             });
diff --git a/src/components/FormViewer/subTable.vue b/src/components/FormViewer/subTable.vue
index 1676a0db..2655f8b1 100644
--- a/src/components/FormViewer/subTable.vue
+++ b/src/components/FormViewer/subTable.vue
@@ -6,7 +6,7 @@
       :data-source="tableData"
       :pagination="false"
       :scroll="scrollValue"
-      >
+    >
       <!-- v-if="props.data.multiterm" -->
       <template #headerCell="{ column, record }">
         <template v-if="column.key === 'setting'">
@@ -37,6 +37,7 @@
   import { subTableStore } from '@/store/modules/subTable';
   import { useMessage } from '@/hooks/web/useMessage';
   import { BasicForm, useForm } from '@/components/Form';
+  import dayjs from 'dayjs';
 
   const { createMessage } = useMessage();
   const subTableDataStore = subTableStore();
@@ -60,6 +61,8 @@
       default: '',
     },
   });
+  const nowTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
+  const userName = localStorage.getItem('fireUserLoginName');
   const [registerForm, { getFieldsValue, setFieldsValue, updateSchema, resetFields, validate }] =
     useForm({
       labelWidth: 100,
@@ -76,8 +79,10 @@
     });
   });
   props.data.child.forEach((element) => {
-    console.log(element);
-    if (element.component != 'InputGuid') {
+    if (
+      ['createuser', 'modifyuser', 'createtime', 'modifytime'].includes(element.type) ||
+      element.component != 'InputGuid'
+    ) {
       columns.value.push({
         ...element,
       });
@@ -103,6 +108,10 @@
     props.data.child.map((item) => {
       if (item.component == 'InputGuid') {
         emptyItem[item.field] = keyValue;
+      } else if (item.type == 'createuser' || item.type == 'modifyuser') {
+        emptyItem[item.field] = userName;
+      } else if (item.type == 'createtime' || item.type == 'modifytime') {
+        emptyItem[item.field] = nowTime.value;
       } else {
         emptyItem[item.field] = '';
       }
@@ -113,13 +122,12 @@
     tableData.value = tableData.value.filter((item) => item.key != record.key);
   };
   function getData() {
-    console.log(tableData.value);
     return tableData.value;
   }
   defineExpose({
     getData,
   });
-  function changeData(){
-    console.log(tableData.value)
+  function changeData() {
+    console.log(tableData.value);
   }
 </script>
diff --git a/src/components/ProcessDesigner/package/penal/startEvent/index.vue b/src/components/ProcessDesigner/package/penal/startEvent/index.vue
index 34ece914..904358a8 100644
--- a/src/components/ProcessDesigner/package/penal/startEvent/index.vue
+++ b/src/components/ProcessDesigner/package/penal/startEvent/index.vue
@@ -362,7 +362,6 @@
               'CreateTime',
               'ModifyUser',
               'ModifyTime',
-              'CardGroup',
             ].includes(element.component) &&
             !element.itemProps.hidden
           ) {
diff --git a/src/components/ProcessDesigner/package/penal/userTask/index.vue b/src/components/ProcessDesigner/package/penal/userTask/index.vue
index 46558600..cc3a913a 100644
--- a/src/components/ProcessDesigner/package/penal/userTask/index.vue
+++ b/src/components/ProcessDesigner/package/penal/userTask/index.vue
@@ -916,7 +916,6 @@
               'CreateTime',
               'ModifyUser',
               'ModifyTime',
-              'CardGroup',
             ].includes(element.component) &&
             !element.itemProps.hidden
           ) {

From 5f60a1a3d35b6e11e5c442f740c31f98c193dd6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Thu, 6 Jun 2024 17:43:45 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E5=AD=90=E8=A1=A8=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=A5=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormViewer/subTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FormViewer/subTable.vue b/src/components/FormViewer/subTable.vue
index 2655f8b1..b0770908 100644
--- a/src/components/FormViewer/subTable.vue
+++ b/src/components/FormViewer/subTable.vue
@@ -80,7 +80,7 @@
   });
   props.data.child.forEach((element) => {
     if (
-      ['createuser', 'modifyuser', 'createtime', 'modifytime'].includes(element.type) ||
+      !['createuser', 'modifyuser', 'createtime', 'modifytime'].includes(element.type) &&
       element.component != 'InputGuid'
     ) {
       columns.value.push({

From 8c6832ffb567d188101980db2bc699bda22a9601 Mon Sep 17 00:00:00 2001
From: zzq <15064940501@163.com>
Date: Thu, 6 Jun 2024 17:53:45 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=EF=BC=8C=E9=A2=84=E8=A7=88=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/form-design/components/VFormCreate/index.vue |  2 ++
 src/views/demo/onlineform/formModule/modalDesign.vue  | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/demo/form-design/components/VFormCreate/index.vue b/src/views/demo/form-design/components/VFormCreate/index.vue
index 1c84203b..5b035a52 100644
--- a/src/views/demo/form-design/components/VFormCreate/index.vue
+++ b/src/views/demo/form-design/components/VFormCreate/index.vue
@@ -150,5 +150,7 @@
 <style lang="less" scoped>
   .v-form-model {
     overflow: hidden;
+    width: 96%;
+    margin-left: 2%;
   }
 </style>
diff --git a/src/views/demo/onlineform/formModule/modalDesign.vue b/src/views/demo/onlineform/formModule/modalDesign.vue
index 554fd402..ad0d40ae 100644
--- a/src/views/demo/onlineform/formModule/modalDesign.vue
+++ b/src/views/demo/onlineform/formModule/modalDesign.vue
@@ -283,7 +283,16 @@
           !['Upload', 'Uploadimg', 'Password', 'Timerange', 'Datetimerange'].includes(t.component),
       )
       .map((t) => {
-        return { key: t.field, label: t.label, type: t.component };
+        if (t.componentProps.options) {
+          return {
+            key: t.field,
+            label: t.label,
+            type: t.component,
+            options: t.componentProps.options,
+          };
+        } else {
+          return { key: t.field, label: t.label, type: t.component };
+        }
       });
 
     // 常用按钮-树

From 17a60a8a2a6cb9a5ba5e7e4b94723fd484c5202e Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Fri, 7 Jun 2024 09:34:28 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E3=80=90=E8=A1=A8=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=91=E4=BF=AE=E6=94=B9=E5=8D=A1=E7=89=87=E7=BB=84?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=94=B9=E6=88=90=E5=8D=95=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormViewer/cardGourp.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/components/FormViewer/cardGourp.vue b/src/components/FormViewer/cardGourp.vue
index 0af5986a..b7c83ee4 100644
--- a/src/components/FormViewer/cardGourp.vue
+++ b/src/components/FormViewer/cardGourp.vue
@@ -1,5 +1,18 @@
 <template>
   <div>
+    <div style="display:flex;margin-bottom:10px">
+      {{ tableData.label }}
+      <div style="margin-left:10px">
+        <a-radio-group v-model:value="noTitleKey" :options="tableData.componentProps.options" @change="onTabChange"/>
+      </div>
+    </div>
+    <!-- <a-card
+      style="width: 100%"
+      v-for="(item,index) in tableData.componentProps.options"
+      :key="index"
+      v-show="noTitleKey === item.value"
+      :title="item.label"
+    > -->
     <a-card
       style="width: 100%"
       :tab-list="tabListNoTitle"
@@ -89,7 +102,7 @@
           parentValue: element.field,
           ...childElement,
           show: index == 0 ? true : false,
-          index: index,
+          index: element.value,
         });
         if (childElement.component == 'CardGroup') {
           childGourp.value.push({
@@ -117,6 +130,7 @@
   }, 10);
 
   const onTabChange = (value: string) => {
+    value = value.target.value
     noTitleKey.value = value;
     var currentIndex = (childGourp.value || []).findIndex((element) => element.index === value);
     console.log(currentIndex);

From 9ac419d46a91e83f139e2e8058f6d7205ca707f4 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Fri, 7 Jun 2024 09:58:58 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E3=80=90=E8=A1=A8=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=91=E5=8D=A1=E7=89=87=E7=BB=84=E9=87=8C=E5=A5=97?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormViewer/cardGourp.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FormViewer/cardGourp.vue b/src/components/FormViewer/cardGourp.vue
index b7c83ee4..9b081bcd 100644
--- a/src/components/FormViewer/cardGourp.vue
+++ b/src/components/FormViewer/cardGourp.vue
@@ -107,7 +107,7 @@
         if (childElement.component == 'CardGroup') {
           childGourp.value.push({
             ...childElement,
-            index: index,
+            index: element.value,
           });
         }
         if (['createuser', 'modifyuser'].includes(childElement.type)) {

From 80671c55e85721512a547e952ebe34ecbd3afa28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Fri, 7 Jun 2024 10:07:10 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/userTask/index.vue          |   6 +
 src/views/demo/workflow/create/preview.vue    | 150 +++++++++++-------
 .../demo/workflow/task/process/audit.vue      |  27 ++--
 src/views/demo/workflow/task/process/look.vue |   2 +-
 4 files changed, 120 insertions(+), 65 deletions(-)

diff --git a/src/components/ProcessDesigner/package/penal/userTask/index.vue b/src/components/ProcessDesigner/package/penal/userTask/index.vue
index cc3a913a..60d72bd4 100644
--- a/src/components/ProcessDesigner/package/penal/userTask/index.vue
+++ b/src/components/ProcessDesigner/package/penal/userTask/index.vue
@@ -67,6 +67,12 @@
               ]"
             />
           </a-form-item>
+          <a-form-item label="审核栏标题">
+            <a-input v-model:value="node.auditTitle" placeholder="请输入" />
+          </a-form-item>
+          <a-form-item label="审核内容名称">
+            <a-input v-model:value="node.auditName" placeholder="请输入" />
+          </a-form-item>
         </a-collapse-panel>
         <a-collapse-panel key="2" header="审核人员设置">
           <a-space>
diff --git a/src/views/demo/workflow/create/preview.vue b/src/views/demo/workflow/create/preview.vue
index 46afd2d2..c28f323b 100644
--- a/src/views/demo/workflow/create/preview.vue
+++ b/src/views/demo/workflow/create/preview.vue
@@ -148,7 +148,7 @@
     title: '',
   });
   const rules = reactive({
-    title: [{ required: true, message: '请选择流程标题', trigger: 'blur' }],
+    title: [{ required: true, message: '请填写流程标题', trigger: 'blur' }],
     userId: [{ required: true, message: '请选择流程发起人', trigger: 'blur' }],
   });
   function changeActive(activeKey) {
@@ -163,6 +163,8 @@
     let content = JSON.parse(data.scheme.content);
     let wfData = content.wfData;
     const currentNode = wfData.find((t) => t.type == 'bpmn:StartEvent');
+    console.log(currentNode);
+    designerData.isCustmerTitle = currentNode.isCustmerTitle;
     if (currentNode.authFields.length > 0) {
       // 有自定义表单时
       formVisble.value = true;
@@ -202,33 +204,52 @@
     designerData.delegateUsers = data;
   }
   async function handleSaveDraft() {
-    var processId = buildGUID();
-    var commit = {
-      schemeId: designerData.formCurrentNode.formVerison,
-      pkey: keyValue.value,
-      pkeyValue: processId,
-    };
-    var querys = {
-      schemeCode: designerData.isDraft ? '' : props.code,
-      userId: formData.userId,
-      title: formData.title,
-      processId: processId,
-      InstanceInfo: JSON.stringify(commit),
-      ParentNodeId: props.ParentNodeId,
-      ParentTaskId: props.ParentTaskId,
-      ParentProcessId: props.ParentProcessId,
-    };
-    if (props.ParentNodeId) {
-      querys.isChild = 1;
-    }
-    const data = await saveDraft(querys);
-    querys.schemeCode = '';
-    designerData.isDraft = true;
-    if (data) {
-      closePreview();
-      return createMessage.success('保存草稿成功');
+    let values;
+    if (designerData.isCustmerTitle) {
+      values = await formRef.value
+        .validate()
+        .then(() => {
+          return true;
+        })
+        .catch((error: ValidateErrorEntity<FormState>) => {
+          console.log('error', error);
+          processVisble.value = true;
+          activeName.value = 'flow';
+          return false;
+        });
     } else {
-      return createMessage.error('保存草稿失败');
+      values = true;
+    }
+    console.log(values);
+    if (values) {
+      var processId = buildGUID();
+      var commit = {
+        schemeId: designerData.formCurrentNode.formVerison,
+        pkey: keyValue.value,
+        pkeyValue: processId,
+      };
+      var querys = {
+        schemeCode: designerData.isDraft ? '' : props.code,
+        userId: formData.userId,
+        title: formData.title,
+        processId: processId,
+        InstanceInfo: JSON.stringify(commit),
+        ParentNodeId: props.ParentNodeId,
+        ParentTaskId: props.ParentTaskId,
+        ParentProcessId: props.ParentProcessId,
+      };
+      if (props.ParentNodeId) {
+        querys.isChild = 1;
+      }
+      const data = await saveDraft(querys);
+      querys.schemeCode = '';
+      designerData.isDraft = true;
+      if (data) {
+        closePreview();
+        return createMessage.success('保存草稿成功');
+      } else {
+        return createMessage.error('保存草稿失败');
+      }
     }
   }
   function handleSubmit() {
@@ -278,35 +299,54 @@
     }
   }
   async function handleCreateFlow(processId) {
-    var commit = {
-      schemeId: designerData.formCurrentNode.formVerison,
-      pkey: keyValue.value,
-      pkeyValue: processId,
-    };
-    var querys = {
-      schemeCode: designerData.isDraft ? '' : props.code,
-      userId: formData.userId,
-      title: formData.title,
-      processId: processId,
-      InstanceInfo: JSON.stringify(commit),
-      ParentNodeId: props.ParentNodeId,
-      ParentTaskId: props.ParentTaskId,
-      ParentProcessId: props.ParentProcessId,
-    };
-    if (props.ParentNodeId) {
-      querys.isChild = 1;
-    }
-    if (!designerData.isDraft) {
-      await saveDraft(querys);
-      querys.schemeCode = '';
-      designerData.isDraft = true;
-    }
-    const data = await create(querys);
-    if (data) {
-      closePreview();
-      return createMessage.success('发起流程成功');
+    let values;
+    if (designerData.isCustmerTitle) {
+      values = await formRef.value
+        .validate()
+        .then(() => {
+          return true;
+        })
+        .catch((error: ValidateErrorEntity<FormState>) => {
+          console.log('error', error);
+          processVisble.value = true;
+          activeName.value = 'flow';
+          return false;
+        });
     } else {
-      return createMessage.error('发起流程失败');
+      values = true;
+    }
+    console.log(values);
+    if (values) {
+      var commit = {
+        schemeId: designerData.formCurrentNode.formVerison,
+        pkey: keyValue.value,
+        pkeyValue: processId,
+      };
+      var querys = {
+        schemeCode: designerData.isDraft ? '' : props.code,
+        userId: formData.userId,
+        title: formData.title,
+        processId: processId,
+        InstanceInfo: JSON.stringify(commit),
+        ParentNodeId: props.ParentNodeId,
+        ParentTaskId: props.ParentTaskId,
+        ParentProcessId: props.ParentProcessId,
+      };
+      if (props.ParentNodeId) {
+        querys.isChild = 1;
+      }
+      if (!designerData.isDraft) {
+        await saveDraft(querys);
+        querys.schemeCode = '';
+        designerData.isDraft = true;
+      }
+      const data = await create(querys);
+      if (data) {
+        closePreview();
+        return createMessage.success('发起流程成功');
+      } else {
+        return createMessage.error('发起流程失败');
+      }
     }
   }
   async function getFormHistory() {
diff --git a/src/views/demo/workflow/task/process/audit.vue b/src/views/demo/workflow/task/process/audit.vue
index acaa264e..0e85939f 100644
--- a/src/views/demo/workflow/task/process/audit.vue
+++ b/src/views/demo/workflow/task/process/audit.vue
@@ -64,7 +64,7 @@
         <!-- <a-divider type="vertical" /> -->
         <a-layout-sider v-if="props.isRead == 0">
           <a-tabs v-model:activeKey="auditName">
-            <a-tab-pane key="audit" tab="审批栏">
+            <a-tab-pane key="audit" :tab="auditTitleVal">
               <div class="approval-column">
                 <a-form
                   ref="formRef"
@@ -74,10 +74,7 @@
                   :label-col="labelCol"
                   :wrapper-col="wrapperCol"
                 >
-                  <a-form-item
-                    :label="designerData.isCreateAgain ? '备注' : '审批意见'"
-                    name="des"
-                  />
+                  <a-form-item :label="auditNameVal" />
                   <a-form-item label="">
                     <a-textarea
                       v-model:value="formData.des"
@@ -234,6 +231,8 @@
   });
   const activeName = ref('form');
   const auditName = ref('audit');
+  const auditTitleVal = ref('审批栏');
+  const auditNameVal = ref('审批意见');
   function changeActive(activeKey) {
     if (activeKey == 'flow') {
       processVisble.value = true;
@@ -262,6 +261,16 @@
     console.log(wfData);
     const auditNode = wfData.find((t) => t.id == data.task.unitId);
     console.log(auditNode);
+    if (auditNode.auditTitle) {
+      auditTitleVal.value = auditNode.auditTitle;
+    }
+    if (designerData.isCreateAgain) {
+      auditNameVal.value = '备注';
+    } else {
+      if (auditNode.auditName) {
+        auditNameVal.value = auditNode.auditName;
+      }
+    }
     let currentNode;
     if (auditNode.isInherit) {
       currentNode = wfData.find((t) => t.type == 'bpmn:StartEvent');
@@ -495,10 +504,10 @@
   async function handleBtnClick(btn) {
     const instanceInfo = JSON.parse(designerData.process.instanceInfo);
     // 验证审批栏必填项
-    const data = await validateForm();
-    if (!data) {
-      return;
-    }
+    // const data = await validateForm();
+    // if (!data) {
+    //   return;
+    // }
     // 有表单先提交表单数据
     if (formVisble.value) {
       var querys = {
diff --git a/src/views/demo/workflow/task/process/look.vue b/src/views/demo/workflow/task/process/look.vue
index 29baaf9a..6d00f950 100644
--- a/src/views/demo/workflow/task/process/look.vue
+++ b/src/views/demo/workflow/task/process/look.vue
@@ -24,7 +24,7 @@
                 v-if="formVisble"
               />
             </a-tab-pane>
-            <a-tab-pane key="flow" tab="流程信息(审核)" force-render>
+            <a-tab-pane key="flow" tab="流程信息" force-render>
               <div class="process-design" :style="'display: flex; height:' + designerData.height">
                 <process-viewer
                   v-if="processVisble"

From 4264e3b8c8ac9b76a34846ee01827e8bcc0c9d4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Fri, 7 Jun 2024 10:16:04 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=93=BE=E6=8E=A5=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/workflow/task/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/demo/workflow/task/index.vue b/src/views/demo/workflow/task/index.vue
index 84aff8f9..1268c9b2 100644
--- a/src/views/demo/workflow/task/index.vue
+++ b/src/views/demo/workflow/task/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ScrollContainer>
     <div ref="wrapperRef" :class="prefixCls">
-      <Tabs tab-position="left" :tabBarStyle="tabBarStyle">
+      <Tabs tab-position="left" :tabBarStyle="tabBarStyle" v-model:activeKey="component">
         <template v-for="item in settingList" :key="item.key">
           <TabPane :tab="item.name">
             <div :style="'display: flex; height:' + data.height">
@@ -19,6 +19,7 @@
   import { Tabs } from 'ant-design-vue';
   import { ScrollContainer } from '@/components/Container';
   import { settingList } from './data';
+  import { useRoute } from 'vue-router';
   import {
     CreateFlow,
     UncompletedTask,
@@ -29,6 +30,8 @@
     DelegateTask,
   } from './page';
 
+  const route = useRoute();
+  const component = route.query.component;
   const TabPane = Tabs.TabPane;
   const tabs = {
     CreateFlow,

From 7390571718afdee67efb4769766e14970220488a Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Fri, 7 Jun 2024 10:57:22 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E3=80=90=E8=A1=A8=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=91=E5=8D=A1=E7=89=87=E7=BB=84=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormViewer/cardGourp.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/FormViewer/cardGourp.vue b/src/components/FormViewer/cardGourp.vue
index 9b081bcd..4d8885c2 100644
--- a/src/components/FormViewer/cardGourp.vue
+++ b/src/components/FormViewer/cardGourp.vue
@@ -15,9 +15,6 @@
     > -->
     <a-card
       style="width: 100%"
-      :tab-list="tabListNoTitle"
-      :active-tab-key="noTitleKey"
-      @tabChange="(key) => onTabChange(key)"
     >
       <BasicForm ref="cardRef" @register="registerForm" @change="changeForm" />
       <template v-if="Object.keys(childItem).length > 0">

From 31d7e719c3b9ee8fa08d6d2480016e8867ab8d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Fri, 7 Jun 2024 11:06:05 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/startEvent/index.vue         | 18 ++++++++++++------
 .../package/penal/userTask/index.vue           | 10 ++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/components/ProcessDesigner/package/penal/startEvent/index.vue b/src/components/ProcessDesigner/package/penal/startEvent/index.vue
index 904358a8..aa5c8099 100644
--- a/src/components/ProcessDesigner/package/penal/startEvent/index.vue
+++ b/src/components/ProcessDesigner/package/penal/startEvent/index.vue
@@ -323,8 +323,6 @@
   // 表单版本更改
   async function custmerformVerisonChange(val, isChange) {
     let obj;
-    console.log(val);
-    console.log(data.formVerisons);
     data.formVerisons.forEach((element) => {
       if (element.id == val) {
         obj = element;
@@ -334,17 +332,16 @@
   }
   function loadFormScheme(strScheme, isChange) {
     const scheme = JSON.parse(strScheme);
-    console.log(scheme);
     const fields: any[] = [];
     const rfields: {
       label?: string;
       value?: string;
     }[] = [];
     scheme.formInfo.tabList = cardNestStructure(scheme.formInfo.tabList);
+    console.log(scheme.formInfo.tabList);
     scheme.formInfo.tabList.forEach((tabElement) => {
       tabElement.schemas.forEach(
         (element: { label?: string; field?: string; component: any; itemProps: any }) => {
-          console.log(element);
           if (['InputGuid'].includes(element.component)) {
             rfields.push({
               label: element.label,
@@ -352,7 +349,6 @@
               value: element.field,
             });
           }
-
           if (
             ![
               'Divider',
@@ -362,6 +358,7 @@
               'CreateTime',
               'ModifyUser',
               'ModifyTime',
+              'CardGroup',
             ].includes(element.component) &&
             !element.itemProps.hidden
           ) {
@@ -414,6 +411,7 @@
               });
             });
           } else if (['Card'].includes(element.component)) {
+            console.log(3);
             element.columns.forEach((child) => {
               child.children.forEach((t) => {
                 fields.push({
@@ -439,6 +437,14 @@
             obj.fieldName = element.componentProps.fieldName;
             fields.push(obj);
           } else if (['CardGroup'].includes(element.component)) {
+            let obj: any = element;
+            obj.required = element.itemProps.required;
+            // obj.componentProps.disabled = false;
+            obj.disabled = true;
+            obj.ifShow = true;
+            obj.fieldName = element.componentProps.fieldName;
+            obj.label = `卡片组-${element.label}`;
+            fields.push(obj);
             element.componentProps.options.forEach((optionsElement) => {
               optionsElement.children.forEach((childrenElement) => {
                 let obj: any = childrenElement;
@@ -446,6 +452,7 @@
                 // obj.componentProps.disabled = false;
                 obj.disabled = true;
                 obj.ifShow = true;
+                obj.label = `${optionsElement.label} - ${childrenElement.label}`;
                 obj.fieldName = childrenElement.componentProps.fieldName;
                 fields.push(obj);
               });
@@ -454,7 +461,6 @@
         },
       );
     });
-    console.log(fields);
     data.formRelations = rfields;
     if (isChange) {
       node.value.authFields = fields;
diff --git a/src/components/ProcessDesigner/package/penal/userTask/index.vue b/src/components/ProcessDesigner/package/penal/userTask/index.vue
index 60d72bd4..e179fd0c 100644
--- a/src/components/ProcessDesigner/package/penal/userTask/index.vue
+++ b/src/components/ProcessDesigner/package/penal/userTask/index.vue
@@ -922,6 +922,7 @@
               'CreateTime',
               'ModifyUser',
               'ModifyTime',
+              'CardGroup',
             ].includes(element.component) &&
             !element.itemProps.hidden
           ) {
@@ -999,6 +1000,14 @@
             obj.fieldName = element.componentProps.fieldName;
             fields.push(obj);
           } else if (['CardGroup'].includes(element.component)) {
+            let obj: any = element;
+            obj.required = element.itemProps.required;
+            // obj.componentProps.disabled = false;
+            obj.disabled = true;
+            obj.ifShow = true;
+            obj.fieldName = element.componentProps.fieldName;
+            obj.label = `卡片组-${element.label}`;
+            fields.push(obj);
             element.componentProps.options.forEach((optionsElement) => {
               optionsElement.children.forEach((childrenElement) => {
                 let obj: any = childrenElement;
@@ -1006,6 +1015,7 @@
                 // obj.componentProps.disabled = false;
                 obj.disabled = true;
                 obj.ifShow = true;
+                obj.label = `${optionsElement.label} - ${childrenElement.label}`;
                 obj.fieldName = childrenElement.componentProps.fieldName;
                 fields.push(obj);
               });

From d61e9e719b531fecd8fe7bc15d750ca3624a3363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com>
Date: Fri, 7 Jun 2024 11:31:22 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E5=9B=BE=E5=BD=A2=E5=8C=96=E5=BB=BA?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=AA=E7=95=99gid=E5=92=8Cgeom=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1-=E5=9B=BE=E6=96=91=E7=BB=84=E4=BB=B6-=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VFormDesign/components/ComponentProps.vue |  15 +-
 .../VFormDesign/components/FormItemProps.vue  | 104 ++-----------
 .../VFormDesign/components/FormProps.vue      |  12 +-
 .../form-design/typings/v-form-component.ts   |   9 +-
 .../demo/system/graphicaltable/index.data.ts  |   5 -
 .../demo/system/graphicaltable/index.vue      |  19 ---
 .../system/graphicaltable/modal/index.vue     | 138 +++---------------
 .../system/graphicaltable/modal/modal.data.ts |  23 ---
 8 files changed, 45 insertions(+), 280 deletions(-)

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 7aff20cc..83d64c47 100644
--- a/src/views/demo/form-design/components/VFormDesign/components/ComponentProps.vue
+++ b/src/views/demo/form-design/components/VFormDesign/components/ComponentProps.vue
@@ -108,7 +108,7 @@
               'Cascader',
               'AutoComplete',
               'Tabs',
-              'CardGroup'
+              'CardGroup',
             ].includes(formConfig.currentItem.component)
           "
         >
@@ -132,13 +132,14 @@
     title="按钮点击脚本"
     :height="500"
     :width="1000"
+    :useWrapper="false"
     @ok="handleSubmit"
   >
     <div style="display: flex">
-      <div calss="propsScript" style="width: 50%">
+      <div class="w-1/2 xl:w-1/2" style="overflow: auto; height: calc(100%)">
         <a-textarea v-model:value="formContent" :rows="29" />
       </div>
-      <div calss="propsScript" style="width: 50%">
+      <div class="w-1/2 xl:w-1/2" style="overflow: auto; height: calc(100%)">
         <a-alert message="脚本参数说明,只支持ES5语法（兼容小程序）" type="warning">
           <template #description>
             <div v-html="description"></div>
@@ -504,11 +505,3 @@
     },
   });
 </script>
-
-<style scoped>
-  .propsScript {
-    width: 50%;
-    overflow: auto;
-    height: calc(100%);
-  }
-</style>
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 0ff3ccd7..37485b83 100644
--- a/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
+++ b/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
@@ -11,61 +11,14 @@
         layout="vertical"
         description="图斑控件"
       >
-        <FormItem label="图斑宽度">
-          <a-input-number
-            v-model:value="formConfig.currentItem.mapSetData.width"
-            placeholder="请输入图斑宽度"
-            :min="1"
-            :max="100"
-          >
-            <template #addonAfter><PercentageOutlined /></template>
-          </a-input-number>
-        </FormItem>
-        <FormItem label="选择图层">
+        <FormItem label="选择空间数据表">
           <a-select
             v-model:value="formConfig.currentItem.mapSetData.chooseLayer"
             :options="shpLayerSourceOptions"
             size="middle"
-            placeholder="请选择图层"
-            @change="handleChangeDataTable"
+            placeholder="请选择空间数据表"
           />
         </FormItem>
-        <FormItem label="图层字段解析">
-          <FormItem label="图层数据表">
-            <a-input
-              v-model:value="formConfig.currentItem.mapSetData.layerFields.dataTable"
-              placeholder="请输入图层数据表"
-              disabled="false"
-            />
-          </FormItem>
-          <FormItem label="GID字段">
-            <a-select
-              v-model:value="formConfig.currentItem.mapSetData.layerFields.gidField"
-              :options="formConfig.currentItem.mapSetData.layerFields.labelFieldOptions"
-              size="middle"
-              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 label="Geom字段">
-            <a-select
-              v-model:value="formConfig.currentItem.mapSetData.layerFields.geomField"
-              :options="formConfig.currentItem.mapSetData.layerFields.labelFieldOptions"
-              size="middle"
-              placeholder="请选择Geom字段"
-            />
-          </FormItem>
-        </FormItem>
-        <FormItem label="是否允许添加图斑">
-          <Switch v-model:checked="formConfig.currentItem.mapSetData.isAllowAddPolygon" />
-        </FormItem>
         <FormItem label="是否允许编辑图斑">
           <Switch v-model:checked="formConfig.currentItem.mapSetData.isAllowEditPolygon" />
         </FormItem>
@@ -204,7 +157,9 @@
   import RuleProps from './RuleProps.vue';
   import { useFormDesignState } from '../../../hooks/useFormDesignState';
   import { isArray } from 'lodash-es';
-  import { ShpLayerSourceLoadPage, GetTableAndViewColumnList } from '@/api/demo/formScheme';
+  // api
+  // import { loadTableRecordInfo } from '@/api/database/index';
+  import { ShpLayerSourceLoadPage } from '@/api/demo/formScheme';
 
   const { formConfig } = useFormDesignState();
 
@@ -232,12 +187,9 @@
         if (formConfig.value.currentItem.field === 'MapGeom') {
           // 图斑组件
           formConfig.value.currentItem.mapSetData = formConfig.value.currentItem.mapSetData || {
-            width: 50,
             chooseLayer: '',
-            layerFields: {},
-            isAllowAddPolygon: true,
-            isAllowEditPolygon: true,
-            isEnablePostionJump: true,
+            isAllowEditPolygon: false,
+            isEnablePostionJump: false,
           };
           // 选择图层
           if (shpLayerSourceOptions.value.length == 0) {
@@ -264,50 +216,12 @@
 
   // 选择图层
   async function getShpLayerSourceOptions() {
+    // let options: any = await loadTableRecordInfo({});
     let options: any = await ShpLayerSourceLoadPage();
     shpLayerSourceOptions.value = [];
     options.items.forEach((e) => {
+      // shpLayerSourceOptions.value.push({ label: e.tableName, value: e.tableName });
       shpLayerSourceOptions.value.push({ label: e.name, value: e.relationTable });
     });
   }
-  // 选择图层-图层数据表
-  function handleChangeDataTable(table) {
-    formConfig.value.currentItem.mapSetData.layerFields.dataTable = table;
-    if (table) {
-      getShpLayerSource(table);
-    }
-  }
-  // 图层数据表-GID字段/名称字段标注/Geom字段
-  async function getShpLayerSource(table) {
-    if (formConfig.value.currentItem.field === 'MapGeom') {
-      let querys: any = {
-        dbCode: dbcode.value,
-        tableName: table,
-      };
-      const obj: any = await GetTableAndViewColumnList(querys);
-      let labelFieldOptions: any = [];
-      if (obj.length > 0) {
-        obj.forEach((e) => {
-          labelFieldOptions.push({ label: e.column_name, value: e.column_name });
-        });
-        // GID字段/名称字段标注/Geom字段 下拉选项
-        formConfig.value.currentItem.mapSetData.layerFields.labelFieldOptions = labelFieldOptions;
-        // GID字段
-        formConfig.value.currentItem.mapSetData.layerFields.gidField = obj[0].column_name;
-        // Geom字段
-        formConfig.value.currentItem.mapSetData.layerFields.geomField = obj[1].column_name;
-        // 名称字段标注
-        formConfig.value.currentItem.mapSetData.layerFields.labelField = obj[2].column_name;
-      } else {
-        // GID字段/名称字段标注/Geom字段 下拉选项
-        formConfig.value.currentItem.mapSetData.layerFields.labelFieldOptions = [];
-        // GID字段
-        formConfig.value.currentItem.mapSetData.layerFields.gidField = '';
-        // Geom字段
-        formConfig.value.currentItem.mapSetData.layerFields.geomField = '';
-        // 名称字段标注
-        formConfig.value.currentItem.mapSetData.layerFields.labelField = '';
-      }
-    }
-  }
 </script>
diff --git a/src/views/demo/form-design/components/VFormDesign/components/FormProps.vue b/src/views/demo/form-design/components/VFormDesign/components/FormProps.vue
index 8b2e5442..064c46c2 100644
--- a/src/views/demo/form-design/components/VFormDesign/components/FormProps.vue
+++ b/src/views/demo/form-design/components/VFormDesign/components/FormProps.vue
@@ -114,10 +114,10 @@
     @ok="handleSubmit"
   >
     <div style="display: flex">
-      <div calss="propsScript" style="width: 50%">
+      <div class="w-1/2 xl:w-1/2" style="overflow: auto; height: calc(100%)">
         <a-textarea v-model:value="formContent" :rows="29" />
       </div>
-      <div calss="propsScript" style="width: 50%">
+      <div class="w-1/2 xl:w-1/2" style="overflow: auto; height: calc(100%)">
         <a-alert message="脚本参数说明" type="warning">
           <template #description>
             <div v-html="description"></div>
@@ -250,11 +250,3 @@
     return flag;
   }
 </script>
-
-<style scoped>
-  .propsScript {
-    width: 50%;
-    overflow: auto;
-    height: calc(100%);
-  }
-</style>
diff --git a/src/views/demo/form-design/typings/v-form-component.ts b/src/views/demo/form-design/typings/v-form-component.ts
index 0c783aab..25d090fd 100644
--- a/src/views/demo/form-design/typings/v-form-component.ts
+++ b/src/views/demo/form-design/typings/v-form-component.ts
@@ -42,9 +42,12 @@ export interface MapComponent {
   isShowMap?: boolean;
   layers?: any[];
   baseLayers?: any[];
-  mode?:string;
-  angle?:number;
-  center?:string,
+  mode?: string;
+  angle?: number;
+  center?: string;
+  chooseLayer?: string;
+  isAllowEditPolygon?: boolean;
+  isEnablePostionJump?: boolean;
 }
 
 /**
diff --git a/src/views/demo/system/graphicaltable/index.data.ts b/src/views/demo/system/graphicaltable/index.data.ts
index 4fff29e2..796509e1 100644
--- a/src/views/demo/system/graphicaltable/index.data.ts
+++ b/src/views/demo/system/graphicaltable/index.data.ts
@@ -7,11 +7,6 @@ export const graphicaltableColumns: BasicColumn[] = [
     dataIndex: 'tableName',
     width: 200,
   },
-  {
-    title: '类型',
-    dataIndex: 'type',
-    width: 200,
-  },
   {
     title: '行数据',
     dataIndex: 'columnJson',
diff --git a/src/views/demo/system/graphicaltable/index.vue b/src/views/demo/system/graphicaltable/index.vue
index 68eea08d..619648c8 100644
--- a/src/views/demo/system/graphicaltable/index.vue
+++ b/src/views/demo/system/graphicaltable/index.vue
@@ -10,9 +10,6 @@
         <a-button type="primary" @click="handleAdd">新增</a-button>
       </template>
       <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'type'">
-          {{ record.type ? '空间类型' : '非空间类型' }}
-        </template>
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
@@ -22,12 +19,6 @@
                   handleView(record);
                 },
               },
-              {
-                label: '编辑',
-                onClick: () => {
-                  handleEdit(record);
-                },
-              },
             ]"
           />
         </template>
@@ -99,16 +90,6 @@
       record,
     });
   }
-  // 编辑-打开窗口
-  function handleEdit(record) {
-    isUpdate.value = true;
-    isDetail.value = false;
-    openModal(true, {
-      isUpdate,
-      isDetail,
-      record,
-    });
-  }
 
   // 新增、编辑、删除-提交后刷新
   function submit() {
diff --git a/src/views/demo/system/graphicaltable/modal/index.vue b/src/views/demo/system/graphicaltable/modal/index.vue
index a1d49284..01b6edb2 100644
--- a/src/views/demo/system/graphicaltable/modal/index.vue
+++ b/src/views/demo/system/graphicaltable/modal/index.vue
@@ -20,24 +20,9 @@
       </div>
     </div>
     <BasicTable class="w-3/4 xl:w-5/5" @register="registerTable">
-      <template #toolbar>
-        <a-button type="primary" @click="handleAdd" v-if="!isDetail"> 新增 </a-button>
-        <!-- <a-button type="success" @click="handleSubmit"> 保存 </a-button> -->
-      </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'name' && !isDetail">
-          <a-input
-            v-model:value="record.name"
-            placeholder="请输入字段名"
-            :disabled="record.name == 'geom'"
-            @change="
-              if (changeNameAndType()) {
-                if (record.name == 'geom' && record.type != 'geometry(GEOMETRY)') {
-                  record.type = 'geometry(GEOMETRY)';
-                }
-              }
-            "
-          />
+          <a-input v-model:value="record.name" placeholder="请输入字段名" :disabled="true" />
         </template>
         <template v-if="column.key === 'type' && !isDetail">
           <a-select
@@ -46,15 +31,7 @@
             placeholder="请选择"
             v-model:value="record.type"
             :options="codesTypeArr"
-            @change="
-              if (changeNameAndType()) {
-                if (record.type == 'geometry(GEOMETRY)') {
-                  record.name = 'geom';
-                } else if (record.name && record.name == 'geom') {
-                  record.name = '';
-                }
-              }
-            "
+            :disabled="true"
           />
         </template>
         <template v-if="column.key === 'type' && isDetail">
@@ -63,33 +40,19 @@
         <template v-if="column.key === 'explanation' && !isDetail">
           <a-input v-model:value="record.explanation" placeholder="不能含有英文字符的,和:" />
         </template>
-        <template v-if="column.key === 'action' && (!record.isOldColumn || !isUpdate)">
-          <TableAction
-            :actions="[
-              {
-                label: '删除',
-                color: 'error',
-                onClick: () => {
-                  handleDelete(record);
-                },
-              },
-            ]"
-          />
-        </template>
       </template>
     </BasicTable>
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, onMounted, defineEmits, watch } from 'vue';
+  import { ref, onMounted, defineEmits } from 'vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
-  import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { columns, columns_isDetail } from './modal.data';
+  import { BasicTable, useTable } from '@/components/Table';
+  import { columns } from './modal.data';
   import { useMessage } from '@/hooks/web/useMessage';
   // api
   import { createPicTable, updateTable } from '@/api/database/index';
   import { getLoad } from '@/api/sys/sysDataItemDetail';
-  import { array } from 'vue-types';
 
   const emit = defineEmits(['submit']);
   const { createMessage } = useMessage();
@@ -99,7 +62,6 @@
   // 是否是详情
   const isDetail = ref(false);
   const tableName: any = ref('');
-  const tableColumns: any = ref([]);
   const codesTypeArr: any = ref([
     { label: 'varchar', value: 'varchar' },
     { label: 'int', value: 'int' },
@@ -116,7 +78,7 @@
     if (!data.record) {
       tableName.value = null;
       setTableData([]);
-      handleAdd();
+      handleAdd_geom();
       reload();
     } else {
       // 编辑、详情
@@ -137,18 +99,12 @@
       setTableData(arr);
       reload();
     }
-    // 详情隐藏按钮
-    if (isDetail.value) {
-      tableColumns.value = columns_isDetail;
-    } else {
-      tableColumns.value = columns;
-    }
   });
 
   // 表格
   const [registerTable, { reload, setTableData, getDataSource }] = useTable({
     rowKey: '',
-    columns: tableColumns,
+    columns,
     formConfig: {
       labelWidth: 120,
     },
@@ -162,24 +118,27 @@
     },
   });
   // 新增
-  function handleAdd() {
+  function handleAdd_geom() {
     let viesObj: any = getDataSource() || [];
-    viesObj.push({ name: '', type: '', explanation: '', length: 255, id: new Date().getTime() });
+    viesObj.push(
+      {
+        name: 'gid',
+        type: 'varchar',
+        explanation: '',
+        length: 255,
+        id: new Date().getTime(),
+      },
+      {
+        name: 'geom',
+        type: 'geometry(GEOMETRY)',
+        explanation: '',
+        length: 255,
+        id: new Date().getTime(),
+      },
+    );
     setTableData(viesObj);
     reload();
   }
-  // 删除
-  function handleDelete(record: Recordable) {
-    let arr = getDataSource();
-    let newArr: any = [];
-    arr.forEach((item) => {
-      if (item.id !== record.id) {
-        newArr.push(item);
-      }
-    });
-    setTableData(newArr);
-    reload();
-  }
   // 提交
   function handleOk() {
     // 检测：表名
@@ -193,29 +152,9 @@
       return;
     }
     let arr = getDataSource();
-    // 检测：字段行
-    if (!arr || arr.length == 0) {
-      createMessage.warn('至少输入一行字段!');
-      return;
-    }
     let flag = true;
     if (arr) {
       arr.forEach((item) => {
-        // 检测：字段名和字段类型不为空
-        if (item.name == '' || item.type == '') {
-          createMessage.warn('字段名和字段类型都是必填项!');
-          flag = false;
-        }
-        // 检测：字段名中不能含有中文!
-        if (/[\u4e00-\u9fa5]/.test(item.name)) {
-          createMessage.warn('字段名中不能含有中文!');
-          flag = false;
-        }
-        // 检测：数据库字段名的命名规则
-        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(item.name)) {
-          createMessage.warn('字段名不符合数据库字段名的命名规则!');
-          flag = false;
-        }
         // 检测：备注不能含有英文字符的,和:
         if (
           item.explanation &&
@@ -280,35 +219,6 @@
     }
     return '';
   }
-  // 检测：只能有一个geom和geometry(GEOMETRY)
-  function changeNameAndType() {
-    let arr = getDataSource();
-    // geom出现的次数
-    let geomNumber = 0;
-    // geom当前出现的数组
-    let geomShowIndex = 0;
-    arr.forEach((item, index) => {
-      if (item.name == 'geom' || item.type == 'geometry(GEOMETRY)') {
-        geomNumber++;
-        geomShowIndex = index;
-      }
-    });
-    if (geomNumber < 2) {
-      return true;
-    } else {
-      createMessage.warn('一个表同时只能有一个geom和空间类型！');
-      // 赋值
-      arr[geomShowIndex] = {
-        name: '',
-        type: '',
-        explanation: arr[geomShowIndex].explanation,
-        length: arr[geomShowIndex].length,
-        id: arr[geomShowIndex].id,
-      };
-      setTableData(arr);
-      return false;
-    }
-  }
   onMounted(() => {
     getCodesTypeArr();
   });
diff --git a/src/views/demo/system/graphicaltable/modal/modal.data.ts b/src/views/demo/system/graphicaltable/modal/modal.data.ts
index 5c24f57d..03179324 100644
--- a/src/views/demo/system/graphicaltable/modal/modal.data.ts
+++ b/src/views/demo/system/graphicaltable/modal/modal.data.ts
@@ -16,27 +16,4 @@ export const columns: BasicColumn[] = [
     dataIndex: 'explanation',
     key: 'explanation',
   },
-  {
-    title: '操作',
-    dataIndex: 'action',
-    key: 'action',
-  },
-];
-
-export const columns_isDetail: BasicColumn[] = [
-  {
-    title: '字段名',
-    dataIndex: 'name',
-    key: 'name',
-  },
-  {
-    title: '类型',
-    dataIndex: 'type',
-    key: 'type',
-  },
-  {
-    title: '备注',
-    dataIndex: 'explanation',
-    key: 'explanation',
-  },
 ];

From 9eef95986236212f2817d2fcbea92919c5a59f9a Mon Sep 17 00:00:00 2001
From: zzq <15064940501@163.com>
Date: Fri, 7 Jun 2024 11:41:35 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E6=A0=85=E6=A0=BC=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/onlineform/formCall/CallModal.vue    |  9 +++++++--
 .../onlineform/formModule/modalDesign.vue     |  6 ------
 .../onlineform/formModule/modalForm-Modal.vue | 16 +++++++++++++--
 .../demo/onlineform/formdesign/FormModal.vue  | 20 +++++++++++--------
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/views/demo/onlineform/formCall/CallModal.vue b/src/views/demo/onlineform/formCall/CallModal.vue
index 5eab444d..ad9558bb 100644
--- a/src/views/demo/onlineform/formCall/CallModal.vue
+++ b/src/views/demo/onlineform/formCall/CallModal.vue
@@ -233,7 +233,10 @@
             if (index == 0) {
               opt.itemProps.hidden = false;
             }
-            arr.push(opt);
+            if (opt.ptype !== 'gridlayout') {
+              arr.push(opt);
+            }
+
             formColumns.value = arr;
           });
         });
@@ -258,7 +261,9 @@
             });
           });
         } else {
-          arr.push(item);
+          if (item.ptype !== 'gridlayout') {
+            arr.push(item);
+          }
         }
         formColumns.value = arr;
         if (item.component === 'Card') {
diff --git a/src/views/demo/onlineform/formModule/modalDesign.vue b/src/views/demo/onlineform/formModule/modalDesign.vue
index ad0d40ae..a40f485c 100644
--- a/src/views/demo/onlineform/formModule/modalDesign.vue
+++ b/src/views/demo/onlineform/formModule/modalDesign.vue
@@ -220,18 +220,14 @@
       formScheme.value.formInfo.tabList.forEach((item, index) => {
         item.schemas.forEach((val) => {
           if (val.columns) {
-            console.log('val', val);
             val.columns.forEach((col) => {
               col.children.forEach((chil) => {
                 arr.push(chil);
               });
             });
-          } else {
-            arr.push(val);
           }
         });
       });
-      console.log('item.columns', arr);
       formScheme.value.formInfo.schemas = arr;
     }
     if (formScheme.value.formInfo.tabList && formScheme.value.formInfo.tabList.length == 1) {
@@ -243,8 +239,6 @@
               arr.push(chil);
             });
           });
-        } else {
-          arr.push(item);
         }
       });
       formScheme.value.formInfo.schemas = arr;
diff --git a/src/views/demo/onlineform/formModule/modalForm-Modal.vue b/src/views/demo/onlineform/formModule/modalForm-Modal.vue
index 06bd3919..544b6252 100644
--- a/src/views/demo/onlineform/formModule/modalForm-Modal.vue
+++ b/src/views/demo/onlineform/formModule/modalForm-Modal.vue
@@ -158,10 +158,16 @@
     if (scheme.formInfo.tabList && scheme.formInfo.tabList.length > 1) {
       const arr: any = [];
       scheme.formInfo.tabList.forEach((item, index) => {
+        const rowArr: any = [];
+        item.schemas.forEach((col) => {
+          if (col.ptype !== 'gridlayout') {
+            rowArr.push(col);
+          }
+        });
         arr.push({
           label: item.text,
           value: index + 1,
-          children: item.schemas,
+          children: rowArr,
         });
       });
       scheme.formInfo.schemas = [
@@ -183,7 +189,13 @@
       ];
     }
     if (scheme.formInfo.tabList && scheme.formInfo.tabList.length == 1) {
-      scheme.formInfo.schemas = scheme.formInfo.tabList[0].schemas;
+      const arr: any = [];
+      scheme.formInfo.tabList[0].schemas.forEach((item) => {
+        if (item.ptype !== 'gridlayout') {
+          arr.push(item);
+        }
+      });
+      scheme.formInfo.schemas = arr;
     }
     delete scheme.formInfo.tabList;
     formConfig.value.schemas = scheme.formInfo.schemas;
diff --git a/src/views/demo/onlineform/formdesign/FormModal.vue b/src/views/demo/onlineform/formdesign/FormModal.vue
index 7db8d923..640142aa 100644
--- a/src/views/demo/onlineform/formdesign/FormModal.vue
+++ b/src/views/demo/onlineform/formdesign/FormModal.vue
@@ -132,18 +132,22 @@
             }
           });
           item.componentProps.options = [];
+        } else if (item.component === 'Grid' && item.label === '栅格布局') {
+          item.columns = changeCardStructure(item.columns);
+          item.columns.forEach((childItem) => {
+            childItem.children.forEach((col) => {
+              result.push({ ...col, ptype: 'gridlayout', pfield: item.field });
+            });
+          });
         } else if (item.children && !item.field) {
           item.children = changeCardStructure(item.children);
         } else if (item.children && item.field.indexOf('use_card') === -1) {
           item.children = changeCardStructure(item.children);
           item.children = [];
         } else {
-          if (['Grid', 'Card'].includes(item.component)) {
+          if (['Card'].includes(item.component)) {
             item.columns[0].children = changeCardStructure(item.columns[0].children);
-            if (
-              (item.component === 'Card' || (item.component === 'Grid' && !item.type)) &&
-              item.columns[0].children
-            ) {
+            if (item.component === 'Card' && item.columns[0].children) {
               item.columns[0].children.forEach((childItem) => {
                 if (childItem.pfield) {
                   result.push(childItem);
@@ -168,8 +172,8 @@
         result.push(item);
       });
       return result;
-    }else{
-      return data
+    } else {
+      return data;
     }
   };
   async function designSendGrandson(value) {
@@ -522,7 +526,7 @@
       } else if (item.component === 'CardGroup') {
         item.componentProps.options = childList[item.field] || [];
         result.push(item);
-      } else if (item.component === 'Card' || item.component === 'Grid') {
+      } else if (item.component === 'Card') {
         item.columns[0].children = childList[item.field] || [];
         result.push(item);
       } else if (item.field.indexOf('use_card') !== -1) {

From 90276e2b720efc0bc8b7fe15485a562477788eca Mon Sep 17 00:00:00 2001
From: zzq <15064940501@163.com>
Date: Fri, 7 Jun 2024 15:20:09 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E6=A0=85=E6=A0=BC=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormViewer/index.vue          | 17 +++++++++++-
 src/views/demo/onlineform/formCall/index.vue | 27 ++++++++++----------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue
index c2b447ab..c706f558 100644
--- a/src/components/FormViewer/index.vue
+++ b/src/components/FormViewer/index.vue
@@ -122,7 +122,9 @@
       labelWidth: 100,
       schemas: formColumns,
       showActionButtonGroup: false,
-      baseColProps: { lg: 24, md: 24 },
+      actionColOptions: {
+        span: 24,
+      },
     });
   async function getFormHistory() {
     console.log('getFormHistory');
@@ -223,6 +225,19 @@
               ...element,
             });
           }
+          //栅格
+          if (element.component === 'Grid' && element.label === '栅格布局') {
+            element.columns.forEach((itemColumn) => {
+              itemColumn.children.forEach((itemColumnChild) => {
+                itemColumnChild.colProps.span = itemColumn.span;
+                formColumns.push({
+                  parentValue: index,
+                  ...itemColumnChild,
+                  show: index == 0 ? true : false,
+                });
+              });
+            });
+          }
           formColumns.push({
             parentValue: index,
             ...element,
diff --git a/src/views/demo/onlineform/formCall/index.vue b/src/views/demo/onlineform/formCall/index.vue
index 348f5622..b1a45165 100644
--- a/src/views/demo/onlineform/formCall/index.vue
+++ b/src/views/demo/onlineform/formCall/index.vue
@@ -262,13 +262,13 @@
     showTableSetting: true,
     bordered: true,
     beforeFetch: (data) => {
-      console.log('item.key', data)
+      console.log('item.key', data);
       // 接口请求前 参数处理
       const querys = JSON.parse(JSON.stringify(data));
-      console.log('1111', querys)
+      console.log('1111', querys);
       delete querys.page;
       delete querys.limit;
-      console.log('querys', querys)
+      console.log('querys', querys);
       var temp = {
         id: paramsId.value,
         paginationInputDto: {
@@ -448,7 +448,7 @@
           return createMessage.warn('请选择一条数据进行编辑');
         }
 
-        console.log("rowsrows",rows);
+        console.log('rowsrows', rows);
         btnList.value.forEach((element) => {
           if (element.prop === 'Edit' && element.isWFlow) {
             flowCode.value = element.wFlowCode;
@@ -473,8 +473,8 @@
           if (haveMap.value) {
             showFormModalData.value = toProps;
             openShowFormModal.value = true;
-            console.log("mapgemoList",mapgemoList);
-            console.log("mapSetData",mapSetData);
+            console.log('mapgemoList', mapgemoList);
+            console.log('mapSetData', mapSetData);
             MapboxComponent.value.handlerDraw(
               mapgemoList.value,
               mapSetData.value.isAllowEditPolygon,
@@ -693,8 +693,9 @@
       key: designData.value.primaryKey,
       keyValue,
     };
-    getFormData(params).then((res) => {
-        console.log("res111",res);
+    getFormData(params)
+      .then((res) => {
+        console.log('res111', res);
         let childTableName = designData.value.db.find((item) => item.type === 'chlid').name;
         let mainTableName = designData.value.db.find((item) => item.type === 'main').name;
         let subTableData = res[childTableName].map((item) => {
@@ -714,12 +715,10 @@
           };
         });
 
-
-        res[mainTableName].forEach(item => {
-          infoUseMainTableData.value = {...infoUseMainTableData.value, ...item}
-        })
-        mapgemoList.value = formData.value
-
+        res[mainTableName].forEach((item) => {
+          infoUseMainTableData.value = { ...infoUseMainTableData.value, ...item };
+        });
+        mapgemoList.value = formData.value;
       })
       .catch((err) => {
         console.log('err', err);

From d5979907225225e30245530a25d7f48e35bbcb1e Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Fri, 7 Jun 2024 16:04:12 +0800
Subject: [PATCH 15/17] =?UTF-8?q?[=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AF]?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E7=BB=84=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E4=B8=AD=E7=9A=84=E5=8D=A1=E7=89=87=E7=BB=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=A0=E9=80=92=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormViewer/cardGourp.vue |  8 ++++----
 src/components/FormViewer/index.vue     | 12 ++++++++----
 src/store/modules/subTable.ts           |  4 ++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/FormViewer/cardGourp.vue b/src/components/FormViewer/cardGourp.vue
index 4d8885c2..ab2e01c7 100644
--- a/src/components/FormViewer/cardGourp.vue
+++ b/src/components/FormViewer/cardGourp.vue
@@ -3,7 +3,7 @@
     <div style="display:flex;margin-bottom:10px">
       {{ tableData.label }}
       <div style="margin-left:10px">
-        <a-radio-group v-model:value="noTitleKey" :options="tableData.componentProps.options" @change="onTabChange"/>
+        <a-radio-group v-model:value="noTitleKey" :options="tableData.componentProps.options" @change="onTabChange($event,tableData.field)"/>
       </div>
     </div>
     <!-- <a-card
@@ -125,9 +125,9 @@
   setTimeout(() => {
     resetFields();
   }, 10);
-
-  const onTabChange = (value: string) => {
-    value = value.target.value
+  const onTabChange = (event, field) => {
+    let value = event.target.value
+    subTableDataStore.setOneGroupData(field, value)
     noTitleKey.value = value;
     var currentIndex = (childGourp.value || []).findIndex((element) => element.index === value);
     console.log(currentIndex);
diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue
index c2b447ab..90546f88 100644
--- a/src/components/FormViewer/index.vue
+++ b/src/components/FormViewer/index.vue
@@ -6,7 +6,7 @@
           <BasicForm ref="myDataBaseFormRef" @register="registerForm" />
           <subTable ref="subTableRef" :data="subTableColumns[index]" :tabsKey="tabsKey" />
           <CardGourp
-            v-if="cardGroupData.length > 0"
+            v-if="cardGroupData.length > 0 && cardGroupData[index]"
             :data="cardGroupData[index]"
             :formData="cardGourpFormData"
             :parentValue="cardGroupData[index].field"
@@ -219,9 +219,13 @@
           }
           // 卡片组布局
           if (element.component === 'CardGroup') {
-            cardGroupData.value.push({
-              ...element,
-            });
+            if(cardGroupData.value.length !== index){
+              cardGroupData.value.push(null)
+            }
+            cardGroupData.value.push(element);
+            // cardGroupData.value.push({
+            //   ...element,
+            // });
           }
           formColumns.push({
             parentValue: index,
diff --git a/src/store/modules/subTable.ts b/src/store/modules/subTable.ts
index afbf909f..0f550427 100644
--- a/src/store/modules/subTable.ts
+++ b/src/store/modules/subTable.ts
@@ -32,6 +32,10 @@ export const subTableStore = defineStore({
         }
       }
     },
+    setOneGroupData (key,data){
+      this.groupData[key] = data
+      console.log(this.groupData)
+    },
     clearGoupData() {
       this.groupData = {};
     },

From 52c8aa536cb1ccf9468ece3a6e4ca92e5a00204c Mon Sep 17 00:00:00 2001
From: zzq <15064940501@163.com>
Date: Fri, 7 Jun 2024 17:16:15 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/onlineform/formCall/CallModal.vue    | 21 +++++++++++++---
 src/views/demo/onlineform/formCall/index.vue  | 24 ++++++++++++++-----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/views/demo/onlineform/formCall/CallModal.vue b/src/views/demo/onlineform/formCall/CallModal.vue
index ad9558bb..4f73780d 100644
--- a/src/views/demo/onlineform/formCall/CallModal.vue
+++ b/src/views/demo/onlineform/formCall/CallModal.vue
@@ -224,6 +224,11 @@
                   }
                   itemColumnChild.colProps.span = itemColumn.span;
                   arr.push(itemColumnChild);
+                  // arr.push({
+                  //   parentValue: index,
+                  //   ...itemColumnChild,
+                  //   show: index == 0 ? true : false,
+                  // });
                   val.children.push(itemColumnChild);
                 });
               });
@@ -235,6 +240,11 @@
             }
             if (opt.ptype !== 'gridlayout') {
               arr.push(opt);
+              // arr.push({
+              //   parentValue: index,
+              //   ...opt,
+              //   show: index == 0 ? true : false,
+              // });
             }
 
             formColumns.value = arr;
@@ -388,7 +398,7 @@
     }
   });
 
-  function tabsChange(e) {
+  async function tabsChange(e) {
     const columns: FormSchema[] = [];
     tabsColumns.value.forEach((item) => {
       item.children.forEach((val) => {
@@ -398,13 +408,18 @@
     tabsColumns.value[e].children.forEach((item) => {
       item.itemProps.hidden = false;
     });
+    // formColumns.value.forEach((element) => {
+    //   element.show = false;
+    //   if (element.parentValue == e) {
+    //     element.show = true;
+    //   }
+    // });
     tabsColumns.value.forEach((item) => {
       item.children.forEach((val) => {
         columns.push(val);
       });
     });
-    const obj = getFieldsValue();
-
+    const obj = await validate();
     setTimeout(() => {
       updateSchema(columns);
       resetFields();
diff --git a/src/views/demo/onlineform/formCall/index.vue b/src/views/demo/onlineform/formCall/index.vue
index b1a45165..09ee7215 100644
--- a/src/views/demo/onlineform/formCall/index.vue
+++ b/src/views/demo/onlineform/formCall/index.vue
@@ -616,12 +616,24 @@
       }
       if (columnObj.table.querys) {
         columnObj.table.querys.forEach((item) => {
-          searchFormSchema.push({
-            field: item.key,
-            component: item.type || 'Input',
-            label: item.label,
-            colProps: { span: 6 },
-          });
+          if (item.options) {
+            searchFormSchema.push({
+              field: item.key,
+              component: item.type || 'Input',
+              label: item.label,
+              colProps: { span: 6 },
+              componentProps: {
+                options: item.options,
+              },
+            });
+          } else {
+            searchFormSchema.push({
+              field: item.key,
+              component: item.type || 'Input',
+              label: item.label,
+              colProps: { span: 6 },
+            });
+          }
         });
       }
       callColumns.forEach((item) => {

From 733d997e9172ece5a19a15ce94a12ae64ade4858 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Fri, 7 Jun 2024 17:28:27 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E3=80=90=E8=A1=A8=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=91=E5=8D=A1=E7=89=87=E7=BB=84=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormViewer/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue
index 56e0ea96..de7b34f2 100644
--- a/src/components/FormViewer/index.vue
+++ b/src/components/FormViewer/index.vue
@@ -327,6 +327,7 @@
     }
     console.log(obj);
     cardGourpFormData.value = obj;
+    subTableDataStore.setGroupData(obj)
     FieldsValue.value = obj;
     setFieldsValue({
       ...obj,