diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index 7b82f58f1d178e448ae1c1fb2e7a2c7bcf3e46ca..d8f215fc0dd4d8fa1756869a2aa344feb6d3a687 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -947,6 +947,7 @@
   "filltype": "Background Fill Method",
   "backgroundresizable": "Background Follow Zoom",
   "auto": "automatic",
+  "foreachobj": "Traverse Object",
   "mainscene": "Main scene",
   "enter": "enter",
   "viewdata": "View Data"
diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json
index 565addabf0b4866ca574f223cfce383669236b40..2ef2c50045873ced2e176ef45f353bd4ef4c9f20 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -949,6 +949,7 @@
   "filltype": "背景填充方式",
   "backgroundresizable": "背景跟随缩放",
   "auto": "自动",
+  "foreachobj": "遍历对象",
   "mainscene": "主场景",
   "enter": "进入",
   "viewdata": "查看数据"
diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index fde435ee9f5b55e4fcadc27aaa4e160f353985d5..3a05fa9eab135b2cd9100f16d6df98559e184368 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -1153,6 +1153,7 @@
     "exporttable": "Export Table",
     "importtable": "Import Table",
     "excelinputtemplate": "Table Input Template",
+    "formsubassembly": "List subcomponents",
     "globalreadonly": "Global read-only",
     "globalreadonlytip": "The global read-only priority is higher than the internal read and write settings of the component. After turning on the global read-only switch, all components in the scene are in a read-only state"
   },
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index cf2339881125ac4908171d0b1dacece2dc737774..e809a6c5753e53baeb0598aab821dc864e5a9e61 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -1152,6 +1152,7 @@
     "exporttable": "导出表格",
     "importtable": "导入表格",
     "excelinputtemplate": "表格输入模板",
+    "formsubassembly": "表单子组件",
     "globalreadonly": "全局只读",
     "globalreadonlytip": "全局只读优先级高于组件内部的读写设置，打开全局只读开关后，场景内所有组件均为只读状态"
   },
diff --git a/src/resources/plugins/TsSheet/form-edit.vue b/src/resources/plugins/TsSheet/form-edit.vue
index ee7d2b6f9f909af213d840f6685193d2df0261d2..093c2b2043a1d15ad78d0fb38023751122b70a0b 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 a7904db9831ad3392f6ef48173fb3e33d3a3023b..33e787a7e49d61e5c219fca311f9601fa3a48bc0 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 7317bf2991a9e91b838bdb99032f8624a6deb779..659b55c1fbb4ae1fcf2638ea137a507d5457b8f9 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/component/formsubassembly.vue b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
index a894d6c263fe7294ef74fd8bc1cfcd5f84dacd3d..23169f08967f6c23f635044c56c08c282831d1ef 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 48ca3de0bbb221fdd0083ecd82f9bb4c5ce169f7..6ec4384247c3ff7bdd491e95d2c48d59b80c3220 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/formcollapse.js b/src/resources/plugins/TsSheet/form/define/formcollapse.js
index 7ef9ea08677c2f228246c41f8393bab1291742ba..81c9b8eb47f36fe54606c31f1dcf6655aa5a98f3 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/formnumber.js b/src/resources/plugins/TsSheet/form/define/formnumber.js
index 5aaeda5583840836880a44b589bb736ddb8d9ee6..919a2fd43b6637a02792297d2212388fd48e2751 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 e22ebc50f4adc6f32e4ef300e7cee28b49451ce9..ae638a88eb48968b368ecffc7dff3030e4f61875 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 867ef6874a5adb0f2f9eabd34c8ddd68b81e2ec2..a0cfff5f00ba1adcec828b20713357cd797ad4aa 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 d281519495c8eb4c828de87ab4e81697ce07ae32..25cad23d1e590716041fdbda559469643c1b79fd 100644
--- a/src/resources/plugins/TsSheet/form/define/formsubassembly.js
+++ b/src/resources/plugins/TsSheet/form/define/formsubassembly.js
@@ -2,19 +2,21 @@ 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': {
+    'disableDefaultValue': true,
     '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 975aa9dd4e9e26a09712373c2a3341b3ae089077..bb34988a083a05b60ec60f4f47641c0aa82d0fe9 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 858befb015d1b3d76f136cee7b55bb13ba5a7507..0ddfafd99c96d0f590a60c050fa46948859fb9ee 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 5900c2cb3e04c9aae63402e11b427adcafaac3a5..9b3dde966c2cd98e54c03bb254fd8667f8d5d5ec 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 f437061d5eb6fc0994b9709b78ad9f049505dc21..c2fdf90fe9b804551833b0b3be1d9c9e4e1e369f 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 f72e658517679917770ca48c97ebff7a254a4078..4dadb49c89d77337a002cbddb1304727dec2cb07 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 56e6977a117b4fd87e720b0bc537500694c61e3b..408bb151396dfae2cda1e705eafb385a6d1a38ce 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 6b4b9c037e02b706d6f6478e69038f095c511f51..32066a2e31acb46ede8c9cda280282613ef1fe0b 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/resources/plugins/TsTopoNew/js/topo.js b/src/resources/plugins/TsTopoNew/js/topo.js
