From d1bf7707d74fe903ac71f8ded5299077bd3fbb95 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 21 Nov 2023 17:12:24 +0800
Subject: [PATCH 1/7] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20cmdb=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E8=8A=82=E7=82=B9=E5=A4=9A=E6=95=B0=E6=8D=AE=E9=81=8D?=
 =?UTF-8?q?=E5=8E=86=E5=AF=B9=E8=B1=A1=E8=B0=83=E6=95=B4=20=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]=20#[1026085137907712]=E6=B5=81=E7=A8=8B--CM?=
 =?UTF-8?q?DB=E5=90=8C=E6=AD=A5=E8=8A=82=E7=82=B9--=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E4=B8=AD=E5=A6=82=E4=BD=95=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=8D=95=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/10260851379?=
 =?UTF-8?q?07712?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/page/en.json   |   3 +-
 src/resources/assets/languages/page/zh.json   |   3 +-
 src/resources/assets/languages/term/en.json   |   3 +-
 src/resources/assets/languages/term/zh.json   |   3 +-
 .../form/component/formsubassembly.vue        |   3 +-
 .../TsSheet/form/define/formaccounts.js       |   1 +
 .../plugins/TsSheet/form/define/formnumber.js |   4 +-
 .../TsSheet/form/define/formpassword.js       |   4 +-
 .../plugins/TsSheet/form/define/formrate.js   |   1 +
 .../TsSheet/form/define/formsubassembly.js    |  11 +-
 .../plugins/TsSheet/form/define/formtab.js    |   4 +-
 .../TsSheet/form/define/formtableinputer.js   |   2 +
 .../TsSheet/form/define/formtableselector.js  |   2 +
 .../plugins/TsSheet/form/define/formtime.js   |   6 +-
 .../TsSheet/form/define/formtreeselect.js     |   2 +
 .../plugins/TsSheet/form/define/formupload.js |   1 +
 .../TsSheet/form/define/formuserselect.js     |   2 +
 src/views/pages/cmdb/flow/node/cmdbsync.vue   |   7 +-
 .../cmdbpolicy/cmdbsync-dialog.vue            | 208 +++++++++++++++---
 .../nodesetting/cmdbpolicy/cmdbsync-edit.vue  |  75 ++++---
 .../node/nodesetting/cmdbsync-setting.vue     |   8 +-
 21 files changed, 270 insertions(+), 83 deletions(-)

diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index 08dd0877..ee339075 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -946,5 +946,6 @@
   "homeurl": "Application Service Address",
   "filltype": "Background Fill Method",
   "backgroundresizable": "Background Follow Zoom",
-  "auto": "automatic"
+  "auto": "automatic",
+  "foreachobj": "Traverse Object"
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json
index 95eb2980..80f3d9da 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -948,5 +948,6 @@
   "homeurl": "应用服务地址",
   "filltype": "背景填充方式",
   "backgroundresizable": "背景跟随缩放",
-  "auto": "自动"
+  "auto": "自动",
+  "foreachobj": "遍历对象"
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 6f0cfa65..b97be3ad 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -1152,7 +1152,8 @@
     "versionlog": "Version Log",
     "exporttable": "Export Table",
     "importtable": "Import Table",
-    "excelinputtemplate": "Table Input Template"
+    "excelinputtemplate": "Table Input Template",
+    "formsubassembly": "List subcomponents"
   },
   "knowledge": {
     "document": "Document",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 1f349bd4..68a7211d 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -1151,7 +1151,8 @@
     "versionlog": "版本日志",
     "exporttable": "导出表格",
     "importtable": "导入表格",
-    "excelinputtemplate": "表格输入模板"
+    "excelinputtemplate": "表格输入模板",
+    "formsubassembly": "表单子组件"
   },
   "knowledge": {
     "document": "文档",
diff --git a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
index a894d6c2..23169f08 100644
--- a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
+++ b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
@@ -30,7 +30,6 @@
       </div> 
       <div v-if="!disabled && !readonly && config.isCanAdd">
         <Button
-          v-if="mode ==='read' || mode==='readSubform'"
           type="primary"
           ghost
           @click="addFormData"
@@ -132,7 +131,7 @@ export default {
     getFormDataHeight() {
       return (list) => {
         let height = 100;
-        if (list.length > 0 && this.disabled || this.readonly || !this.config || !this.config.isCanAdd || (this.mode !== 'read' && this.mode !== 'readSubform')) {
+        if (list.length > 0 && this.disabled || this.readonly || !this.config || !this.config.isCanAdd) {
           height = 100 * (1 - 1 / (list.length * 2));
         }
         return height + '%';
diff --git a/src/resources/plugins/TsSheet/form/define/formaccounts.js b/src/resources/plugins/TsSheet/form/define/formaccounts.js
index 48ca3de0..6ec43842 100644
--- a/src/resources/plugins/TsSheet/form/define/formaccounts.js
+++ b/src/resources/plugins/TsSheet/form/define/formaccounts.js
@@ -23,6 +23,7 @@ export default {
     'hide': {},
     'display': {},
     'readonly': {},
+    'disable': {},
     'required': {}
   }
 };
diff --git a/src/resources/plugins/TsSheet/form/define/formnumber.js b/src/resources/plugins/TsSheet/form/define/formnumber.js
index 5aaeda55..919a2fd4 100644
--- a/src/resources/plugins/TsSheet/form/define/formnumber.js
+++ b/src/resources/plugins/TsSheet/form/define/formnumber.js
@@ -14,7 +14,9 @@ export default {
     'description': '',
     'width': '100%',
     'isMask': false,
-    'isHide': false
+    'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false
   },
   'reaction': { 'mask': {}, 'hide': {}, 'display': {}, 'readonly': {}, 'disable': {}, 'setvalue': {}, 'required': {} }
 };
diff --git a/src/resources/plugins/TsSheet/form/define/formpassword.js b/src/resources/plugins/TsSheet/form/define/formpassword.js
index e22ebc50..ae638a88 100644
--- a/src/resources/plugins/TsSheet/form/define/formpassword.js
+++ b/src/resources/plugins/TsSheet/form/define/formpassword.js
@@ -14,7 +14,9 @@ export default {
     'description': '',
     'width': '100%',
     'isMask': false,
-    'isHide': false
+    'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false
   },
   'reaction': { 'mask': {}, 'hide': {}, 'display': {}, 'readonly': {}, 'disable': {}, 'required': {} }
 };
diff --git a/src/resources/plugins/TsSheet/form/define/formrate.js b/src/resources/plugins/TsSheet/form/define/formrate.js
index 867ef687..a0cfff5f 100644
--- a/src/resources/plugins/TsSheet/form/define/formrate.js
+++ b/src/resources/plugins/TsSheet/form/define/formrate.js
@@ -14,6 +14,7 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
     'isDisabled': false,
     'allowHalf': false,
     'showText': false,
diff --git a/src/resources/plugins/TsSheet/form/define/formsubassembly.js b/src/resources/plugins/TsSheet/form/define/formsubassembly.js
index d2815194..6bbabec7 100644
--- a/src/resources/plugins/TsSheet/form/define/formsubassembly.js
+++ b/src/resources/plugins/TsSheet/form/define/formsubassembly.js
@@ -2,19 +2,20 @@ import { $t } from '@/resources/init.js';
 
 export default {
   'handler': 'formsubassembly',
-  'label': '表单子组件',
+  'label': $t('term.framework.formsubassembly'),
   'type': 'form',
   'category': 'basic',
   'icon': 'tsfont-formlist',
   'override_config': {},
-  'hasValue': false,
-  'isContainer': true,
+  'hasValue': true,
   'component': [],
   'config': {
     'width': '100%',
     'isMask': false,
     'isHide': false,
-    'isCanAdd': false
+    'isReadOnly': false,
+    'isDisabled': false,
+    'isCanAdd': true
   },
-  'reaction': { 'mask': {}, 'hide': {}, 'display': {} }
+  'reaction': { 'mask': {}, 'hide': {}, 'display': {}, 'readonly': {}, 'disable': {} }
 };
diff --git a/src/resources/plugins/TsSheet/form/define/formtab.js b/src/resources/plugins/TsSheet/form/define/formtab.js
index 975aa9dd..bb34988a 100644
--- a/src/resources/plugins/TsSheet/form/define/formtab.js
+++ b/src/resources/plugins/TsSheet/form/define/formtab.js
@@ -14,7 +14,9 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false,
     'type': 'line'
   },
-  'reaction': { 'mask': {}, 'hide': {}, 'display': {} }
+  'reaction': { 'mask': {}, 'hide': {}, 'display': {}, 'readonly': {}, 'disable': {} }
 };
diff --git a/src/resources/plugins/TsSheet/form/define/formtableinputer.js b/src/resources/plugins/TsSheet/form/define/formtableinputer.js
index 858befb0..0ddfafd9 100644
--- a/src/resources/plugins/TsSheet/form/define/formtableinputer.js
+++ b/src/resources/plugins/TsSheet/form/define/formtableinputer.js
@@ -15,6 +15,8 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false,
     'dataConfig': [],
     'isShowNumber': true,
     'isCanDrag': true,
diff --git a/src/resources/plugins/TsSheet/form/define/formtableselector.js b/src/resources/plugins/TsSheet/form/define/formtableselector.js
index 5900c2cb..9b3dde96 100644
--- a/src/resources/plugins/TsSheet/form/define/formtableselector.js
+++ b/src/resources/plugins/TsSheet/form/define/formtableselector.js
@@ -15,6 +15,8 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false,
     'mode': 'dialog',
     'dataConfig': [],
     'dataSource': 'matrix',
