Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

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);

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"
@@ -221,9 +221,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,
+            // });
           }
           //栅格
           if (element.component === 'Grid' && element.label === '栅格布局') {

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 = {};
     },