index 270b0636401ec177c7fe9afd9cc1c474c35d42d2..e3aa32a8d841a319b2279c6262c149a3e9d431fe 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;
diff --git a/src/views/pages/autoexec/form/define/formprotocol.js b/src/views/pages/autoexec/form/define/formprotocol.js
index 7a40115e04cf8020fd2db1f768d7137ff6705fca..0e868e6c008af11b07318853af6012640524fadf 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 0549164d2fa15e4f81e3dcdf3ab5966e6b4ce391..5b4dfe0246056b3ffb9610f957c8edca0b32eb3d 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': {},
diff --git a/src/views/pages/cmdb/flow/node/cmdbsync.vue b/src/views/pages/cmdb/flow/node/cmdbsync.vue
index 88c28f6f83b839a6c6774d2a72cf02843f2c093e..82d0919c85f797b41c4823c13a4b42472d2688d1 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 f053eb440afb54aeec409b0a2c1baaee18d34ea0..8c77f32f157adb7890f1d1d407111d5ff59e403a 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')"
@@ -109,6 +126,8 @@
                       :allFormitemList="allFormitemList"
                       :ciEntityQueue="ciEntityQueue"
                       :ciData="ciData"
+                      :subFormComponentList="getTreeSubFormComponent()"
+                      :tableComponentAttrList="getTableAttrList()"
                       @new="addNewCiEntity"
                       @edit="editNewCiEntity"
                       @remove="removeNewCiEntity"
@@ -216,7 +235,19 @@ export default {
             maxlength: 500
           }
         }
-      ], isShow: true }
+      ], isShow: true },
+      batchComponentList: [
+        {
+          text: this.$t('term.process.formtableitem'),
+          value: 'formTableComponent'
+        },
+        {
+          text: this.$t('term.framework.formsubassembly'),
+          value: 'formSubassemblyComponent'
+        }
+      ],
+      currentFormItemList: [], //当前表单组件（当配置项数量为多数据且遍历对象为子表单添加关系时，当前关系模型可选的表单组件为子表单内组件）
+      tableList: [] //遍历对象，选择表格组件
     };
   },
   beforeCreate() {},
@@ -243,9 +274,10 @@ export default {
           this.$set(this.saveCiEntityMap, item.uuid, item);
         });
         this.getCiEntityById();
+        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 => {
@@ -266,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()) {
@@ -280,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();
       }
@@ -308,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');
@@ -394,6 +443,9 @@ export default {
       }
     },
     addNewCiEntity(type, item) {
+      if (!this.valid()) {
+        return;
+      }
       this.loadingShow = true;
       if (type === 'rel') {
         const rel = item;
@@ -435,9 +487,10 @@ export default {
                 }
               ]
             };
-            this.initValue(newCiEntity);
+            this.initValue(newCiEntity, currentCiEntity);
             this.ciData = newCiEntity;
             this.ciEntityQueue.push(newCiEntity);
+            this.updateCurrentFormItemList();
           }
         }).finally(() => {
           this.loadingShow = false;
@@ -459,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) {
@@ -480,19 +534,83 @@ 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()) {
         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; 
     },
@@ -527,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;
@@ -537,76 +656,6 @@ 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', {});
-        }
-        this.$set(ciEntity.batchDataSource, attr, val);
-        this.$set(this.ciData, 'batchDataSource', ciEntity.batchDataSource);
-        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', '');
-              this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
-            }
-          });
-        }
-      }
-    },
-    getFormTableComponent() { //获取表单table组件
-      let dataList = [];
-      if (this.allFormitemList && this.allFormitemList.length > 0) {
-        //table组件（表格数据组件、表单选择组件）
-        dataList = this.allFormitemList.filter(item => {
-          return item.handler === 'formtableselector' || item.handler === 'formtableinputer';
-        });
-      }
-      return dataList;
-    },
-    getAttrList(batchDataSource) { //表单table组件，属性列表
-      let dataList = [];
-      let uuid = null;
-      if (batchDataSource && 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
-              });
-            });
-          }
-        }
-      }
-      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', {});
-        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', []);
-          }
-        });
-      }
-    },
     save() {
       let data = {};
       let configList = [];
@@ -637,9 +686,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;
                 }