diff --git a/src/resources/plugins/TsSheet/form/define/formtime.js b/src/resources/plugins/TsSheet/form/define/formtime.js
index f437061d..c2fdf90f 100644
--- a/src/resources/plugins/TsSheet/form/define/formtime.js
+++ b/src/resources/plugins/TsSheet/form/define/formtime.js
@@ -13,11 +13,11 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false,
     'placeholder': $t('form.placeholder.pleaseselect', {'target': $t('page.time')}),
     'format': 'HH:mm:ss',
-    'validValueList': [],
-    'isReadOnly': false,
-    'isDisabled': false
+    'validValueList': []
   },
   'override_config': {},
   'reaction': { 'mask': {}, 'hide': {}, 'display': {}, 'readonly': {}, 'disable': {}, 'setvalue': {}, 'required': {} }
diff --git a/src/resources/plugins/TsSheet/form/define/formtreeselect.js b/src/resources/plugins/TsSheet/form/define/formtreeselect.js
index f72e6585..4dadb49c 100644
--- a/src/resources/plugins/TsSheet/form/define/formtreeselect.js
+++ b/src/resources/plugins/TsSheet/form/define/formtreeselect.js
@@ -13,6 +13,8 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false,
     'dataSource': 'knowledgeType'
   },
   'override_config': {},
diff --git a/src/resources/plugins/TsSheet/form/define/formupload.js b/src/resources/plugins/TsSheet/form/define/formupload.js
index 56e6977a..408bb151 100644
--- a/src/resources/plugins/TsSheet/form/define/formupload.js
+++ b/src/resources/plugins/TsSheet/form/define/formupload.js
@@ -15,6 +15,7 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
     'isTemplate': false,
     'uploadType': 'one'
   },
diff --git a/src/resources/plugins/TsSheet/form/define/formuserselect.js b/src/resources/plugins/TsSheet/form/define/formuserselect.js
index 6b4b9c03..32066a2e 100644
--- a/src/resources/plugins/TsSheet/form/define/formuserselect.js
+++ b/src/resources/plugins/TsSheet/form/define/formuserselect.js
@@ -14,6 +14,8 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false,
     'isMultiple': false,
     'groupList': []
   },
diff --git a/src/views/pages/cmdb/flow/node/cmdbsync.vue b/src/views/pages/cmdb/flow/node/cmdbsync.vue
index 88c28f6f..82d0919c 100644
--- a/src/views/pages/cmdb/flow/node/cmdbsync.vue
+++ b/src/views/pages/cmdb/flow/node/cmdbsync.vue
@@ -41,7 +41,12 @@
       @updatebutton="updatebutton"
     ></ButtonSetting>
     <!-- 模型设置 -->
-    <CmdbsyncSetting id="ciEntityConfig" ref="ciEntityConfig" :defaultCiEntityConfig="ciEntityConfig"></CmdbsyncSetting>
+    <CmdbsyncSetting
+      id="ciEntityConfig"
+      ref="ciEntityConfig"
+      :defaultCiEntityConfig="ciEntityConfig"
+      :formUuid="formUuid"
+    ></CmdbsyncSetting>
     <!-- 异常处理人 -->
     <AssignSetting
       id="assignData"
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 f053eb44..dfc1b062 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
@@ -76,25 +76,42 @@
                   ></TsFormRadio>
                 </TsFormItem>
                 <template v-if="ciData.createPolicy==='batch'">
-                  <TsFormItem v-if="ciData.createPolicy==='batch'" :label="$t('page.foreachtable')" labelPosition="left">
-                    <TsFormSelect
-                      ref="attributeUuid"
-                      :value="ciData.batchDataSource && ciData.batchDataSource.attributeUuid"
-                      :dataList="getFormTableComponent()"
-                      textName="label"
-                      valueName="uuid"
-                      :validateList="validateList"
-                      :firstSelect="false"
-                      transfer
-                      border="border"
-                      @on-change="(val)=>{
-                        setBatchDataSource(val,'attributeUuid')
-                      }"
-                    ></TsFormSelect>
+                  <TsFormItem v-if="ciData.createPolicy==='batch'" :label="$t('page.foreachobj')" labelPosition="left">
+                    <TsRow :gutter="8">
+                      <Col span="12">
+                        <TsFormSelect
+                          ref="batchDataSourceType"
+                          :value="ciData.batchDataSource && ciData.batchDataSource.type"
+                          :dataList="batchComponentList"
+                          :validateList="validateList"
+                          :disabled="isDisabledType"
+                          transfer
+                          @on-change="(val)=>{
+                            setBatchDataSource(val,'type')
+                          }"
+                        ></TsFormSelect>
+                      </Col>
+                      <Col span="12">
+                        <TsFormSelect
+                          ref="batchDataSourceAttr"
+                          :value="ciData.batchDataSource && ciData.batchDataSource.attributeUuid"
+                          :dataList="getFormTableComponent()"
+                          textName="label"
+                          valueName="uuid"
+                          :validateList="validateList"
+                          :firstSelect="false"
+                          transfer
+                          border="border"
+                          @on-change="(val)=>{
+                            setBatchDataSource(val,'attributeUuid')
+                          }"
+                        ></TsFormSelect>
+                      </Col>
+                    </TsRow>
                   </TsFormItem>
                   <TsFormItem v-if="ciData.createPolicy==='batch'" :label="$t('term.dashboard.datafilter')" labelPosition="left">
                     <FilterList
-                      ref="attrHandler"
+                      ref="filterList"
                       :defaultFilterList="ciData.batchDataSource && ciData.batchDataSource.filterList"
                       :dataList="getAttrList(ciData.batchDataSource)"
                       @setConfig="(val)=> setBatchDataSource(val,'filterList')"
@@ -216,7 +233,19 @@ export default {
             maxlength: 500
           }
         }
-      ], isShow: true }
+      ], isShow: true },
+      batchComponentList: [
+        {
+          text: this.$t('term.process.formtableitem'),
+          value: 'formTableComponent'
+        },
+        {
+          text: '表单子组件',
+          value: 'formSubassemblyComponent'
+        }
+      ],
+      currentFormItemList: [],
+      tableList: [] //遍历对象，选择表格组件
     };
   },
   beforeCreate() {},
@@ -243,6 +272,7 @@ export default {
           this.$set(this.saveCiEntityMap, item.uuid, item);
         });
         this.getCiEntityById();
+        this.currentFormItemList = this.$utils.deepClone(this.allFormitemList);
       }
     },
     initValue(cientity) {
@@ -394,6 +424,9 @@ export default {
       }
     },
     addNewCiEntity(type, item) {
+      if (!this.valid()) {
+        return;
+      }
       this.loadingShow = true;
       if (type === 'rel') {
         const rel = item;
@@ -435,6 +468,7 @@ export default {
                 }
               ]
             };
+            this.updateCurrentFormItemList(currentCiEntity);
             this.initValue(newCiEntity);
             this.ciData = newCiEntity;
             this.ciEntityQueue.push(newCiEntity);
