From 48459a77a641cc95a83a45eb17297f9b2e63564c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 27 Dec 2023 15:42:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20cmdb=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=BC=95=E7=94=A8=E8=A1=A8=E5=8D=95formtab=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-edit.vue   |  7 ++++-
 .../TsSheet/form/component/formcollapse.vue   |  1 -
 .../plugins/TsSheet/subformconfig.vue         | 15 +++++++--
 .../cmdbpolicy/cmdbsync-dialog.vue            | 31 ++++++++++++++-----
 .../process/flow/flowedit/FlowSetting.vue     | 10 ++++--
 5 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form-edit.vue b/src/resources/plugins/TsSheet/form-edit.vue
index a56889a7..baf7ffa3 100644
--- a/src/resources/plugins/TsSheet/form-edit.vue
+++ b/src/resources/plugins/TsSheet/form-edit.vue
@@ -2,7 +2,7 @@
   <div>
     <TsContain :enableCollapse="true" :siderWidth="260">
       <template v-if="formDataQueue.length <= 1" v-slot:navigation>
-        <span v-if="$hasBack()" class="tsfont-left text-action" @click="$back()">{{ $getFromPage() }}</span>
+        <span class="tsfont-left text-action" @click="back()">{{ $t('router.framework.formmanage') }}</span>
       </template>
       <template v-slot:topLeft>
         <div :class="formDataQueue.length <= 1 ? 'flex-between' : 'flex-end'">
@@ -417,6 +417,11 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    back() {
+      this.$router.push({
+        path: '/form-overview'
+      });
+    },
     beforeLeaveCompare(oldData) {
       // 离开当前页面，数据对比
       let newData = this.$refs.sheet.getFormConfig();
diff --git a/src/resources/plugins/TsSheet/form/component/formcollapse.vue b/src/resources/plugins/TsSheet/form/component/formcollapse.vue
index 8e4b188a..708be60c 100644
--- a/src/resources/plugins/TsSheet/form/component/formcollapse.vue
+++ b/src/resources/plugins/TsSheet/form/component/formcollapse.vue
@@ -86,7 +86,6 @@ export default {
       }, 300);
     },
     dropFormItem(event, panel) {
-      console.log('add');
       const item = JSON.parse(event.dataTransfer.getData('item'));
       if (panel && item) {
         if (this.addComponent(item)) {
diff --git a/src/resources/plugins/TsSheet/subformconfig.vue b/src/resources/plugins/TsSheet/subformconfig.vue
index 5309ffec..97279679 100644
--- a/src/resources/plugins/TsSheet/subformconfig.vue
+++ b/src/resources/plugins/TsSheet/subformconfig.vue
@@ -66,9 +66,18 @@ export default {
       this.currentFormData = this.formDataQueue[this.formDataQueue.length - 1];
       if (this.currentFormData.formConfig && this.currentFormData.formConfig.tableList) {
         this.currentFormData.formConfig.tableList.forEach(t => {
-          if (t.component && t.component.uuid === this.currentFormUuid) {
-            this.$set(t.component, 'formData', {});
-            this.$set(t.component.formData, 'formConfig', formConfig);
+          if (t.component) {
+            if (t.component.uuid === this.currentFormUuid) {
+              this.$set(t.component, 'formData', {});
+              this.$set(t.component.formData, 'formConfig', formConfig);
+            } else if (t.component.handler === 'formtab' || t.component.handler === 'formcollapse') {
+              t.component.component.forEach(s => {
+                if (s.uuid === this.currentFormUuid) {
+                  this.$set(s, 'formData', {});
+                  this.$set(s.formData, 'formConfig', formConfig);
+                }
+              });
+            }
           }
         });
       }
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue
index 8c77f32f..b9df2cf2 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue
@@ -774,11 +774,22 @@ export default {
           let find = this.currentFormItemList.find(item => item.uuid === uuid);
           if (find && find.formData && find.formData.formConfig) {
             find.formData.formConfig.tableList.forEach(item => {
-              if (!this.$utils.isEmpty(item.component) && item.component.hasValue && (item.component.handler !== 'formsubassembly' && item.component.handler !== 'formtableselector' && item.component.handler !== 'formtableinputer')) {
-                dataList.push({
-                  text: item.component.label,
-                  value: item.component.uuid
-                });
+              if (!this.$utils.isEmpty(item.component)) {
+                if (item.component.hasValue) {
+                  if (item.component.handler !== 'formsubassembly' && item.component.handler !== 'formtableselector' && item.component.handler !== 'formtableinputer') {
+                    dataList.push({
+                      text: item.component.label,
+                      value: item.component.uuid
+                    });
+                  }
+                } else if ((item.component.handler === 'formtab' || item.component.handler === 'formcollapse') && !this.$utils.isEmpty(item.component.component)) {
+                  item.component.component.forEach(c => {
+                    dataList.push({
+                      text: c.label,
+                      value: c.uuid
+                    });
+                  });
+                }
               }
             });
           }
@@ -789,8 +800,14 @@ export default {
     getFormComponent(tableList) { //当前层子表单普通组件
       let list = [];
       tableList.forEach(item => {
-        if (!this.$utils.isEmpty(item.component) && item.component.hasValue) {
-          list.push(item.component);
+        if (!this.$utils.isEmpty(item.component)) {
+          if (item.component.hasValue) {
+            list.push(item.component);
+          } else if (item.component.handler === 'formtab' || item.component.handler === 'formcollapse') {
+            if (!this.$utils.isEmpty(item.component.component)) {
+              list.push(...item.component.component);
+            }
+          }
         }
       });
       return list;
diff --git a/src/views/pages/process/flow/flowedit/FlowSetting.vue b/src/views/pages/process/flow/flowedit/FlowSetting.vue
index 72013881..5927b711 100644
--- a/src/views/pages/process/flow/flowedit/FlowSetting.vue
+++ b/src/views/pages/process/flow/flowedit/FlowSetting.vue
@@ -252,8 +252,14 @@ export default {
             if (this.formContent._type == 'new') { //新的表单
               let controllerList = [];
               this.previewFormContent.tableList.forEach(item => {
-                if (!this.$utils.isEmpty(item.component) && item.component.hasValue) {
-                  controllerList.push(item.component);
+                if (!this.$utils.isEmpty(item.component)) {
+                  if (item.component.hasValue) {
+                    controllerList.push(item.component);
+                  } else if (item.component.handler === 'formtab' || item.component.handler === 'formcollapse') {
+                    if (!this.$utils.isEmpty(item.component.component)) {
+                      controllerList.push(...item.component.component);
+                    }
+                  }
                 }
               });
               plugin = controllerList;
-- 
Gitee


From fe20208e41af2cfba26b137718b4b078260908d2 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 27 Dec 2023 15:53:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20formtab=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form/component/formtab.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/resources/plugins/TsSheet/form/component/formtab.vue b/src/resources/plugins/TsSheet/form/component/formtab.vue
index 7bdf3786..30a87c22 100644
--- a/src/resources/plugins/TsSheet/form/component/formtab.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtab.vue
@@ -5,6 +5,7 @@
       :name="formItem.uuid"
       :type="config.type"
       :animated="false"
+      @on-click="changeTab()"
     >
       <TabPane
         v-for="(tab, tindex) in tabList"
@@ -128,6 +129,9 @@ export default {
         }
       }
       return errorList;
+    },
+    changeTab() {
+      this.$emit('resize');
     }
   },
   filter: {},
-- 
Gitee