@@ -665,6 +711,208 @@ export default {
       });
       this.$set(data, 'configList', configList);
       return data;
+    },
+    getFormTableComponent() { //获取表单table组件
+      let dataList = [];
+      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 if (this.currentCiEntity.batchDataSource.type === 'formSubassemblyComponent') {
+          //表单子组件
+            dataList = this.currentFormItemList.filter(item => {
+              return item.handler === 'formsubassembly';
+            });
+          }
+        }
+      }
+      return dataList;
+    },
+    getAttrList(batchDataSource) { //过滤条件，属性选择列表
+      let dataList = [];
+      let uuid = null;
+      if (batchDataSource && batchDataSource.type && batchDataSource.attributeUuid) {
+        uuid = batchDataSource.attributeUuid;
+        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.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);
+              }
+            }
+          }
+          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
+                });
+              }
+            });
+          }
+        }
+      }
+      return dataList;
+    },
+    getFormComponent(tableList) { //当前层子表单普通组件
+      let list = [];
+      tableList.forEach(item => {
+        if (!this.$utils.isEmpty(item.component) && item.component.hasValue) {
+          list.push(item.component);
+        }
+      });
+      return list;
+    },
+    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 && 
+      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: {},
@@ -672,8 +920,21 @@ 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() { //表单组件
       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 a9a651e6103cc4b58d1e78271ab2dbc822cf902e..cbcb581d7db9276c439613c472fc16504bc54d06 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,14 +93,13 @@
                         <TsFormSelect
                           ref="attrHandler"
                           :value="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode')"
-                          :dataList="mappingModeList"
+                          :dataList="getMappingDataList() "
                           :firstSelect="false"
                           transfer
                           border="border"
                           :validateList="getValidList(e.type, e.element)"
                           @change="(val)=>{
                             changeMappingMode(val,e)
-                            setConfig(val,'mappingMode',e)
                           }"
                         ></TsFormSelect>
                       </Col>
@@ -174,32 +173,18 @@
                         </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
+                                <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"
@@ -235,16 +220,24 @@
                             </Col>
                           </TsRow>
                         </template>
+                        <template v-else-if="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode') === 'formSubassemblyComponent'">
+                          <TsRow :gutter="8">
+                            <Col :span="24">
+                              <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>
                       </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>
@@ -264,17 +257,19 @@ export default {
     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)
+    TsFormCascader: resolve => require(['@/resources/plugins/TsForm/TsFormCascader.vue'], resolve)
   },
   props: {
     ciData: Object,
     allFormitemList: Array,
-    ciEntityQueue: {
+    ciEntityQueue: { //配置项添加队列
       type: Array,
       default: () => {
         return [];
       }
-    } //配置项添加队列
+    },
+    subFormComponentList: Array,
+    tableComponentAttrList: Array
   },
   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,11 +499,8 @@ export default {
       }
     },
     changeMappingMode(val, e) {
-      if (val === 'formTableComponent' && 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: {},
@@ -570,7 +566,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 => {
@@ -581,26 +577,18 @@ export default {
         return dataList;
       };
     },
-    getAttrList() {
-      return (data, e) => {
-        let dataList = [];
-        let key = null;
-        if (e.type === 'des') {
-          key = 'description';
+    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 {
-          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
-              });
-            });
-          }
+          dataList = dataList.filter(item => {
+            return (item.value === 'constant') || (item.value === 'formCommonComponent');
+          });
         }
         return dataList;
       };
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 03b71101af23536d8f81d53fa7906988c0427aac..500e13536818f4fb93bcf96caa0003a8a96ad3ac 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;
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 1f1142c5d89e0240fb6fc22d4ab2a61320079a61..e71d47281b9561d646e3818031af6f23bc616194 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,11 @@
         {{ $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"
+      @close="close"
+    ></CmdbsyncDialog>
   </div>
 </template>
 <script>
diff --git a/src/views/pages/cmdb/form/define/formcientitymodify.js b/src/views/pages/cmdb/form/define/formcientitymodify.js
index 8216805514271b809b428987ea7af1f24b224b7d..9ee46230aca05d88523f6576bcf1cedceed56156 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 0de8006fa6500226542a7c1aa715c523e977b2cd..3f42095c000ef23490b56684cbb527349e076a86 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': {} }
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 8bf72096668a14ec09a489f51a05d38278b81108..7e895a32eb42daf05c6db190ec56c0579d59ab79 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 : '';
       }
     }
   }