@@ -469,6 +503,7 @@ export default {
     },
     editNewCiEntity(rel) {
       let uuid = rel.ciEntityUuid;
+      this.updateCurrentFormItemList(this.ciEntityQueue[this.ciEntityQueue.length - 1]);
       if (this.saveCiEntityMap[uuid]) {
         this.tmpCiEntityData = JSON.parse(JSON.stringify(this.saveCiEntityMap[uuid]));
         let index = -1;
@@ -491,8 +526,17 @@ export default {
       if (this.$refs.ciConfig && !this.$refs.ciConfig.valid()) {
         isValid = false;
       }
-      if (isValid && this.$refs.cmdbsyncEdit) {
-        isValid = this.$refs.cmdbsyncEdit.valid();
+      if (this.$refs.batchDataSourceType && !this.$refs.batchDataSourceType.valid()) {
+        isValid = false;
+      }
+      if (this.$refs.batchDataSourceAttr && !this.$refs.batchDataSourceAttr.valid()) {
+        isValid = false;
+      }
+      if (this.$refs.filterList && !this.$refs.filterList.valid()) {
+        isValid = false;
+      }
+      if (this.$refs.cmdbsyncEdit && !this.$refs.cmdbsyncEdit.valid()) {
+        isValid = false;
       }
       return isValid; 
     },
@@ -548,6 +592,17 @@ export default {
         }
         this.$set(ciEntity.batchDataSource, attr, val);
         this.$set(this.ciData, 'batchDataSource', ciEntity.batchDataSource);
+        if (attr === 'type') {
+          Object.keys(ciEntity.allAttrEntityData).forEach(key => {
+            //改变遍历对象时，需要清空属性中与之不匹配的mappingMode
+            if (val === 'formSubassemblyComponent' && ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent' || (val === 'formTableComponent' && ciEntity.allAttrEntityData[key].mappingMode === 'formSubassemblyComponent')) {
+              this.$set(ciEntity.allAttrEntityData[key], 'mappingMode', '');
+              this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
+              this.$set(ciEntity.allAttrEntityData[key], 'column', '');
+              this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
+            }
+          });
+        }
         if (attr === 'attributeUuid') {
           Object.keys(ciEntity.allAttrEntityData).forEach(key => {
             if (ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent') {
@@ -565,27 +620,71 @@ export default {
     },
     getFormTableComponent() { //获取表单table组件
       let dataList = [];
-      if (this.allFormitemList && this.allFormitemList.length > 0) {
-        //table组件（表格数据组件、表单选择组件）
-        dataList = this.allFormitemList.filter(item => {
-          return item.handler === 'formtableselector' || item.handler === 'formtableinputer';
-        });
+      if (this.ciData.batchDataSource) {
+        if (this.ciData.batchDataSource.type === 'formTableComponent') {
+          if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.attributeUuid) {
+            let findTable = this.allFormitemList.find(item => item.uuid === this.preCiEntity.batchDataSource.attributeUuid);
+            if (findTable && findTable.config && findTable.config.dataConfig) {
+              findTable.config.dataConfig.forEach(d => {
+                if (d.handler === 'formtable') {
+                  dataList.push({
+                    label: d.label,
+                    uuid: d.uuid
+                  });
+                }
+              });
+            }
+          } else {
+            //table组件（表格数据组件、表单选择组件）
+            dataList = this.currentFormItemList.filter(item => {
+              return item.handler === 'formtableselector' || item.handler === 'formtableinputer';
+            });
+          }
+        } else if (this.ciData.batchDataSource.type === 'formSubassemblyComponent') {
+          //表单子组件
+          dataList = this.currentFormItemList.filter(item => {
+            return item.handler === 'formsubassembly';
+          });
+        }
       }
+      
       return dataList;
     },
-    getAttrList(batchDataSource) { //表单table组件，属性列表
+    getAttrList(batchDataSource) { //过滤条件，属性选择列表
       let dataList = [];
       let uuid = null;
-      if (batchDataSource && batchDataSource.attributeUuid) {
+      if (batchDataSource && batchDataSource.type && batchDataSource.attributeUuid) {
         uuid = batchDataSource.attributeUuid;
-        if (this.allFormitemList && this.allFormitemList.length > 0) {
-          let find = this.allFormitemList.find(item => item.uuid === uuid);
-          if (find && find.config && find.config.dataConfig) {
-            find.config.dataConfig.forEach(d => {
-              dataList.push({
-                text: d.label,
-                value: d.uuid
-              });
+        if (batchDataSource.type === 'formTableComponent') { //表单table组件，属性列表
+          let findTable = this.allFormitemList.find(item => item.uuid === uuid);
+          if (!findTable) {
+            if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.attributeUuid) {
+              let preTable = this.allFormitemList.find(item => item.uuid === this.preCiEntity.batchDataSource.attributeUuid);
+              if (preTable) {
+                findTable = preTable.config.dataConfig.find(item => item.uuid === uuid);
+              }
+            }
+          }
+          if (findTable && findTable.config && findTable.config.dataConfig) {
+            findTable.config.dataConfig.forEach(d => {
+              if (d.handler !== 'formtable') {
+                dataList.push({
+                  text: d.label,
+                  value: d.uuid
+                });
+              }
+            });
+          }
+        } else if (batchDataSource.type === 'formSubassemblyComponent') { //子表单组件列表
+          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
+                });
+              }
             });
           }
         }
@@ -598,6 +697,12 @@ export default {
         this.$set(ciEntity, 'batchDataSource', {});
         this.$set(ciEntity, 'createPolicy', val);
         this.$set(this.ciData, 'batchDataSource', {});
+        if (val === 'batch') {
+          //继承父级的遍历对象类型
+          if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.type && this.preCiEntity.batchDataSource.attributeUuid) {
+            this.$set(this.ciData.batchDataSource, 'type', this.preCiEntity.batchDataSource.type);
+          }
+        }
         Object.keys(ciEntity.allAttrEntityData).forEach(key => {
           if (val === 'batch' && ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent') {
             this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
@@ -665,6 +770,27 @@ export default {
       });
       this.$set(data, 'configList', configList);
       return data;
+    },
+    getFormComponent(tableList) { //当前层子表单普通组件
+      let list = [];
+      tableList.forEach(item => {
+        if (!this.$utils.isEmpty(item.component) && item.component.hasValue) {
+          list.push(item.component);
+        }
+      });
+      return list;
+    },
+    updateCurrentFormItemList(currentCiEntity) {
+      if (!this.$utils.isEmpty(currentCiEntity) && currentCiEntity.batchDataSource && currentCiEntity.batchDataSource.type === 'formSubassemblyComponent') {
+        let subFormConfig = this.currentFormItemList.find(c => c.uuid === currentCiEntity.batchDataSource.attributeUuid);
+        if (subFormConfig) {
+          this.currentFormItemList = this.getFormComponent(subFormConfig.formData.formConfig.tableList);
+        } else {
+          this.currentFormItemList = [];
+        }
+      } else {
+        this.currentFormItemList = this.$utils.deepClone(this.allFormitemList);
+      }
     }
   },
   filter: {},
@@ -672,8 +798,22 @@ export default {
     currentCiEntity() {
       return this.ciEntityQueue[this.ciEntityQueue.length - 1];
     },
+    preCiEntity() {
+      if (this.ciEntityQueue && this.ciEntityQueue.length > 1) {
+        return this.ciEntityQueue[this.ciEntityQueue.length - 2];
+      }
+      return {};
+    },
     allFormitemList() { //表单组件
+      console.log(store.allFormitemList, 'store.allFormitemList');
       return store.allFormitemList;
+    },
+    isDisabledType() {
+      let isDisabled = false;
+      if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.type && this.preCiEntity.batchDataSource.attributeUuid) {
+        isDisabled = true;
+      }
+      return isDisabled;
     }
   },
   watch: {}
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue
index a9a651e6..dfbd77de 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue
@@ -93,7 +93,7 @@
                         <TsFormSelect
                           ref="attrHandler"
                           :value="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode')"
-                          :dataList="mappingModeList"
+                          :dataList="getMappingDataList() "
                           :firstSelect="false"
                           transfer
                           border="border"
@@ -174,21 +174,7 @@
                         </template>
                         <template v-else-if="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode') === 'formTableComponent'">
                           <TsRow :gutter="8">
-                            <Col v-if="ciData.createPolicy === 'single'" span="12">
-                              <TsFormSelect
-                                ref="attrHandler"
-                                :value="getValue(ciEntityData.allAttrEntityData, e, 'valueList')?getValue(ciEntityData.allAttrEntityData, e, 'valueList')[0]:null"
-                                :dataList="getFormComponent('formTableComponent')"
-                                textName="label"
-                                valueName="uuid"
-                                :validateList="getValidList(e.type, e.element)"
-                                :firstSelect="false"
-                                transfer
-                                border="border"
-                                @change="(val)=>setConfig(val,'valueList',e)"
-                              ></TsFormSelect>
-                            </Col>
-                            <Col :span="ciData.createPolicy === 'single'?12:'24'">
+                            <Col :span="24">
                               <div class="formTableComponent pr-lg">
                                 <TsFormSelect
                                   ref="attrHandler"
@@ -235,16 +221,26 @@
                             </Col>
                           </TsRow>
                         </template>
+                        <template v-else-if="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode') === 'formSubassemblyComponent'">
+                          <TsRow :gutter="8">
+                            <Col :span="24">
+                              <div class="formTableComponent pr-lg">
+                                <TsFormSelect
+                                  ref="attrHandler"
+                                  :value="getValue(ciEntityData.allAttrEntityData, e, 'column')"
+                                  :dataList="[]"
+                                  :validateList="getValidList(e.type, e.element)"
+                                  :firstSelect="false"
+                                  transfer
+                                  border="border"
+                                  @change="(val)=>setConfig(val,'column',e)"
+                                ></TsFormSelect>
+                              </div>
+                            </Col>
+                          </TsRow>
+                        </template>
                       </Col>
                     </TsRow>
-                    <div v-if="ciData.createPolicy === 'single' && getValue(ciEntityData.allAttrEntityData, e, 'mappingMode') === 'formTableComponent'" class="pt-sm">
-                      <FilterList
-                        ref="attrHandler"
-                        :defaultFilterList="getValue(ciEntityData.allAttrEntityData, e, 'filterList')"
-                        :dataList="getAttrList(ciEntityData.allAttrEntityData, e)"
-                        @setConfig="(val)=>setConfig(val,'filterList', e)"
-                      ></FilterList>
-                    </div>
                   </Col>
                 </TsRow>
               </template>
@@ -263,18 +259,17 @@ export default {
     TsFormRadio: resolve => require(['@/resources/plugins/TsForm/TsFormRadio'], resolve),
     TsFormCheckbox: resolve => require(['@/resources/plugins/TsForm/TsFormCheckbox'], resolve),
     TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
-    AttrInputer: resolve => require(['@/views/pages/cmdb/cientity/attr-inputer.vue'], resolve),
-    FilterList: resolve => require(['./filter-list.vue'], resolve)
+    AttrInputer: resolve => require(['@/views/pages/cmdb/cientity/attr-inputer.vue'], resolve)
   },
   props: {
     ciData: Object,
     allFormitemList: Array,
-    ciEntityQueue: {
+    ciEntityQueue: { //配置项添加队列
       type: Array,
       default: () => {
         return [];
       }
-    } //配置项添加队列
+    } 
   },
   data() {
     return {
@@ -293,6 +288,10 @@ export default {
         {
           text: this.$t('term.process.formtableitem'),
           value: 'formTableComponent'
+        },
+        {
+          text: this.$t('term.framework.formsubassembly'),
+          value: 'formSubassemblyComponent'
         }
       ]
     };
@@ -500,7 +499,7 @@ export default {
       }
     },
     changeMappingMode(val, e) {
-      if (val === 'formTableComponent' && this.ciEntityData.batchDataSource && this.ciEntityData.batchDataSource.attributeUuid) {
+      if ((val === 'formTableComponent' || val === 'formSubassemblyComponent') && this.ciEntityData.batchDataSource && this.ciEntityData.batchDataSource.attributeUuid) {
         this.setConfig(this.ciEntityData.batchDataSource.attributeUuid, 'valueList', e);
       } else {
         this.setConfig([], 'valueList', e);
@@ -570,7 +569,7 @@ export default {
         if (this.allFormitemList && this.allFormitemList.length > 0) {
           if (type === 'formCommonComponent') { //表单普通组件
             dataList = this.allFormitemList.filter(item => {
-              return item.handler != 'formtableselector' && item.handler != 'formtableinputer' && item.handler != 'formcube';
+              return item.handler != 'formtableselector' && item.handler != 'formtableinputer' && item.handler != 'formsubassembly';
             });
           } else if (type === 'formTableComponent') { //table组件（表格数据组件、表单选择组件）
             dataList = this.allFormitemList.filter(item => {
@@ -604,6 +603,22 @@ export default {
         }
         return dataList;
       };
+    },
+    getMappingDataList() { 
+      return () => {
+        let dataList = this.$utils.deepClone(this.mappingModeList);
+        //添加多条数据，遍历对象与普通属性保持一致
+        if (this.ciData.createPolicy === 'batch' && this.ciData.batchDataSource.type) {
+          dataList = dataList.filter(item => {
+            return (this.ciData.batchDataSource.type === 'formTableComponent' && item.value != 'formSubassemblyComponent') || (this.ciData.batchDataSource.type === 'formSubassemblyComponent' && item.value != 'formTableComponent');
+          });
+        } else {
+          dataList = dataList.filter(item => {
+            return (item.value === 'constant') || (item.value === 'formCommonComponent');
+          });
+        }
+        return dataList;
+      };
     }
   },
   watch: {}
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
index 1f1142c5..ec752159 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
@@ -47,7 +47,12 @@
         {{ $t('form.validate.required', { target: $t('term.cmdb.modemapping') }) }}
       </div>
     </div>
-    <CmdbsyncDialog v-if="isShowDialog" :configList="ciEntityConfig.configList" @close="close"></CmdbsyncDialog>
+    <CmdbsyncDialog
+      v-if="isShowDialog"
+      :configList="ciEntityConfig.configList"
+      :formUuid="formUuid"
+      @close="close"
+    ></CmdbsyncDialog>
   </div>
 </template>
 <script>
@@ -59,6 +64,7 @@ export default {
     CmdbsyncDialog: resolve => require(['./cmdbpolicy/cmdbsync-dialog.vue'], resolve)
   },
   props: {
+    formUuid: String,
     defaultCiEntityConfig: Object
   },
   data() {
-- 
Gitee


From 8704bd55a21809f1c6ca7a4343a0b8db970470cc Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 21 Nov 2023 17:17:28 +0800
Subject: [PATCH 2/7] commit

---
 src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
index ec752159..e71d4728 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
@@ -50,7 +50,6 @@
     <CmdbsyncDialog
       v-if="isShowDialog"
       :configList="ciEntityConfig.configList"
-      :formUuid="formUuid"
       @close="close"
     ></CmdbsyncDialog>
   </div>
@@ -64,7 +63,6 @@ export default {
     CmdbsyncDialog: resolve => require(['./cmdbpolicy/cmdbsync-dialog.vue'], resolve)
   },
   props: {
-    formUuid: String,
     defaultCiEntityConfig: Object
   },
   data() {
-- 
Gitee


From 5d5ab2274cb9e271ad6af8077aa54b3bde0ccff2 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 22 Nov 2023 16:52:19 +0800
Subject: [PATCH 3/7] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9cmdb,=E6=A8=A1=E5=9E=8B=E9=81=8D=E5=8E=86?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=AD=90=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdbpolicy/cmdbsync-dialog.vue            | 154 ++++++++++++++----
 .../nodesetting/cmdbpolicy/cmdbsync-edit.vue  |  71 +++-----
 .../nodesetting/cmdbpolicy/filter-list.vue    |   4 +-
 3 files changed, 143 insertions(+), 86 deletions(-)

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 dfc1b062..cacce2bf 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
@@ -126,6 +126,8 @@
                       :allFormitemList="allFormitemList"
                       :ciEntityQueue="ciEntityQueue"
                       :ciData="ciData"
+                      :subFormComponentList="getTreeSubFormComponent()"
+                      :tableComponentAttrList="getTableAttrList()"
                       @new="addNewCiEntity"
                       @edit="editNewCiEntity"
                       @remove="removeNewCiEntity"
@@ -240,7 +242,7 @@ export default {
           value: 'formTableComponent'
         },
         {
-          text: '表单子组件',
+          text: this.$t('term.framework.formsubassembly'),
           value: 'formSubassemblyComponent'
         }
       ],
@@ -598,20 +600,14 @@ export default {
             if (val === 'formSubassemblyComponent' && ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent' || (val === 'formTableComponent' && ciEntity.allAttrEntityData[key].mappingMode === 'formSubassemblyComponent')) {
               this.$set(ciEntity.allAttrEntityData[key], 'mappingMode', '');
               this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
-              this.$set(ciEntity.allAttrEntityData[key], 'column', '');
               this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
             }
           });
         }
         if (attr === 'attributeUuid') {
           Object.keys(ciEntity.allAttrEntityData).forEach(key => {
-            if (ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent') {
-              if (val) {
-                this.$set(ciEntity.allAttrEntityData[key], 'valueList', [val]);
-              } else {
-                this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
-              }
-              this.$set(ciEntity.allAttrEntityData[key], 'column', '');
+            if (ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent' || ciEntity.allAttrEntityData[key].mappingMode === 'formSubassemblyComponent') {
+              this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
               this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
             }
           });
@@ -620,34 +616,35 @@ export default {
     },
     getFormTableComponent() { //获取表单table组件
       let dataList = [];
-      if (this.ciData.batchDataSource) {
-        if (this.ciData.batchDataSource.type === 'formTableComponent') {
-          if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.attributeUuid) {
-            let findTable = this.allFormitemList.find(item => item.uuid === this.preCiEntity.batchDataSource.attributeUuid);
-            if (findTable && findTable.config && findTable.config.dataConfig) {
-              findTable.config.dataConfig.forEach(d => {
-                if (d.handler === 'formtable') {
-                  dataList.push({
-                    label: d.label,
-                    uuid: d.uuid
-                  });
-                }
+      if (this.currentCiEntity) {
+        if (this.currentCiEntity.batchDataSource) {
+          if (this.currentCiEntity.batchDataSource.type === 'formTableComponent') {
+            if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.attributeUuid) {
+              let findTable = this.allFormitemList.find(item => item.uuid === this.preCiEntity.batchDataSource.attributeUuid);
+              if (findTable && findTable.config && findTable.config.dataConfig) {
+                findTable.config.dataConfig.forEach(d => {
+                  if (d.handler === 'formtable') {
+                    dataList.push({
+                      label: d.label,
+                      uuid: d.uuid
+                    });
+                  }
+                });
+              }
+            } else {
+            //table组件（表格数据组件、表单选择组件）
+              dataList = this.currentFormItemList.filter(item => {
+                return item.handler === 'formtableselector' || item.handler === 'formtableinputer';
               });
             }
-          } else {
-            //table组件（表格数据组件、表单选择组件）
+          } else if (this.currentCiEntity.batchDataSource.type === 'formSubassemblyComponent') {
+          //表单子组件
             dataList = this.currentFormItemList.filter(item => {
-              return item.handler === 'formtableselector' || item.handler === 'formtableinputer';
+              return item.handler === 'formsubassembly';
             });
           }
-        } else if (this.ciData.batchDataSource.type === 'formSubassemblyComponent') {
-          //表单子组件
-          dataList = this.currentFormItemList.filter(item => {
-            return item.handler === 'formsubassembly';
-          });
         }
       }
-      
       return dataList;
     },
     getAttrList(batchDataSource) { //过滤条件，属性选择列表
@@ -706,7 +703,6 @@ export default {
         Object.keys(ciEntity.allAttrEntityData).forEach(key => {
           if (val === 'batch' && ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent') {
             this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
-            this.$set(ciEntity.allAttrEntityData[key], 'column', '');
             this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
           }
         });
@@ -742,9 +738,6 @@ export default {
                   mappingMode: item.allAttrEntityData[key].mappingMode,
                   valueList: item.allAttrEntityData[key].valueList 
                 };
-                if (item.allAttrEntityData[key].hasOwnProperty('column')) {
-                  objectData.column = item.allAttrEntityData[key].column;
-                }
                 if (item.allAttrEntityData[key].hasOwnProperty('filterList')) {
                   objectData.filterList = item.allAttrEntityData[key].filterList;
                 }
@@ -780,7 +773,7 @@ export default {
       });
       return list;
     },
-    updateCurrentFormItemList(currentCiEntity) {
+    updateCurrentFormItemList(currentCiEntity) { 
       if (!this.$utils.isEmpty(currentCiEntity) && currentCiEntity.batchDataSource && currentCiEntity.batchDataSource.type === 'formSubassemblyComponent') {
         let subFormConfig = this.currentFormItemList.find(c => c.uuid === currentCiEntity.batchDataSource.attributeUuid);
         if (subFormConfig) {
@@ -791,7 +784,97 @@ export default {
       } else {
         this.currentFormItemList = this.$utils.deepClone(this.allFormitemList);
       }
+    },
+    getTableAttrList() { //过滤对象为表格组件时，属性映射可选的表格属性
+      let list = [];
+      if (this.currentCiEntity && 
+      this.currentCiEntity.batchDataSource && 
+      this.currentCiEntity.batchDataSource.type === 'formTableComponent' && 
+      this.currentCiEntity.batchDataSource.attributeUuid) {
+        let uuidList = [];
+        for (let i = this.ciEntityQueue.length - 1; i >= 0; i--) {
+          if (this.ciEntityQueue[i].batchDataSource && this.ciEntityQueue[i].batchDataSource.attributeUuid) {
+            uuidList.unshift(this.ciEntityQueue[i].batchDataSource.attributeUuid);
+          } else {
+            break;
+          }
+        }
+        if (uuidList.length > 0) {
+          let findItem = this.allFormitemList.find(item => item.uuid === uuidList[0]);
+          if (findItem && findItem.config.dataConfig) {
+            list = this.getTreeAttrList(findItem.config.dataConfig, uuidList, 'formTableComponent');
+          }
+        }
+      }
+      return list;
+    },
+    getTreeSubFormComponent() { //过滤对象为子表单, 属性映射可选的子表单组件
+      let list = [];
+      if (this.currentCiEntity && 
+      this.currentCiEntity.batchDataSource && 
+      this.currentCiEntity.batchDataSource.type === 'formSubassemblyComponent' && 
+      this.currentCiEntity.batchDataSource.attributeUuid) {
+        let subformUuidList = [];
+        for (let i = this.ciEntityQueue.length - 1; i >= 0; i--) {
+          if (this.ciEntityQueue[i].batchDataSource && this.ciEntityQueue[i].batchDataSource.attributeUuid) {
+            subformUuidList.unshift(this.ciEntityQueue[i].batchDataSource.attributeUuid);
+          } else {
+            break;
+          }
+        }
+        if (subformUuidList.length > 0) {
+          let findItem = this.allFormitemList.find(item => item.uuid === subformUuidList[0]);
+          if (findItem) {
+            let formComponentList = this.getFormComponent(findItem.formData.formConfig.tableList);
+            list = this.getTreeAttrList(formComponentList, subformUuidList, 'formSubassemblyComponent');
+          }
+        }
+      }
+      return list;
+    },
+    getTreeAttrList(formItemList, uuidList, type) { //表单子组件和表格组件，拼接成级联下拉的格式
+      let treeList = [];
+      formItemList.forEach(f => {
+        if (type === 'formSubassemblyComponent') {
+          if (f.handler !== 'formtableselector' && f.handler !== 'formtableinputer' && f.handler !== 'formsubassembly') {
+            treeList.push(
+              {
+                value: f['uuid'],
+                label: f['label']
+              }
+            );
+          } else if (uuidList.includes(f.uuid)) {
+            let obj = {
+              value: f['uuid'],
+              label: f['label']
+            };
+            let currentComponentList = this.getFormComponent(f.formData.formConfig.tableList);
+            let children = this.getTreeAttrList(currentComponentList, uuidList, type);
+            this.$set(obj, 'children', children);
+            treeList.push(obj);
+          }
+        } else if (type === 'formTableComponent') {
+          if (f.handler !== 'formtable') {
+            treeList.push(
+              {
+                value: f['uuid'],
+                label: f['label']
+              }
+            );
+          } else if (uuidList.includes(f.uuid)) {
+            let obj = {
+              value: f['uuid'],
+              label: f['label']
+            };
+            let children = this.getTreeAttrList(f.config.dataConfig, uuidList, type);
+            this.$set(obj, 'children', children);
+            treeList.push(obj);
+          }
+        }
+      });
+      return treeList;
     }
+
   },
   filter: {},
   computed: {
@@ -805,7 +888,6 @@ export default {
       return {};
     },
     allFormitemList() { //表单组件
-      console.log(store.allFormitemList, 'store.allFormitemList');
       return store.allFormitemList;
     },
     isDisabledType() {
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue
index dfbd77de..cbcb581d 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue
@@ -100,7 +100,6 @@
                           :validateList="getValidList(e.type, e.element)"
                           @change="(val)=>{
                             changeMappingMode(val,e)
-                            setConfig(val,'mappingMode',e)
                           }"
                         ></TsFormSelect>
                       </Col>
@@ -176,16 +175,16 @@
                           <TsRow :gutter="8">
                             <Col :span="24">
                               <div class="formTableComponent pr-lg">
-                                <TsFormSelect
+                                <TsFormCascader
                                   ref="attrHandler"
-                                  :value="getValue(ciEntityData.allAttrEntityData, e, 'column')"
-                                  :dataList="getAttrList(ciEntityData.allAttrEntityData, e)"
+                                  :value="getValue(ciEntityData.allAttrEntityData, e, 'valueList')"
+                                  :dataList="tableComponentAttrList"
                                   :validateList="getValidList(e.type, e.element)"
                                   :firstSelect="false"
                                   transfer
                                   border="border"
-                                  @change="(val)=>setConfig(val,'column',e)"
-                                ></TsFormSelect>
+                                  @change="(val)=>setConfig(val,'valueList',e)"
+                                ></TsFormCascader>
                                 <Tooltip
                                   max-width="660"
                                   theme="light"
@@ -224,18 +223,16 @@
                         <template v-else-if="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode') === 'formSubassemblyComponent'">
                           <TsRow :gutter="8">
                             <Col :span="24">
-                              <div class="formTableComponent pr-lg">
-                                <TsFormSelect
-                                  ref="attrHandler"
-                                  :value="getValue(ciEntityData.allAttrEntityData, e, 'column')"
-                                  :dataList="[]"
-                                  :validateList="getValidList(e.type, e.element)"
-                                  :firstSelect="false"
-                                  transfer
-                                  border="border"
-                                  @change="(val)=>setConfig(val,'column',e)"
-                                ></TsFormSelect>
-                              </div>
+                              <TsFormCascader
+                                ref="attrHandler"
+                                :value="getValue(ciEntityData.allAttrEntityData, e, 'valueList')"
+                                :dataList="subFormComponentList"
+                                :validateList="getValidList(e.type, e.element)"
+                                :firstSelect="false"
+                                transfer
+                                border="border"
+                                @change="(val)=>setConfig(val,'valueList',e)"
+                              ></TsFormCascader>
                             </Col>
                           </TsRow>
                         </template>
@@ -259,7 +256,8 @@ export default {
     TsFormRadio: resolve => require(['@/resources/plugins/TsForm/TsFormRadio'], resolve),
     TsFormCheckbox: resolve => require(['@/resources/plugins/TsForm/TsFormCheckbox'], resolve),
     TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
-    AttrInputer: resolve => require(['@/views/pages/cmdb/cientity/attr-inputer.vue'], resolve)
+    AttrInputer: resolve => require(['@/views/pages/cmdb/cientity/attr-inputer.vue'], resolve),
+    TsFormCascader: resolve => require(['@/resources/plugins/TsForm/TsFormCascader.vue'], resolve)
   },
   props: {
     ciData: Object,
@@ -269,7 +267,9 @@ export default {
       default: () => {
         return [];
       }
-    } 
+    },
+    subFormComponentList: Array,
+    tableComponentAttrList: Array
   },
   data() {
     return {
@@ -499,11 +499,8 @@ export default {
       }
     },
     changeMappingMode(val, e) {
-      if ((val === 'formTableComponent' || val === 'formSubassemblyComponent') && this.ciEntityData.batchDataSource && this.ciEntityData.batchDataSource.attributeUuid) {
-        this.setConfig(this.ciEntityData.batchDataSource.attributeUuid, 'valueList', e);
-      } else {
-        this.setConfig([], 'valueList', e);
-      }
+      this.setConfig(val, 'mappingMode', e);
+      this.setConfig([], 'valueList', e);
     }
   },
   filter: {},
@@ -580,30 +577,6 @@ export default {
         return dataList;
       };
     },
-    getAttrList() {
-      return (data, e) => {
-        let dataList = [];
-        let key = null;
-        if (e.type === 'des') {
-          key = 'description';
-        } else {
-          key = e.type + '_' + e.element.id;
-        }
-        let valueList = data[key] && data[key]['valueList'];
-        if (this.allFormitemList && this.allFormitemList.length > 0) {
-          let find = this.allFormitemList.find(item => valueList && item.uuid === valueList[0]);
-          if (find && find.config && find.config.dataConfig) {
-            find.config.dataConfig.forEach(d => {
-              dataList.push({
-                text: d.label,
-                value: d.uuid
-              });
-            });
-          }
-        }
-        return dataList;
-      };
-    },
     getMappingDataList() { 
       return () => {
         let dataList = this.$utils.deepClone(this.mappingModeList);
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/filter-list.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/filter-list.vue
index 03b71101..500e1353 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/filter-list.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/filter-list.vue
@@ -134,7 +134,9 @@ export default {
   watch: {
     defaultFilterList: {
       handler(val) {
-        if (val && !this.$utils.isSame(val, this.filterList)) {
+        this.filterList = [];
+        this.isActive = 0;
+        if (!this.$utils.isEmpty(val) && !this.$utils.isSame(val, this.filterList)) {
           this.filterList = this.$utils.deepClone(val);
           if (this.filterList.length > 0) {
             this.isActive = 1;
-- 
Gitee


From b572cd5fa3f86ab4546903078fa2581707f26b01 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 24 Nov 2023 11:21:58 +0800
Subject: [PATCH 4/7] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=EF=BC=8C=E7=82=B9=E5=87=BB=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=9C=BA=E6=99=AF=E8=B7=B3=E8=BD=AC=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/nodesetting/formscene-setting.vue     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue
index 8bf72096..7e895a32 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue
+++ b/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue
@@ -57,10 +57,10 @@ export default {
     return {
       versionUuid: '', // 表单版本id
       formSceneUuid: this.value.formSceneUuid || '',
-      formSceneName: this.value.formSceneName || '',
       isPreviewShow: false,
       formPreviewContent: {},
-      dataList: []
+      dataList: [],
+      mainSceneUuid: '' //主场景
     };
   },
   beforeCreate() {},
@@ -89,7 +89,11 @@ export default {
     },
     toEditFormScene() {
       // 表单场景编辑
-      window.open(HOME + '/framework.html#form-scene-edit' + '?uuid=' + this.formConfig.uuid + '&currentVersionUuid=' + this.versionUuid + '&sceneUuid=' + this.formSceneUuid + '&type=edit', '_blank');
+      if (this.formSceneUuid != this.mainSceneUuid) {
+        window.open(HOME + '/framework.html#form-scene-edit' + '?uuid=' + this.formConfig.uuid + '&currentVersionUuid=' + this.versionUuid + '&sceneUuid=' + this.formSceneUuid + '&type=edit', '_blank');
+      } else {
+        window.open(HOME + '/framework.html#form-edit' + '?uuid=' + this.formConfig.uuid + '&currentVersionUuid=' + this.versionUuid + '&sceneUuid=' + this.formSceneUuid + '&type=edit', '_blank');
+      }
     },
     async getSceneDataList(isClear = true) {
       // 获取表单场景列表
@@ -103,6 +107,7 @@ export default {
           if (res.Status == 'OK') {
             try {
               let formConfig = res.Return.formConfig || {};
+              this.mainSceneUuid = formConfig.uuid;
               this.formPreviewContent = formConfig;
               let defaultSceneUuid = formConfig.defaultSceneUuid || formConfig.uuid;
               this.versionUuid = res.Return.currentVersionUuid;
@@ -171,7 +176,6 @@ export default {
     value: {
       handler(val) {
         this.formSceneUuid = (val && val.formSceneUuid) ? val.formSceneUuid : '';
-        this.formSceneName = (val && val.formSceneName) ? val.formSceneName : '';
       }
     }
   }
-- 
Gitee


From 1fe54d9c9b5ea3e5c2ec555cf4d5f970916db7f8 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 24 Nov 2023 11:23:48 +0800
Subject: [PATCH 5/7] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20cmdb=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E8=8A=82=E7=82=B9=EF=BC=8C=E9=80=89=E4=B8=AD=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdbpolicy/cmdbsync-dialog.vue            | 277 ++++++++++--------
 .../cmdb/form/define/formcientitymodify.js    |   2 +
 .../cmdb/form/define/formcientityselector.js  |   2 +
 3 files changed, 162 insertions(+), 119 deletions(-)

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 cacce2bf..8c77f32f 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
@@ -246,7 +246,7 @@ export default {
           value: 'formSubassemblyComponent'
         }
       ],
-      currentFormItemList: [],
+      currentFormItemList: [], //当前表单组件（当配置项数量为多数据且遍历对象为子表单添加关系时，当前关系模型可选的表单组件为子表单内组件）
       tableList: [] //遍历对象，选择表格组件
     };
   },
@@ -277,7 +277,7 @@ export default {
         this.currentFormItemList = this.$utils.deepClone(this.allFormitemList);
       }
     },
-    initValue(cientity) {
+    initValue(cientity, preCiEntity) {
       let findItem = this.saveCiEntityMap[cientity.uuid];
       if (findItem) {
         Object.keys(findItem).forEach(key => {
@@ -298,6 +298,20 @@ export default {
           }
         });
       }
+      if (preCiEntity && preCiEntity.batchDataSource && preCiEntity.batchDataSource.type && 
+      cientity.batchDataSource && cientity.batchDataSource.type && 
+      preCiEntity.batchDataSource.type !== cientity.batchDataSource.type) {
+        this.$set(cientity.batchDataSource, 'type', preCiEntity.batchDataSource.type);
+        this.$set(cientity.batchDataSource, 'attributeUuid', '');
+        this.$set(cientity.batchDataSource, 'filterList', []);
+        Object.keys(cientity.allAttrEntityData).forEach(key => {
+          if (cientity.allAttrEntityData[key].mappingMode === 'formTableComponent' || cientity.allAttrEntityData[key].mappingMode === 'formSubassemblyComponent' &&
+           cientity.allAttrEntityData[key].mappingMode != cientity.batchDataSource.type) {
+            this.$set(cientity.allAttrEntityData[key], 'mappingMode', '');
+            this.$set(cientity.allAttrEntityData[key], 'valueList', []);
+          }
+        });
+      }
     },
     okDialog() {
       if (!this.valid()) {
@@ -312,7 +326,9 @@ export default {
     changeCiId(val) {
       this.saveCiEntityMap = {};
       this.ciEntityQueue = [];
-      this.$set(this.ciData, 'uuid', null);
+      this.currentFormItemList = this.$utils.deepClone(this.allFormitemList);
+      this.$set(this.ciData, 'createPolicy', 'single');
+      this.$set(this.ciData, 'batchDataSource', {});
       if (val) {
         this.getCiEntityById();
       }
@@ -340,6 +356,7 @@ export default {
             cientity['_description'] = this.descriptionConfig;
             this.initValue(cientity);
             this.ciEntityQueue = [cientity];
+            this.ciData = cientity;
           } else {
             if (ci.isVirtual == 1) {
               this.error = this.$t('message.cmdb.virtualmodel');
@@ -470,10 +487,10 @@ export default {
                 }
               ]
             };
-            this.updateCurrentFormItemList(currentCiEntity);
-            this.initValue(newCiEntity);
+            this.initValue(newCiEntity, currentCiEntity);
             this.ciData = newCiEntity;
             this.ciEntityQueue.push(newCiEntity);
+            this.updateCurrentFormItemList();
           }
         }).finally(() => {
           this.loadingShow = false;
@@ -495,6 +512,7 @@ export default {
       }
       this.ciData = this.ciEntityQueue[this.ciEntityQueue.length - 1];
       this.tmpCiEntityData = null;
+      this.updateCurrentFormItemList();
     },
     cancelNewCiEntity() {
       if (this.ciEntityQueue && this.ciEntityQueue.length > 1) {
@@ -505,7 +523,6 @@ export default {
     },
     editNewCiEntity(rel) {
       let uuid = rel.ciEntityUuid;
-      this.updateCurrentFormItemList(this.ciEntityQueue[this.ciEntityQueue.length - 1]);
       if (this.saveCiEntityMap[uuid]) {
         this.tmpCiEntityData = JSON.parse(JSON.stringify(this.saveCiEntityMap[uuid]));
         let index = -1;
@@ -517,12 +534,67 @@ export default {
         }
         if (index > -1) {
           this.ciEntityQueue = this.ciEntityQueue.slice(0, index + 1);
+          this.updateCurrentFormItemList();
         } else {
           //需要通过接口获取数据回显
           this.addNewCiEntity('rel', rel);
         }
       }
     },
+    setConfig(val, attr) {
+      this.$set(this.ciEntityQueue[this.ciEntityQueue.length - 1], attr, val);
+    },
+    setBatchDataSource(val, attr) {
+      let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
+      if (ciEntity) {
+        if (!ciEntity.batchDataSource) {
+          this.$set(ciEntity, 'batchDataSource', {});
+        }
+        this.$set(ciEntity.batchDataSource, attr, val);
+        if (attr === 'type') {
+          this.$set(ciEntity.batchDataSource, 'attributeUuid', '');
+          this.$set(ciEntity.batchDataSource, 'filterList', []);
+          Object.keys(ciEntity.allAttrEntityData).forEach(key => {
+            //改变遍历对象时，需要清空属性中与之不匹配的mappingMode
+            if (!val || (val === 'formSubassemblyComponent' && ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent') || (val === 'formTableComponent' && ciEntity.allAttrEntityData[key].mappingMode === 'formSubassemblyComponent')) {
+              this.$set(ciEntity.allAttrEntityData[key], 'mappingMode', '');
+              this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
+              this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
+            }
+          });
+        }
+        if (attr === 'attributeUuid') {
+          this.$set(ciEntity.batchDataSource, 'filterList', []);
+          Object.keys(ciEntity.allAttrEntityData).forEach(key => {
+            if (ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent' || ciEntity.allAttrEntityData[key].mappingMode === 'formSubassemblyComponent') {
+              this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
+              this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
+            }
+          });
+        }
+        this.$set(this.ciData, 'batchDataSource', ciEntity.batchDataSource);
+      }
+    },
+    changePolicy(val) {
+      let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
+      if (ciEntity) {
+        this.$set(ciEntity, 'batchDataSource', {});
+        this.$set(ciEntity, 'createPolicy', val);
+        this.$set(this.ciData, 'batchDataSource', {});
+        if (val === 'batch') {
+          //继承父级的遍历对象类型
+          if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.type && this.preCiEntity.batchDataSource.attributeUuid) {
+            this.$set(this.ciData.batchDataSource, 'type', this.preCiEntity.batchDataSource.type);
+          }
+        }
+        Object.keys(ciEntity.allAttrEntityData).forEach(key => {
+          if (val === 'batch' && ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent') {
+            this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
+            this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
+          }
+        });
+      }
+    },
     valid() {
       let isValid = true;
       if (this.$refs.ciConfig && !this.$refs.ciConfig.valid()) {
@@ -573,6 +645,7 @@ export default {
         cientity._isnew = true;
         this.saveCiEntityMap[cientity.uuid] = cientity;
         this.ciData = this.ciEntityQueue[this.ciEntityQueue.length - 1];
+        this.updateCurrentFormItemList();
       } else if (this.ciEntityQueue.length == 1) {
         const cientity = this.ciEntityQueue[0];
         this.saveCiEntityMap[cientity.uuid] = cientity;
@@ -583,36 +656,61 @@ export default {
         return ciEntityList;
       }
     },
-    setConfig(val, attr) {
-      this.$set(this.ciEntityQueue[this.ciEntityQueue.length - 1], attr, val);
-    },
-    setBatchDataSource(val, attr) {
-      let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
-      if (ciEntity) {
-        if (!ciEntity.batchDataSource) {
-          this.$set(ciEntity, 'batchDataSource', {});
+    save() {
+      let data = {};
+      let configList = [];
+      let list = this.saveNewCiEntity();
+      list.forEach(item => {
+        let config = {
+          uuid: item.uuid,
+          ciIcon: item.ciIcon,
+          ciId: item.ciId,
+          ciLabel: item.ciLabel,
+          ciName: item.ciName,
+          createPolicy: item.createPolicy,
+          batchDataSource: item.batchDataSource || {},
+          mappingList: []
+        };
+        if (item.hasOwnProperty('isStart')) {
+          config.isStart = item.isStart;
         }
-        this.$set(ciEntity.batchDataSource, attr, val);
-        this.$set(this.ciData, 'batchDataSource', ciEntity.batchDataSource);
-        if (attr === 'type') {
-          Object.keys(ciEntity.allAttrEntityData).forEach(key => {
-            //改变遍历对象时，需要清空属性中与之不匹配的mappingMode
-            if (val === 'formSubassemblyComponent' && ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent' || (val === 'formTableComponent' && ciEntity.allAttrEntityData[key].mappingMode === 'formSubassemblyComponent')) {
-              this.$set(ciEntity.allAttrEntityData[key], 'mappingMode', '');
-              this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
-              this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
-            }
-          });
+        if (item.hasOwnProperty('action')) {
+          config.action = item.action;
         }
-        if (attr === 'attributeUuid') {
-          Object.keys(ciEntity.allAttrEntityData).forEach(key => {
-            if (ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent' || ciEntity.allAttrEntityData[key].mappingMode === 'formSubassemblyComponent') {
-              this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
-              this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
-            }
-          });
+        if (item.hasOwnProperty('allAttrEntityData')) {
+          if (!this.$utils.isEmpty(item.allAttrEntityData)) {
+            Object.keys(item.allAttrEntityData).forEach(key => {
+              if (!this.$utils.isEmpty(item.allAttrEntityData[key].mappingMode) && !this.$utils.isEmpty(item.allAttrEntityData[key].valueList)) {
+                let objectData = {
+                  key: key,
+                  mappingMode: item.allAttrEntityData[key].mappingMode,
+                  valueList: item.allAttrEntityData[key].valueList 
+                };
+                if (item.allAttrEntityData[key].hasOwnProperty('filterList')) {
+                  objectData.filterList = item.allAttrEntityData[key].filterList;
+                }
+                config.mappingList.push(objectData);
+              }
+            });
+          }
+          if (!this.$utils.isEmpty(item.relEntityData)) {
+            Object.keys(item.relEntityData).forEach(key => {
+              if (!this.$utils.isEmpty(item.relEntityData[key].valueList)) {
+                config.mappingList.push({
+                  key: key,
+                  mappingMode: 'new',
+                  valueList: item.relEntityData[key].valueList
+                });
+              }
+            });
+          }
+        } else {
+          config.mappingList = item.mappingList || [];
         }
-      }
+        configList.push(config);
+      });
+      this.$set(data, 'configList', configList);
+      return data;
     },
     getFormTableComponent() { //获取表单table组件
       let dataList = [];
@@ -632,7 +730,7 @@ export default {
                 });
               }
             } else {
-            //table组件（表格数据组件、表单选择组件）
+            //table组件（表格输入组件、表单选择组件）
               dataList = this.currentFormItemList.filter(item => {
                 return item.handler === 'formtableselector' || item.handler === 'formtableinputer';
               });
@@ -655,7 +753,7 @@ export default {
         if (batchDataSource.type === 'formTableComponent') { //表单table组件，属性列表
           let findTable = this.allFormitemList.find(item => item.uuid === uuid);
           if (!findTable) {
-            if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.attributeUuid) {
+            if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.type === 'formTableComponent') {
               let preTable = this.allFormitemList.find(item => item.uuid === this.preCiEntity.batchDataSource.attributeUuid);
               if (preTable) {
                 findTable = preTable.config.dataConfig.find(item => item.uuid === uuid);
@@ -688,82 +786,6 @@ export default {
       }
       return dataList;
     },
-    changePolicy(val) {
-      let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
-      if (ciEntity) {
-        this.$set(ciEntity, 'batchDataSource', {});
-        this.$set(ciEntity, 'createPolicy', val);
-        this.$set(this.ciData, 'batchDataSource', {});
-        if (val === 'batch') {
-          //继承父级的遍历对象类型
-          if (this.preCiEntity && this.preCiEntity.batchDataSource && this.preCiEntity.batchDataSource.type && this.preCiEntity.batchDataSource.attributeUuid) {
-            this.$set(this.ciData.batchDataSource, 'type', this.preCiEntity.batchDataSource.type);
-          }
-        }
-        Object.keys(ciEntity.allAttrEntityData).forEach(key => {
-          if (val === 'batch' && ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent') {
-            this.$set(ciEntity.allAttrEntityData[key], 'valueList', []);
-            this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
-          }
-        });
-      }
-    },
-    save() {
-      let data = {};
-      let configList = [];
-      let list = this.saveNewCiEntity();
-      list.forEach(item => {
-        let config = {
-          uuid: item.uuid,
-          ciIcon: item.ciIcon,
-          ciId: item.ciId,
-          ciLabel: item.ciLabel,
-          ciName: item.ciName,
-          createPolicy: item.createPolicy,
-          batchDataSource: item.batchDataSource || {},
-          mappingList: []
-        };
-        if (item.hasOwnProperty('isStart')) {
-          config.isStart = item.isStart;
-        }
-        if (item.hasOwnProperty('action')) {
-          config.action = item.action;
-        }
-        if (item.hasOwnProperty('allAttrEntityData')) {
-          if (!this.$utils.isEmpty(item.allAttrEntityData)) {
-            Object.keys(item.allAttrEntityData).forEach(key => {
-              if (!this.$utils.isEmpty(item.allAttrEntityData[key].mappingMode) && !this.$utils.isEmpty(item.allAttrEntityData[key].valueList)) {
-                let objectData = {
-                  key: key,
-                  mappingMode: item.allAttrEntityData[key].mappingMode,
-                  valueList: item.allAttrEntityData[key].valueList 
-                };
-                if (item.allAttrEntityData[key].hasOwnProperty('filterList')) {
-                  objectData.filterList = item.allAttrEntityData[key].filterList;
-                }
-                config.mappingList.push(objectData);
-              }
-            });
-          }
-          if (!this.$utils.isEmpty(item.relEntityData)) {
-            Object.keys(item.relEntityData).forEach(key => {
-              if (!this.$utils.isEmpty(item.relEntityData[key].valueList)) {
-                config.mappingList.push({
-                  key: key,
-                  mappingMode: 'new',
-                  valueList: item.relEntityData[key].valueList
-                });
-              }
-            });
-          }
-        } else {
-          config.mappingList = item.mappingList || [];
-        }
-        configList.push(config);
-      });
-      this.$set(data, 'configList', configList);
-      return data;
-    },
     getFormComponent(tableList) { //当前层子表单普通组件
       let list = [];
       tableList.forEach(item => {
@@ -773,18 +795,36 @@ export default {
       });
       return list;
     },
-    updateCurrentFormItemList(currentCiEntity) { 
-      if (!this.$utils.isEmpty(currentCiEntity) && currentCiEntity.batchDataSource && currentCiEntity.batchDataSource.type === 'formSubassemblyComponent') {
-        let subFormConfig = this.currentFormItemList.find(c => c.uuid === currentCiEntity.batchDataSource.attributeUuid);
-        if (subFormConfig) {
-          this.currentFormItemList = this.getFormComponent(subFormConfig.formData.formConfig.tableList);
-        } else {
-          this.currentFormItemList = [];
+    updateCurrentFormItemList() { //如果上层模型为多条数据，且遍历对象是子表单组件，需要更新当前表单组件列表
+      let uuidList = [];
+      if (this.ciEntityQueue.length > 1) {
+        for (let i = this.ciEntityQueue.length - 2; i >= 0; i--) {
+          if (this.ciEntityQueue[i].batchDataSource &&
+          this.ciEntityQueue[i].batchDataSource.type === 'formSubassemblyComponent' &&
+          this.ciEntityQueue[i].batchDataSource.attributeUuid) {
+            uuidList.unshift(this.ciEntityQueue[i].batchDataSource.attributeUuid);
+          } else {
+            break;
+          }
         }
+      }
+      if (!this.$utils.isEmpty(this.preCiEntity) && uuidList.length > 0) {
+        this.getSubformComponent(this.allFormitemList, this.preCiEntity.batchDataSource.attributeUuid);
       } else {
         this.currentFormItemList = this.$utils.deepClone(this.allFormitemList);
       }
     },
+    getSubformComponent(list, uuid) { //获取子表单组件列表
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].uuid === uuid) {
+          this.currentFormItemList = this.getFormComponent(list[i].formData.formConfig.tableList);
+          break;
+        } else if (list[i].handler === 'formsubassembly') {
+          let subformList = this.getFormComponent(list[i].formData.formConfig.tableList);
+          this.getSubformComponent(subformList, uuid);
+        }
+      }
+    },
     getTableAttrList() { //过滤对象为表格组件时，属性映射可选的表格属性
       let list = [];
       if (this.currentCiEntity && 
@@ -874,7 +914,6 @@ export default {
       });
       return treeList;
     }
-
   },
   filter: {},
   computed: {
diff --git a/src/views/pages/cmdb/form/define/formcientitymodify.js b/src/views/pages/cmdb/form/define/formcientitymodify.js
index 82168055..9ee46230 100644
--- a/src/views/pages/cmdb/form/define/formcientitymodify.js
+++ b/src/views/pages/cmdb/form/define/formcientitymodify.js
@@ -14,6 +14,8 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false,
     'actionEdit': false,
     'actionDel': false,
     'actionAdd': false,
diff --git a/src/views/pages/cmdb/form/define/formcientityselector.js b/src/views/pages/cmdb/form/define/formcientityselector.js
index 0de8006f..3f42095c 100644
--- a/src/views/pages/cmdb/form/define/formcientityselector.js
+++ b/src/views/pages/cmdb/form/define/formcientityselector.js
@@ -15,6 +15,8 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false,
     'ciList': []
   },
   'reaction': { 'mask': {}, 'hide': {}, 'display': {}, 'readonly': {}, 'disable': {}, 'required': {} }
-- 
Gitee


From 04f2291b9245186f62e96f7214012fdc77db3361 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 29 Nov 2023 10:11:05 +0800
Subject: [PATCH 6/7] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86-=E6=B5=81=E7=A8=8B=E5=9B=BE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=A6=E6=83=85=E6=97=B6=E4=BD=8D=E7=BD=AE=E5=81=8F?=
 =?UTF-8?q?=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsTopoNew/js/topo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/plugins/TsTopoNew/js/topo.js b/src/resources/plugins/TsTopoNew/js/topo.js
index 270b0636..e3aa32a8 100644
--- a/src/resources/plugins/TsTopoNew/js/topo.js
+++ b/src/resources/plugins/TsTopoNew/js/topo.js
@@ -696,7 +696,7 @@
         var zoomTransform = d3.zoomTransform(this.el.node());
         var k = zoomTransform.k || 1;
         var position = zoomTransform[action]([data.x, data.y]);
-        if(k !== 1 ){ 
+        if (action ==='invert' && k !== 1 ){ 
           //流程图缩放时，坐标轴位置调整
           data.x = position[0] + zoomTransform.x;
           data.y = position[1] + zoomTransform.y;
-- 
Gitee


From 01c020e8991f2f3e9c910cb745027ccdbc06a9b6 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 29 Nov 2023 11:46:11 +0800
Subject: [PATCH 7/7] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=EF=BC=8C=E8=A1=A8=E5=8D=95=E5=AD=90=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=80=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-edit.vue                  | 2 +-
 src/resources/plugins/TsSheet/form-item.vue                  | 4 ++--
 src/resources/plugins/TsSheet/form/component/base.vue        | 4 ++--
 src/resources/plugins/TsSheet/form/define/formcollapse.js    | 2 ++
 src/resources/plugins/TsSheet/form/define/formsubassembly.js | 1 +
 src/views/pages/autoexec/form/define/formprotocol.js         | 4 +++-
 src/views/pages/autoexec/form/define/formresoureces.js       | 4 +++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form-edit.vue b/src/resources/plugins/TsSheet/form-edit.vue
index ee7d2b6f..093c2b20 100644
--- a/src/resources/plugins/TsSheet/form-edit.vue
+++ b/src/resources/plugins/TsSheet/form-edit.vue
@@ -5,7 +5,7 @@
         <span class="tsfont-left text-action" @click="$back('/form-overview')">{{ $getFromPage($t('router.framework.formmanage')) }}</span>
       </template>
       <template v-slot:topLeft>
-        <div class="flex-between">
+        <div :class="formDataQueue.length <=1?'flex-between':'flex-end'">
           <div v-if="formDataQueue.length <=1" class="flex-start">
             <div class="pr-sm">
               <TsFormInput
diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index a7904db9..33e787a7 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -203,7 +203,7 @@ export default {
     },
     //根据联动配置初始化watch
     initReactionWatch() {
-      if (this.mode === 'read') {
+      if (this.mode === 'read' || this.mode === 'readSubform') {
         let needWatch = false;
         if (this.formItem.reaction) {
           for (let key in this.formItem.reaction) {
@@ -515,7 +515,7 @@ export default {
     showComponent() {
       return formItem => {
         let isShow = true;
-        if ((this.mode === 'read' && formItem.config && formItem.config.isHide) || formItem.isEditing ||
+        if (((this.mode === 'read' || this.mode === 'readSubform') && formItem.config && formItem.config.isHide) || formItem.isEditing ||
          (formItem.override_config && formItem.override_config.isHide)
         ) {
           isShow = false;
diff --git a/src/resources/plugins/TsSheet/form/component/base.vue b/src/resources/plugins/TsSheet/form/component/base.vue
index 7317bf29..659b55c1 100644
--- a/src/resources/plugins/TsSheet/form/component/base.vue
+++ b/src/resources/plugins/TsSheet/form/component/base.vue
@@ -29,7 +29,7 @@ export default {
   },
   created() {
     //在非条件模式下，用默认值替换空的value值
-    if (this.mode === 'read' && this.value == null && this.config && this.config.hasOwnProperty('defaultValue')) {
+    if ((this.mode === 'read' || this.mode === 'readSubform') && this.value == null && this.config && this.config.hasOwnProperty('defaultValue')) {
       this.setValue(this.config['defaultValue']);
     }
   },
@@ -126,7 +126,7 @@ export default {
     required: {
       handler(val) {
         this.validateList = [];
-        if (this.mode === 'read' && val) {
+        if ((this.mode === 'read' || this.mode === 'readSubform') && val) {
           this.validateList.push({name: 'required', message: ' '});
         }
       },
diff --git a/src/resources/plugins/TsSheet/form/define/formcollapse.js b/src/resources/plugins/TsSheet/form/define/formcollapse.js
index 7ef9ea08..81c9b8eb 100644
--- a/src/resources/plugins/TsSheet/form/define/formcollapse.js
+++ b/src/resources/plugins/TsSheet/form/define/formcollapse.js
@@ -14,6 +14,8 @@ export default {
     'width': '100%',
     'isMask': false,
     'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false,
     'isSimple': false,
     'isAccordion': false
   },
diff --git a/src/resources/plugins/TsSheet/form/define/formsubassembly.js b/src/resources/plugins/TsSheet/form/define/formsubassembly.js
index 6bbabec7..25cad23d 100644
--- a/src/resources/plugins/TsSheet/form/define/formsubassembly.js
+++ b/src/resources/plugins/TsSheet/form/define/formsubassembly.js
@@ -10,6 +10,7 @@ export default {
   'hasValue': true,
   'component': [],
   'config': {
+    'disableDefaultValue': true,
     'width': '100%',
     'isMask': false,
     'isHide': false,
diff --git a/src/views/pages/autoexec/form/define/formprotocol.js b/src/views/pages/autoexec/form/define/formprotocol.js
index 7a40115e..0e868e6c 100644
--- a/src/views/pages/autoexec/form/define/formprotocol.js
+++ b/src/views/pages/autoexec/form/define/formprotocol.js
@@ -14,7 +14,9 @@ export default {
     'description': '',
     'width': '100%',
     'isMask': false,
-    'isHide': false
+    'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false
   },
   'reaction': {
     'hide': {},
diff --git a/src/views/pages/autoexec/form/define/formresoureces.js b/src/views/pages/autoexec/form/define/formresoureces.js
index 0549164d..5b4dfe02 100644
--- a/src/views/pages/autoexec/form/define/formresoureces.js
+++ b/src/views/pages/autoexec/form/define/formresoureces.js
@@ -14,7 +14,9 @@ export default {
     'description': '',
     'width': '100%',
     'isMask': false,
-    'isHide': false
+    'isHide': false,
+    'isReadOnly': false,
+    'isDisabled': false
   },
   'reaction': {
     'hide': {},
-- 
Gitee