From 428356b5bb37605319166e7addfcf45f3e3e312e Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 17 Oct 2023 11:06:40 +0800
Subject: [PATCH 01/16] =?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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flowedit/components/cmdbsync-node.vue     | 163 ++++++++++++++++++
 .../process/flow/flowedit/components/index.js |   4 +-
 .../nodesetting/cmdbsync-setting.vue          |  99 +++++++++++
 3 files changed, 265 insertions(+), 1 deletion(-)
 create mode 100644 src/views/pages/process/flow/flowedit/components/cmdbsync-node.vue
 create mode 100644 src/views/pages/process/flow/flowedit/components/nodesetting/cmdbsync-setting.vue

diff --git a/src/views/pages/process/flow/flowedit/components/cmdbsync-node.vue b/src/views/pages/process/flow/flowedit/components/cmdbsync-node.vue
new file mode 100644
index 000000000..5ba32e8cd
--- /dev/null
+++ b/src/views/pages/process/flow/flowedit/components/cmdbsync-node.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="cmdbsyncNode">
+    <!-- 表单场景 -->
+    <FormsceneSetting
+      v-model="configData.stepConfig"
+      :formConfig="formConfig"
+      :toSetting="toSetting"
+      @updateScene="updateScene"
+    ></FormsceneSetting>
+    <!-- 权限 -->
+    <AuthoritySetting
+      :list="authorityList"
+      :defaultIsActive="activeSetting.permission"
+      :nodeConfig="nodeConfig"
+      @updateauthority="updateauthority"
+    ></AuthoritySetting>
+    <!-- 通知设置 -->
+    <NoticeSetting
+      ref="NoticeSetting"
+      v-model="activeSetting.informSetting"
+      :formUuid="formUuid"
+      :config="notifyPolicyConfig"
+      :nodeConfig="nodeConfig"
+    ></NoticeSetting>
+    <!-- 动作设置 -->
+    <ActionSetting
+      v-bind="actionConfig"
+      :defaultIsActive="activeSetting.actionSetting"
+      :formConfig="formConfig"
+      @updateaction="updateaction"
+      @updateActionSetting="updateActionSetting"
+    ></ActionSetting>
+    <!-- 动作设置_end -->
+    <!-- 按钮映射 -->
+    <ButtonSetting
+      :defaultIsActive="activeSetting.buttonStatus"
+      :defaultCustomButtonList="customButtonList"
+      :defaultCustomStatusList="customStatusList"
+      :defaultReplaceableTextList="replaceableTextList"
+      :nodeConfig="nodeConfig"
+      @updatebutton="updatebutton"
+    ></ButtonSetting>
+    <!-- 异常处理人 -->
+    <AssignSetting
+      id="assignData"
+      ref="assignData"
+      :prevNodes="prevNodes"
+      :formUuid="formUuid"
+      :defaultWorkerPolicyConfig="workerPolicyConfig"
+      :toSetting="toSetting"
+    ></AssignSetting>
+  </div>
+</template>
+<script>
+import nodemixin from './nodemixin.js';
+export default {
+  name: '',
+  components: {
+    FormsceneSetting: resolve => require(['./nodesetting/formscene-setting'], resolve), // 表单场景
+    AuthoritySetting: resolve => require(['./nodesetting/authority-setting.vue'], resolve),
+    NoticeSetting: resolve => require(['./nodesetting/notice-setting.vue'], resolve),
+    ActionSetting: resolve => require(['./nodesetting/action-setting.vue'], resolve),
+    ButtonSetting: resolve => require(['./nodesetting/button-setting.vue'], resolve),
+    AssignSetting: resolve => require(['./nodesetting/assign-setting.vue'], resolve)
+  },
+  mixins: [nodemixin],
+  props: {},
+  data() {
+    let _this = this;
+    return {
+      configData: {stepConfig: {}}, //当前节点数据
+      activeSetting: {//开关设置
+        permission: 0, //权限设置开关
+        buttonStatus: 0, //按钮状态设置
+        informSetting: 0, //通知设置
+        actionSetting: 0 // 动作设置
+      },
+      formUuid: _this.formConfig && _this.formConfig.uuid ? _this.formConfig.uuid : '', //表单id
+      authorityList: [], //权限
+      customButtonList: [], //按钮
+      customStatusList: [], //工单状态映射
+      replaceableTextList: [], //文案映射
+      notifyPolicyConfig: {}, //通知
+      actionConfig: {}, //动作数据
+      workerPolicyConfig: {}
+    };
+  },
+  beforeCreate() {},
+  created() {
+  },
+  beforeMount() {},
+  mounted() {
+    this.keyList = ['actionConfig', 'authorityList', 'customStatusList', 'customButtonList', 'replaceableTextList', 'notifyPolicyConfig', 'workerPolicyConfig'];//stepConfig 需要包含的数据
+    this.getNodeSetting();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getNodeSetting() {
+      //初始化节点数据
+      if (!this.nodeConfig) {
+        return;
+      }
+      let config = this.configData = this.$utils.deepClone(this.nodeConfig);
+      this.uuid = config.uuid;
+      this.initNodeData(config, this.keyList);//初始化数据
+      if (this.formUuid) { //获取表单对应的数据
+        this.getFormItem(this.formUuid);
+      }
+    },
+    nodeValid(href) {
+      //校验
+      let querySelect = href.substring(1);
+      this.$nextTick(() => {
+        if (querySelect != 'assignData') {
+          this.$refs[`${querySelect}`].valid();
+        } else {
+          this.$refs.assignData.assignValid();
+        }
+      });
+    },
+    saveNodeData() {
+      //保存数据
+      let stepConfig = Object.assign({}, this.configData.stepConfig);
+      if (this.keyList && this.keyList.length) {
+        this.keyList.forEach(item => {
+          stepConfig[item] = this[item] || undefined;
+        });
+      }
+      //权限设置
+      if (this.$refs.NoticeSetting) { //通知
+        stepConfig.notifyPolicyConfig = this.$refs.NoticeSetting.getData();
+      }
+      //分派处理人
+      if (this.$refs.assignData) {
+        stepConfig.workerPolicyConfig = this.$refs.assignData.saveAssignData();
+      }
+      stepConfig['formSceneUuid'] = this.configData.stepConfig.formSceneUuid || '';
+      return this.clearNodeData(stepConfig);
+    },
+    updateaction(type, data, index) {
+      if (type == 'add') {
+        this.actionConfig.actionList.push(data);
+      } else if (type == 'empty') {
+        this.actionConfig.actionList = [];
+      } else if (type == 'remove') {
+        this.$delete(this.actionConfig.actionList, index);
+      } else {
+        this.$set(this.actionConfig.actionList, index, data);
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/process/flow/flowedit/components/index.js b/src/views/pages/process/flow/flowedit/components/index.js
index 08884cb10..19273316f 100644
--- a/src/views/pages/process/flow/flowedit/components/index.js
+++ b/src/views/pages/process/flow/flowedit/components/index.js
@@ -9,6 +9,7 @@ import autoexec from './autoexec-node';
 import timer from './timer-node';
 //cmdb
 import cmdb from '@/views/pages/cmdb/flow/node/index.js';
+import cmdbsync from './cmdbsync-node';
 
 export default {
   condition,
@@ -20,5 +21,6 @@ export default {
   event,
   autoexec,
   ...cmdb,
-  timer
+  timer,
+  cmdbsync
 };
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/cmdbsync-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/cmdbsync-setting.vue
new file mode 100644
index 000000000..7c3437073
--- /dev/null
+++ b/src/views/pages/process/flow/flowedit/components/nodesetting/cmdbsync-setting.vue
@@ -0,0 +1,99 @@
+<template>
+  <div>
+    <div class="control-box">
+      <div class="control-setting">
+        <span class="label">
+          <span>回退重新同步</span>
+          <Tooltip
+            max-width="300"
+            content="流程回退后，再次流转至当前步骤时，重新同步"
+            theme="light"
+            placement="bottom"
+            :transfer="true"
+          >
+            <span class="text-href tsfont-info-o"></span>
+          </Tooltip>
+        </span>
+        <span class="control-btn">
+          <TsFormSwitch v-model="autoexecConfig.rerunStepToCreateNewJob"></TsFormSwitch>
+        </span>
+      </div>
+    </div>
+    <div id="failPolicy" class="permission-list">
+      <div class="list">
+        <div class="second-title text-grey require-label">{{ $t('page.failurestrategy') }}</div>
+        <div class="input-border">
+          <TsFormSelect
+            ref="failPolicy"
+            v-model="failPolicy"
+            :dataList="failPolicyList"
+            :validateList="validateList"
+            border="border"
+          > </TsFormSelect>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormSwitch: resolve => require(['@/resources/plugins/TsForm/TsFormSwitch'], resolve),
+    TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve)
+ 
+  },
+  props: {},
+  data() {
+    return {
+      failPolicyList: [], //失败策略
+      failPolicy: '',
+      validateList: ['required']
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getFailPolicyList();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getFailPolicyList() {
+      let data = {
+        enumClass: 'FailPolicy'
+      };
+      this.$api.common.getSelectList(data).then((res) => {
+        if (res.Status == 'OK') {
+          let failPolicyList = res.Return || [];
+          let newfailPolicyList = [];
+          let isBack = false;
+          if (this.nodeAllLinksList && this.nodeAllLinksList.length > 0) {
+            this.nodeAllLinksList.forEach(item => {
+              if (item.config.type == 'backward') {
+                isBack = true;
+              }
+            });
+          }
+          if (!isBack) {
+            newfailPolicyList = failPolicyList.filter(f => f.value != 'back');
+          } else {
+            newfailPolicyList = failPolicyList;
+          }
+          this.failPolicyList = newfailPolicyList;
+        }
+      });
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
-- 
Gitee


From 81b825067a526a54bdf5bba779550a50878be2b9 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 26 Oct 2023 17:01:10 +0800
Subject: [PATCH 02/16] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=9Acmdb=E5=90=8C=E6=AD=A5=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/node/cmdbsync.vue}                   |  26 +-
 src/views/pages/cmdb/flow/node/index.js       |   5 +-
 .../flow/node/nodesetting/cmdbsync-dialog.vue | 513 +++++++++++++
 .../flow/node/nodesetting/cmdbsync-edit.vue   | 683 ++++++++++++++++++
 .../node}/nodesetting/cmdbsync-setting.vue    |  65 +-
 .../process/flow/flowedit/components/index.js |   4 +-
 6 files changed, 1274 insertions(+), 22 deletions(-)
 rename src/views/pages/{process/flow/flowedit/components/cmdbsync-node.vue => cmdb/flow/node/cmdbsync.vue} (76%)
 create mode 100644 src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
 create mode 100644 src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
 rename src/views/pages/{process/flow/flowedit/components => cmdb/flow/node}/nodesetting/cmdbsync-setting.vue (59%)

diff --git a/src/views/pages/process/flow/flowedit/components/cmdbsync-node.vue b/src/views/pages/cmdb/flow/node/cmdbsync.vue
similarity index 76%
rename from src/views/pages/process/flow/flowedit/components/cmdbsync-node.vue
rename to src/views/pages/cmdb/flow/node/cmdbsync.vue
index 5ba32e8cd..af6a30fb2 100644
--- a/src/views/pages/process/flow/flowedit/components/cmdbsync-node.vue
+++ b/src/views/pages/cmdb/flow/node/cmdbsync.vue
@@ -40,6 +40,8 @@
       :nodeConfig="nodeConfig"
       @updatebutton="updatebutton"
     ></ButtonSetting>
+    <!-- 模型设置 -->
+    <CmdbsyncSetting ref="ciEntityConfig" :defaultCiEntityConfig="ciEntityConfig"></CmdbsyncSetting>
     <!-- 异常处理人 -->
     <AssignSetting
       id="assignData"
@@ -52,16 +54,17 @@
   </div>
 </template>
 <script>
-import nodemixin from './nodemixin.js';
+import nodemixin from '@/views/pages/process/flow/flowedit/components/nodemixin.js';
 export default {
   name: '',
   components: {
-    FormsceneSetting: resolve => require(['./nodesetting/formscene-setting'], resolve), // 表单场景
-    AuthoritySetting: resolve => require(['./nodesetting/authority-setting.vue'], resolve),
-    NoticeSetting: resolve => require(['./nodesetting/notice-setting.vue'], resolve),
-    ActionSetting: resolve => require(['./nodesetting/action-setting.vue'], resolve),
-    ButtonSetting: resolve => require(['./nodesetting/button-setting.vue'], resolve),
-    AssignSetting: resolve => require(['./nodesetting/assign-setting.vue'], resolve)
+    FormsceneSetting: resolve => require(['@/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting'], resolve), // 表单场景
+    AuthoritySetting: resolve => require(['@/views/pages/process/flow/flowedit/components/nodesetting/authority-setting.vue'], resolve),
+    NoticeSetting: resolve => require(['@/views/pages/process/flow/flowedit/components/nodesetting/notice-setting.vue'], resolve),
+    ActionSetting: resolve => require(['@/views/pages/process/flow/flowedit/components/nodesetting/action-setting.vue'], resolve),
+    ButtonSetting: resolve => require(['@/views/pages/process/flow/flowedit/components/nodesetting/button-setting.vue'], resolve),
+    AssignSetting: resolve => require(['@/views/pages/process/flow/flowedit/components/nodesetting/assign-setting.vue'], resolve),
+    CmdbsyncSetting: resolve => require(['./nodesetting/cmdbsync-setting.vue'], resolve)
   },
   mixins: [nodemixin],
   props: {},
@@ -82,7 +85,8 @@ export default {
       replaceableTextList: [], //文案映射
       notifyPolicyConfig: {}, //通知
       actionConfig: {}, //动作数据
-      workerPolicyConfig: {}
+      workerPolicyConfig: {},
+      ciEntityConfig: {}
     };
   },
   beforeCreate() {},
@@ -90,7 +94,7 @@ export default {
   },
   beforeMount() {},
   mounted() {
-    this.keyList = ['actionConfig', 'authorityList', 'customStatusList', 'customButtonList', 'replaceableTextList', 'notifyPolicyConfig', 'workerPolicyConfig'];//stepConfig 需要包含的数据
+    this.keyList = ['actionConfig', 'authorityList', 'customStatusList', 'customButtonList', 'replaceableTextList', 'notifyPolicyConfig', 'workerPolicyConfig', 'ciEntityConfig'];//stepConfig 需要包含的数据
     this.getNodeSetting();
   },
   beforeUpdate() {},
@@ -140,6 +144,10 @@ export default {
         stepConfig.workerPolicyConfig = this.$refs.assignData.saveAssignData();
       }
       stepConfig['formSceneUuid'] = this.configData.stepConfig.formSceneUuid || '';
+      if (this.$refs.ciEntityConfig) { //组合工具cmdb
+        let ciEntityConfig = this.$refs.ciEntityConfig.save();
+        this.$set(stepConfig, 'ciEntityConfig', ciEntityConfig);
+      }
       return this.clearNodeData(stepConfig);
     },
     updateaction(type, data, index) {
diff --git a/src/views/pages/cmdb/flow/node/index.js b/src/views/pages/cmdb/flow/node/index.js
index f5eafcb8c..9902aa71c 100644
--- a/src/views/pages/cmdb/flow/node/index.js
+++ b/src/views/pages/cmdb/flow/node/index.js
@@ -1,5 +1,6 @@
 import cientitysync from './cientitysync.vue';
-
+import cmdbsync from './cmdbsync.vue';
 export default {
-  cientitysync 
+  cientitysync,
+  cmdbsync
 };
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
new file mode 100644
index 000000000..b85751361
--- /dev/null
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
@@ -0,0 +1,513 @@
+<template>
+  <div>
+    <TsDialog
+      title="录入配置"
+      type="slider"
+      width="large"
+      :isShow="true"
+      className="cmdbsync-dialog"
+      @on-close="closeDialog"
+    >
+      <template v-slot>
+        <div class="cmdbsync-main bg-op radius-sm mb-sm">
+          <div class="title">
+            <div>起始模型</div>
+            <div class="action-btn">
+              <span class="text-tip-active" :class="isShow ? 'tsfont-down' : 'tsfont-up'" @click="isShow=!isShow"></span>
+            </div>
+          </div>
+          <div v-show="isShow" class="cmdbsync-content border-color padding">
+            <Loading :loadingShow="loadingShow" type="fix"></Loading>
+            <div class="pl-lg">
+              <TsFormItem label="配置模型" labelPosition="left">
+                <TsFormSelect
+                  v-model="ciData.ciId"
+                  v-bind="ciConfig"
+                  @on-change="changeCiId"
+                ></TsFormSelect>
+              </TsFormItem>
+              <div v-if="ciData.ciId">
+                <TsFormItem label="配置项数量" labelPosition="left">
+                  <TsFormRadio
+                    v-model="ciData.createPolicy"
+                    :dataList="createPolicyDataList"
+                  ></TsFormRadio>
+                </TsFormItem>
+                <TsFormItem label="属性映射" labelPosition="top">
+                  <div class="pt-sm">
+                    <CmdbsyncEdit
+                      v-if="!loadingShow"
+                      ref="cmdbsyncEdit"
+                      :allFormitemList="allFormitemList"
+                      :ciEntityQueue="ciEntityQueue"
+                      @new="addNewCiEntity"
+                      @edit="editNewCiEntity"
+                    ></CmdbsyncEdit>
+                  </div>
+                </TsFormItem>
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
+      <template v-slot:footer>
+        <Button @click="cancelNewCiEntity()">{{ $t('page.cancel') }}</Button>
+        <Button
+          v-if="ciEntityQueue.length > 1"
+          ghost
+          type="primary"
+          @click="saveNewCiEntity()"
+        >{{ $t('page.confirm') }}</Button>
+        <Button
+          v-else
+          type="primary"
+          @click="okDialog()"
+        >{{ $t('page.save') }}</Button>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+import {store} from '@/views/pages/process/flow/flowedit/floweditState.js';
+export default {
+  name: '',
+  components: {
+    TsFormItem: resolve => require(['@/resources/plugins/TsForm/TsFormItem'], resolve),
+    TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
+    TsFormRadio: resolve => require(['@/resources/plugins/TsForm/TsFormRadio'], resolve),
+    CmdbsyncEdit: resolve => require(['./cmdbsync-edit.vue'], resolve)
+  },
+  props: {
+    configList: Array
+  },
+  data() {
+    return {
+      loadingShow: false,
+      ciData: { 
+        ciId: null,
+        ciName: '',
+        createPolicy: 'single', 
+        attrEntityData: {}, 
+        relEntityData: {}, 
+        globalAttrEntityData: {} 
+      },
+      isShow: true,
+      ciConfig: {
+        url: 'api/rest/cmdb/ci/list',
+        search: true,
+        params: {
+          isAbstract: 0,
+          isVirtual: 0
+        },
+        transfer: true
+      },
+      createPolicyDataList: [
+        {
+          value: 'single',
+          text: '添加一条数据'
+        },
+        {
+          value: 'batch',
+          text: '添加多条数据'
+        }
+      ],
+      ciEntityQueue: [], //记录配置项添加队列
+      tmpCiEntityData: {}, //临时数据，用于取消修改时还原
+      saveCiEntityMap: {} //最后需要保存的配置项列表
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.init();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    init() {
+      if (!this.$utils.isEmpty(this.configList)) {
+        this.ciData = this.configList[0];
+        this.getCiEntityById();
+      }
+    },
+    okDialog() {
+      let data = this.save();
+      this.$emit('close', data);
+    },
+    closeDialog() {
+      this.$emit('close');
+    },
+    changeCiId(val, item) {
+      this.saveCiEntityMap = {};
+      if (val) {
+        this.ciData.ciId = val;
+        this.ciData.ciName = item.text;
+        this.getCiEntityById();
+      }
+    },
+    getCiEntityById() {
+      this.loadingShow = true;
+      this.$api.cmdb.ci.getCiById(this.ciData.ciId, true).then(async res => {
+        if (res.Return) {
+          const ci = res.Return;
+          if (ci.isVirtual == 0 && ci.isAbstract == 0) {
+            const cientity = {
+              uuid: this.$utils.setUuid(),
+              ciId: this.ciData.ciId,
+              ciName: ci.name,
+              ciLabel: ci.label,
+              ciIcon: ci.icon,
+              createPolicy: 'single',
+              attrEntityData: {},
+              relEntityData: {},
+              globalAttrEntityData: {},
+              mappingList: []
+            };
+            cientity['_elementList'] = await this.getElementByCiId(this.ciData.ciId);
+            cientity['_uniqueAttrList'] = await this.getCiUniqueByCiId(this.ciData.ciId);
+            cientity['_description'] = { type: 'description', label: this.$t('term.cmdb.changememo'), elementList: [
+              {
+                type: 'des',
+                element: {
+                  label: this.$t('term.cmdb.changememo'),
+                  type: 'textarea',
+                  maxlength: 500
+                }
+              }
+            ], isShow: true };
+            this.ciEntityQueue = [cientity];
+          } else {
+            if (ci.isVirtual == 1) {
+              this.error = this.$t('message.cmdb.virtualmodel');
+            } else if (ci.isAbstract == 1) {
+              this.error = this.$t('message.cmdb.abstractmodel');
+            }
+          }
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    async getCiUniqueByCiId(ciId) {
+      let uniqueList = [];
+      await this.$api.cmdb.ci.getCiUniqueByCiId(ciId).then(res => {
+        uniqueList = res.Return;
+      });
+      return uniqueList;
+    },
+    async getElementByCiId(ciId) {
+      const attrList = await this.getAttrByCiId(ciId);
+      const relList = await this.getRelByCiId(ciId);
+      const globalAttrList = await this.getGlobalAttr();
+      const ciViewList = await this.getCiViewByCiId(ciId);
+      const elementList = [];
+      ciViewList.forEach((e, index) => {
+        if (e.type === 'attr') {
+          const attr = attrList.find(a => a.id == e.itemId);
+          if (attr) {
+            elementList.push({ type: 'attr', element: attr });
+          }
+        } else if (e.type === 'relfrom') {
+          const rel = relList.find(a => a.direction == 'from' && a.id == e.itemId);
+          if (rel) {
+            elementList.push({ type: 'rel', element: rel });
+          }
+        } else if (e.type === 'relto') {
+          const rel = relList.find(a => a.direction == 'to' && a.id == e.itemId);
+          if (rel) {
+            elementList.push({ type: 'rel', element: rel });
+          }
+        } else if (e.type === 'global') {
+          const globalattr = globalAttrList.find(a => a.id == e.itemId);
+          if (globalattr) {
+            elementList.push({ type: 'global', element: globalattr });
+          }
+        }
+      });
+      return elementList;
+    },
+    async getGlobalAttr() {
+      let globalAttrList;
+      await this.$api.cmdb.globalattr.searchGlobalAttr({isActive: 1}).then(res => {
+        globalAttrList = res.Return.tbodyList;
+      });
+      return globalAttrList;
+    },
+    async getAttrByCiId(ciId) {
+      if (ciId) {
+        let attrList;
+        let allowEdit = 1;
+        await this.$api.cmdb.ci.getAttrByCiId(ciId, { allowEdit: allowEdit }).then(res => {
+          attrList = res.Return;
+        });
+        return attrList;
+      }
+    },
+    async getRelByCiId(ciId) {
+      if (ciId) {
+        let relList;
+        await this.$api.cmdb.ci.getRelByCiId(ciId, true, null, 1).then(res => {
+          relList = res.Return;
+        });
+        return relList;
+      }
+    },
+    async getCiViewByCiId(ciId) {
+      if (ciId) {
+        let ciViewList;
+        await this.$api.cmdb.ci.getCiViewByCiId(ciId).then(res => {
+          ciViewList = res.Return;
+        });
+        return ciViewList;
+      }
+    },
+    addNewCiEntity(type, item) {
+      this.loadingShow = true;
+      if (type === 'rel') {
+        const rel = item;
+        const ciId = rel._ciId;
+        const relId = rel.id;
+        const direction = rel.direction == 'from' ? 'to' : 'from'; //目标关系需要取反
+        this.$api.cmdb.ci.getCiById(ciId).then(async res => {
+          if (res.Return) {
+            const ci = res.Return;
+            //获取当前配置项数据
+            const currentCiEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
+            const newCiEntity = {
+              uuid: this.$utils.setUuid(),
+              _relId: relId, //记录来自哪个关系，自动填上配置项
+              _direction: rel.direction, //记录关系方向
+              ciId: ciId,
+              rootCiId: this.propRootCiId,
+              ciName: ci.name,
+              ciLabel: ci.label,
+              ciIcon: ci.icon,
+              attrEntityData: {},
+              relEntityData: {},
+              globalAttrEntityData: {},
+              _disableRel: 'rel' + direction + '_' + relId //标记哪个关系不允许添加或选择
+            };
+            newCiEntity['_elementList'] = await this.getElementByCiId(ciId);
+            newCiEntity['_uniqueAttrList'] = await this.getCiUniqueByCiId(ciId);
+            newCiEntity['relEntityData']['rel' + direction + '_' + relId] = {
+              valueList: [
+                {
+                  ciEntityUuid: currentCiEntity.uuid,
+                  ciEntityName: this.$t('term.cmdb.fromcientity'),
+                  ciId: ciId,
+                  type: 'from'
+                }
+              ]
+            };
+            newCiEntity['_description'] = { type: 'description', label: this.$t('term.cmdb.changememo'), elementList: [
+              {
+                type: 'des',
+                element: {
+                  label: this.$t('term.cmdb.changememo'),
+                  type: 'textarea',
+                  maxlength: 500
+                }
+              }
+            ], isShow: true };
+            this.ciEntityQueue.push(newCiEntity);
+          }
+        }).finally(() => {
+          this.loadingShow = false;
+        });
+      } else if (type === 'attr') {
+        const attr = item;
+        const ciId = attr.targetCiId;
+        const attrId = attr.id;
+        const attrType = attr.type;
+        const attrConfig = attr.config;
+        if (ciId) {
+          this.$api.cmdb.ci.getCiById(ciId).then(async res => {
+            if (res.Return) {
+              const ci = res.Return;
+              //获取当前配置项数据
+              const newCiEntity = {
+                uuid: this.$utils.setUuid(),
+                _attrId: attrId, //记录来自哪个属性，自动填上配置项
+                _attrType: attrType,
+                _attrConfig: attrConfig,
+                rootCiId: this.propRootCiId,
+                name: this.$t('term.cmdb.newcientity'),
+                ciId: ciId,
+                ciName: ci.name,
+                ciLabel: ci.label,
+                ciIcon: ci.icon,
+                attrEntityData: {},
+                relEntityData: {},
+                globalAttrEntityData: {}
+              };
+              newCiEntity['_elementList'] = await this.getElementByCiId(ciId);
+              newCiEntity['_uniqueAttrList'] = await this.getCiUniqueByCiId(ciId);
+              newCiEntity['_description'] = { type: 'description', label: this.$t('term.cmdb.changememo'), elementList: [
+                {
+                  type: 'des',
+                  element: {
+                    label: this.$t('term.cmdb.changememo'),
+                    type: 'textarea',
+                    maxlength: 500
+                  }
+                }
+              ], isShow: true };
+              this.ciEntityQueue.push(newCiEntity);
+            }
+          }).finally(() => {
+            this.loadingShow = false;
+          });
+        }
+      }
+    },
+    back() {
+      const cientity = this.ciEntityQueue.pop();
+      if (cientity._isnew) {
+        this.$set(this.saveCiEntityMap, cientity.uuid, this.tmpCiEntityData);
+      }
+      this.tmpCiEntityData = null;
+    },
+    cancelNewCiEntity() {
+      if (this.ciEntityQueue && this.ciEntityQueue.length > 1) {
+        this.back();
+      } else {
+        this.closeDialog();
+      }
+    },
+    editNewCiEntity(uuid) {
+      if (this.saveCiEntityMap[uuid]) {
+        this.tmpCiEntityData = JSON.parse(JSON.stringify(this.saveCiEntityMap[uuid]));
+        let index = -1;
+        for (let i = 0; i < this.ciEntityQueue.length; i++) {
+          if (this.ciEntityQueue[i].uuid == uuid) {
+            index = i;
+            break;
+          }
+        }
+        if (index > -1) {
+          this.ciEntityQueue = this.ciEntityQueue.slice(0, index + 1);
+        } else {
+          this.ciEntityQueue.push(this.saveCiEntityMap[uuid]);
+        }
+      }
+    },
+    saveNewCiEntity() {
+      let isValid = true;
+      if (this.$refs.cmdbsyncEdit) {
+        isValid = this.$refs.cmdbsyncEdit.valid();
+      }
+      if (!isValid) {
+        return; 
+      }
+      //队列只剩一个配置项时才写入数据库
+      if (this.ciEntityQueue.length > 1) {
+        const cientity = this.ciEntityQueue.pop();
+        //获取当前配置项数据，将临时关系加入当前配置项，如果是属性，则加入属性信息
+        const currentCiEntity = this.currentCiEntity;
+        if (!this.saveCiEntityMap[cientity.uuid]) {
+          if (cientity['_relId']) {
+            const newRelEntity = {
+              _relId: cientity['_relId'],
+              ciEntityUuid: cientity.uuid,
+              ciEntityName: this.$t('term.cmdb.newcientity'),
+              ciId: cientity.ciId,
+              type: 'new'
+            };
+            if (!currentCiEntity['relEntityData']) {
+              currentCiEntity['relEntityData'] = {};
+            }
+            if (!currentCiEntity['relEntityData']['rel' + cientity._direction + '_' + cientity._relId]) {
+              currentCiEntity['relEntityData']['rel' + cientity._direction + '_' + cientity._relId] = { valueList: [] };
+            }
+            currentCiEntity['relEntityData']['rel' + cientity._direction + '_' + cientity._relId]['valueList'].push(newRelEntity);
+          } else if (cientity['_attrId']) {
+            if (!currentCiEntity['attrEntityData']['attr_' + cientity._attrId]) {
+              const tmp = {};
+              tmp['attr_' + cientity._attrId] = {};
+              Object.assign(currentCiEntity['attrEntityData'], tmp);
+              Object.assign(currentCiEntity['attrEntityData']['attr_' + cientity._attrId], { type: cientity['_attrType'], config: cientity['_attrConfig'], valueList: [], actualValueList: [] });
+            }
+            //加上type=new，后台需要这个属性将uuid转换成id
+            // currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'].push(cientity);
+            const pos = currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'].length;
+            this.$set(currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'], pos, cientity);
+          }
+        } else {
+          //更新临时数据时，需要更新attr的数据，因为显示字段可能有变化，而关系用不到可能发生变化的字段，所以暂时不用更新，将来可能要补充
+          if (cientity['_attrId']) {
+            if (!currentCiEntity['attrEntityData']['attr_' + cientity._attrId]) {
+              const k = {};
+              k['attr_' + cientity._attrId] = { type: cientity['_attrType'], config: cientity['_attrConfig'], valueList: [] };
+              this.$set(currentCiEntity, 'attrEntityData', k);
+            }
+            for (let index = 0; index < currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'].length; index++) {
+              const d = currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'][index];
+              if (d.uuid && d.uuid === cientity.uuid) {
+                this.$set(currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'], index, cientity);
+              }
+            }
+          }
+        }
+        //标记为已保存的新配置项，用于点击“取消”后判断是否需要删除数据
+        cientity._isnew = true;
+        this.saveCiEntityMap[cientity.uuid] = cientity;
+      } else if (this.ciEntityQueue.length == 1) {
+        const cientity = this.ciEntityQueue[0];
+        this.saveCiEntityMap[cientity.uuid] = cientity;
+        const ciEntityList = [];
+        for (let uuid in this.saveCiEntityMap) {
+          ciEntityList.push(this.saveCiEntityMap[uuid]);
+        }
+        return ciEntityList;
+      }
+      console.log(this.saveCiEntityMap);
+    },
+    save() {
+      let data = {};
+      let configList = this.saveNewCiEntity();
+      console.log(configList, 'configList');
+      this.$set(data, 'configList', configList);
+      return data;
+    }
+  },
+  filter: {},
+  computed: {
+    currentCiEntity() {
+      return this.ciEntityQueue[this.ciEntityQueue.length - 1];
+    },
+    allFormitemList() { //表单组件
+      return store.allFormitemList;
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.cmdbsync-dialog {
+  .cmdbsync-main {
+    &:hover {
+      .action-btn {
+        opacity: 1;
+      }
+    }
+    .action-btn {
+      opacity: 0;
+    }
+    .title {
+      position: relative;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 8px 16px;
+    }
+    .cmdbsync-content {
+      border-top: 1px solid;
+    }
+  }
+}
+</style>
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
new file mode 100644
index 000000000..00a8412c6
--- /dev/null
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
@@ -0,0 +1,683 @@
+<template>
+  <div>
+    <Loading
+      v-if="isLoading"
+      :text="$t('page.validating')"
+      :loadingShow="isLoading"
+      type="fix"
+    ></Loading>
+    <div v-if="ciEntityQueue && ciEntityQueue.length > 1">
+      <Breadcrumb separator="<span class='tsfont-arrow-right'></span>">
+        <BreadcrumbItem v-for="(entity, index) in ciEntityQueue" :key="index">
+          <span v-if="index == ciEntityQueue.length - 2" style="font-size: 15px">
+            <a href="javascript:void(0)" class="text-info" @click="back()">
+              <span :class="entity.ciIcon"></span>
+              <span>{{ entity.ciLabel }}({{ entity.ciName }})</span>
+            </a>
+          </span>
+          <span v-else-if="index == ciEntityQueue.length - 1" style="font-size: 15px">
+            <span :class="entity.ciIcon"></span>
+            <span>{{ entity.ciLabel }}({{ entity.ciName }})</span>
+          </span>
+          <span v-else class="text-grey" style="font-size: 15px">
+            <span :class="entity.ciIcon"></span>
+            <span>{{ entity.ciLabel }}({{ entity.ciName }})</span>
+          </span>
+        </BreadcrumbItem>
+      </Breadcrumb>
+    </div>
+    <div>
+      <div class="tsForm tsForm-border-border ivu-form-label-right">
+        <Collapse v-model="openPanel" simple>
+          <Panel v-for="elementType in elementTypeList" :key="elementType.type" :name="elementType.type">
+            {{ elementType.label }}
+            <div
+              v-if="elementType.elementList.length > 0"
+              slot="content"
+              class="pt-nm"
+            >
+              <TsRow
+                v-for="(e, index) in elementType.elementList"
+                :key="index"
+                :gutter="8"
+                class="pb-sm"
+              >
+                <Col span="4">
+                  <template v-if="e.type == 'rel'">
+                    <div class="text-title overflow" :class="{'require-label':!!((e.element.direction == 'from' && e.element.toIsRequired) || (e.element.direction == 'to' && e.element.fromIsRequired))}">
+                      {{ e.element.direction === 'from' ? e.element.toLabel : e.element.fromLabel }}
+                    </div>
+                  </template>
+                  <template v-else>
+                    <div class="text-title overflow" :class="{'require-label': e.type === 'attr' && !!e.element.isRequired}">
+                      {{ e.element.label }}
+                    </div>
+                  </template>
+                </Col>
+                <Col span="20">
+                  <div v-if="e.type == 'rel'">  
+                    <div v-if="isRelShow(e.element, ciEntityData) && !(ciEntityData.relEntityData && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList'] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList'].length > 0 && ((e.element.direction == 'to' && e.element.fromRule == 'O') || (e.element.direction == 'from' && e.element.toRule == 'O')))">
+                      <a
+                        v-if="allowBatchAdd && ((e.element.direction == 'from' && e.element.toAllowInsert) || (e.element.direction == 'to' && e.element.fromAllowInsert))"
+                        href="javascript:void(0)"
+                        :disabled="disabledFn('rel' + e.element.direction + '_' + e.element.id)"
+                        @click.stop="addNewRelEntity(e.element)"
+                      >
+                        <i class="tsfont-plus"></i>
+                        {{ $t('page.choose') }}
+                      </a>
+                      <Poptip
+                        v-model="isRelPopShow[e.element.id + '_' + e.element.direction]"
+                        placement="right"
+                        trigger="hover"
+                        :transfer="true"
+                      >
+                        <a></a>
+                        <div slot="content">
+                          <div v-if="relCiList" :style="'overflow:auto;max-height:300px;width:' + Math.min(550, relCiList.length * 90) + 'px'">
+                            <div
+                              v-for="relci in relCiList"
+                              :key="relci.id"
+                              style="text-align: center; margin-right: 10px; float: left; cursor: pointer; width: 80px"
+                              @click="newCiEntity(e.element, relci.id)"
+                            >
+                              <div>
+                                <a href="javascript:void(0)"><i style="font-size: 20px" :class="relci.icon"></i></a>
+                              </div>
+                              <div class="overflow" :title="relci.label">
+                                <a href="javascript:void(0)">{{ relci.label }}</a>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </Poptip>
+                    </div>
+                    <div v-if="ciEntityData.relEntityData && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList']">
+                      <Tag
+                        v-for="(relentity, reindex) in ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList']"
+                        :key="reindex"
+                        :color="getTagType(relentity)"
+                        type="dot"
+                        size="large"
+                        :closable="!disabledFn('rel' + e.element.direction + '_' + e.element.id) && (relentity.ciEntityId || relentity.type == 'new') ? true : false"
+                        :style="getTagType(relentity) == 'success' ? 'cursor:pointer' : ''"
+                        @click.native="
+                          e => {
+                            e.stopPropagation();
+                            editNewRelEntity(relentity);
+                          }
+                        "
+                        @on-close="delRelEntity('rel' + e.element.direction + '_' + e.element.id, relentity, ciEntityData || '')"
+                      >
+                        <span>{{ relentity.ciEntityName }}</span>
+                      </Tag>
+                    </div>
+                  </div>
+                  <TsRow v-else :gutter="8">
+                    <Col span="10">
+                      <TsFormSelect
+                        ref="formValid"
+                        v-model="e.mappingMode"
+                        :dataList="mappingModeList"
+                        :firstSelect="false"
+                        transfer
+                        border="border"
+                        @change="(val)=>setConfig(val,'mappingMode',e)"
+                      ></TsFormSelect>
+                    </Col>
+                    <Col span="14">
+                      <template v-if="e.mappingMode == 'constant'">
+                        <div v-if="e.type === 'attr'">
+                          <AttrInputer
+                            ref="attrHandler"
+                            :allowBatchAdd="allowBatchAdd"
+                            :attrEntity="ciEntityData.attrEntityData['attr_' + e.element.id]"
+                            :disabled="disabledFn('attr_' + e.element.id)"
+                            :attrData="e.element"
+                            :valueList="getValueList(ciEntityData.attrEntityData, e.element)"
+                            @setData="setAttrData(e.element, arguments[0], arguments[1])"
+                          ></AttrInputer>
+                        </div>
+                        <div v-else-if="e.type === 'global'">
+                          <TsFormRadio
+                            v-if="!e.element.isMultiple"
+                            :allowToggle="true"
+                            :dataList="e.element.itemList"
+                            valueName="id"
+                            textName="value"
+                            :value="getGlobalValueList(ciEntityData.globalAttrEntityData, e.element).length > 0 ? getGlobalValueList(ciEntityData.globalAttrEntityData, e.element)[0] : null"
+                            @change="
+                              (val, opt) => {
+                                if (opt) {
+                                  setGlobalAttrData(e.element, [opt]);
+                                } else {
+                                  setGlobalAttrData(e.element, []);
+                                }
+                              }
+                            "
+                          ></TsFormRadio>
+                          <TsFormCheckbox
+                            v-if="!!e.element.isMultiple"
+                            :dataList="e.element.itemList"
+                            valueName="id"
+                            textName="value"
+                            :value="getGlobalValueList(ciEntityData.globalAttrEntityData, e.element)"
+                            @change="(val, opt) => setGlobalAttrData(e.element, opt)"
+                          ></TsFormCheckbox>
+                        </div>
+                        <div v-else>
+                          <TsFormInput
+                            type="textarea"
+                            maxlength="500"
+                          ></TsFormInput>
+                        </div>
+                      </template>
+                      <template v-if="e.mappingMode === 'formCommonComponent'">
+                        <TsFormSelect
+                          ref="formValid"
+                          v-model="e.valueList"
+                          :dataList="getFormComponent('formCommonComponent')"
+                          textName="label"
+                          valueName="uuid"
+                          :validateList="[]"
+                          :firstSelect="false"
+                          transfer
+                          border="border"
+                          @change="(val)=>setConfig(val,'valueList',e)"
+                        ></TsFormSelect>
+                      </template>
+                      <template v-else-if="e.mappingMode === 'formTableComponent'">
+                        <TsRow :gutter="8">
+                          <Col span="12">
+                            <TsFormSelect
+                              ref="formValid"
+                              v-model="e.valueList"
+                              :dataList="getFormComponent('formTableComponent')"
+                              textName="label"
+                              valueName="uuid"
+                              :validateList="e.isRequired? validateList:[]"
+                              :firstSelect="false"
+                              transfer
+                              border="border"
+                              @change="(val)=>setConfig(val,'valueList',e)"
+                            ></TsFormSelect>
+                          </Col>
+                          <Col span="12">
+                            <div class="formTableComponent pr-lg">
+                              <TsFormSelect
+                                ref="formValid"
+                                v-model="e.column"
+                                :dataList="getAttrList(e.valueList)"
+                                :validateList="e.isRequired && e.valueList?validateList:[]"
+                                :firstSelect="false"
+                                transfer
+                                border="border"
+                                @change="(val)=>setConfig(val,'column',e)"
+                              ></TsFormSelect>
+                              <Tooltip
+                                max-width="660"
+                                theme="light"
+                                placement="bottom-end"
+                                transfer
+                                class="formTableComponent-tip"
+                              >
+                                <span class="text-href tsfont-info-o"></span>
+                                <div slot="content">
+                                  <div class="pb-sm">{{ $t('message.process.jobpolicycolumn') }}</div>
+                                  <div class="tip-eg">
+                                    <div class="text-center">
+                                      <table border="1" style="border-collapse: collapse; width:50px;">
+                                        <tr>
+                                          <td>A</td>
+                                        </tr>
+                                        <tr>
+                                          <td>B</td>
+                                        </tr>
+                                        <tr>
+                                          <td>C</td>
+                                        </tr>
+                                      </table>
+                                    </div>
+                                    <div class="center-text"></div>
+                                    <div style="width:100px">
+                                      [A,B,C]
+                                    </div>
+                                  </div>
+                                </div>
+                              </Tooltip>
+                            </div>
+                          </Col>
+                        </TsRow>
+                      </template>
+                    </Col>
+                  </TsRow>
+                  <div v-if="e.mappingMode === 'formTableComponent'">
+                    <div class="filter-top pb-sm">
+                      <span class="pr-sm label">{{ $t('term.dashboard.datafilter') }}</span>
+                      <TsFormSwitch
+                        v-model="e.isActive"
+                      ></TsFormSwitch>
+                    </div>
+                  </div>
+                </Col>
+              </TsRow>
+            </div>
+          </Panel>
+        </Collapse>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormInput: resolve => require(['@/resources/plugins/TsForm/TsFormInput'], resolve),
+    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),
+    TsFormSwitch: resolve => require(['@/resources/plugins/TsForm/TsFormSwitch'], resolve)
+  },
+  props: {
+    allFormitemList: Array,
+    allowBatchAdd: { type: Boolean, default: true }, //是否允许批量创建新配置项
+    ciEntityQueue: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    } //配置项添加队列
+  },
+  data() {
+    return {
+      openPanel: ['global', 'unique', 'manual', 'description'],
+      relCiList: [], //关系的所有下游模型列表
+      isRelPopShow: {},
+      activePanel: ['attr', 'rel'],
+      isRelMultiple: true,
+      targetCiId: null,
+      currentRel: null,
+      currentRelEntityValue: null,
+      isLoading: false,
+      mappingModeList: [
+        {
+          text: this.$t('page.constant'),
+          value: 'constant'
+        },
+        {
+          text: this.$t('term.process.formcommonitem'),
+          value: 'formCommonComponent'
+        },
+        {
+          text: this.$t('term.process.formtableitem'),
+          value: 'formTableComponent'
+        }
+      ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getGlobalValueList(data, attr) {
+      const id = attr.id;
+      if (!data['global_' + id]) {
+        this.$set(data, 'global_' + id, { valueList: [] });
+      } else if (!data['global_' + id]['valueList']) {
+        this.$set(data['global_' + id], 'valueList', []);
+      }
+      return data['global_' + id]['valueList'].map(d => d.id);
+    },
+    getValueList(data, attr) {
+      const id = attr.id;
+      if (!data['attr_' + id]) {
+        this.$set(data, 'attr_' + id, { type: attr.type, config: attr.config, valueList: [] });
+      } else if (!data['attr_' + id]['valueList']) {
+        this.$set(data['attr_' + id], 'valueList', []);
+      }
+      return data['attr_' + id]['valueList'];
+    },
+    disabledFn(elementId) {
+      if (this.ciEntityData.editableAttrRelIdList && this.ciEntityData.editableAttrRelIdList.length > 0 && !this.ciEntityData.editableAttrRelIdList.includes(elementId)) {
+        return true;
+      }
+      return false;
+    },
+    isRelShow(rel) {
+      if (this.ciEntityData['_disableRel'] && this.ciEntityData['_disableRel'] == 'rel' + rel.direction + '_' + rel.id) {
+        return false;
+      } else {
+        const rule = rel.direction == 'from' ? rel.toRule : rel.fromRule;
+        if (rule == 'O' && this.ciEntityData.relEntityData && this.ciEntityData.relEntityData['rel' + rel.direction + '_' + rel.id] && this.ciEntityData.relEntityData['rel' + rel.direction + '_' + rel.id]['valueList'].length > 0) {
+          return false;
+        }
+      }
+      return true;
+    },
+    getTagType(relentity) {
+      if (relentity.ciEntityId) {
+        return 'primary';
+      } else if (relentity.ciEntityUuid) {
+        if (this.fromCiEntityData && relentity.ciEntityUuid == this.fromCiEntityData.uuid) {
+          return 'warning';
+        } else {
+          return 'success';
+        }
+      }
+    },
+    ciEntityDatafn(key, relentity, rowdata) {
+      if (this.ciEntityData.relEntityData[key] && this.ciEntityData.relEntityData[key]['valueList']) {
+        for (let i = this.ciEntityData.relEntityData[key]['valueList'].length - 1; i >= 0; i--) {
+          if (this.ciEntityData.relEntityData[key]['valueList'][i] == relentity) {
+            this.$delete(this.ciEntityData.relEntityData[key]['valueList'], i);
+            this.$forceUpdate();
+            this.$emit('remove', relentity); //删除新配置项数据，如果是引用已存在配置项，此操作什么都不做
+            break;
+          }
+        }
+      }
+    },
+    delRelEntity(key, relentity, rowdata) {
+      this.ciEntityDatafn(key, relentity, rowdata);
+    },
+    back() {
+      this.$emit('back');
+    },
+    editNewRelEntity(rel) {
+      if (this.getTagType(rel) == 'success') {
+        this.$emit('edit', rel.ciEntityUuid);
+      }
+    },
+    addNewRelEntity(rel) {
+      //disabled 当有值的时候是为可编辑，这个字段是从表单里面过来的
+      this.relCiList = [];
+      for (const k in this.isRelPopShow) {
+        this.isRelPopShow[k] = false;
+      }
+      const ciId = rel.direction == 'from' ? rel.toCiId : rel.fromCiId;
+      this.$api.cmdb.ci.getDownwardCiList(ciId).then(res => {
+        this.relCiList = res.Return;
+        if (this.relCiList.length > 1) {
+          this.isRelPopShow[rel.id + '_' + rel.direction] = true;
+        } else if (this.relCiList.length == 1) {
+          this.isRelPopShow[rel.id + '_' + rel.direction] = false;
+          this.newCiEntity(rel, this.relCiList[0].id);
+        }
+      });
+    },
+    newCiEntity(rel, ciId) {
+      rel._ciId = ciId;
+      this.isRelPopShow[rel.id + '_' + rel.direction] = false;
+      this.$emit('new', 'rel', rel);
+    },
+    addNewAttrEntity(attr) {
+      //添加新的引用属性
+      this.$emit('new', 'attr', attr);
+    },
+    editNewAttrEntity(uuid) {
+      //删除引用属性（只支持新添加的目标，已存在的目标不允许修改）
+      this.$emit('edit', uuid);
+    },
+    //删除选中的属性
+    deleteAttrEntity(key, attrentity) {
+      //删除引用属性
+      if (this.ciEntityData.attrEntityData[key]) {
+        let valueList = this.ciEntityData.attrEntityData[key]['valueList'];
+        if (valueList) {
+          let j = -1;
+          valueList.forEach((v, i) => {
+            if (typeof v == 'string' || typeof v == 'number') {
+              if (v == attrentity.uuid || v == attrentity.id) {
+                j = i;
+              }
+            } else if (typeof v == 'object') {
+              if (v.uuid == attrentity.uuid || v.id == attrentity.id) {
+                j = i;
+              }
+            }
+          });
+          if (j > -1) {
+            this.$delete(this.ciEntityData.attrEntityData[key]['valueList'], j);
+          }
+        }
+        let actualValueList = this.ciEntityData.attrEntityData[key]['actualValueList'];
+        if (actualValueList) {
+          let j = -1;
+          actualValueList.forEach((v, i) => {
+            if (typeof v == 'string' || typeof v == 'number') {
+              if (v == attrentity.uuid || v == attrentity.id) {
+                j = i;
+              }
+            } else if (typeof v == 'object') {
+              if (v.uuid == attrentity.uuid || v.id == attrentity.id) {
+                j = i;
+              }
+            }
+          });
+          if (j > -1) {
+            this.$delete(this.ciEntityData.attrEntityData[key]['actualValueList'], j);
+          }
+        }
+        this.$emit('remove', attrentity);
+      }
+    },
+    //选择引用属性
+    selectAttrEntity(key, attrentity) {
+      if (!this.ciEntityData.attrEntityData[key]) {
+        const vo = {};
+        vo[key] = { valueList: [], actualValueList: [] };
+        Object.assign(this.ciEntityData.attrEntityData, vo);
+      }
+      if (!this.ciEntityData.attrEntityData[key]['valueList']) {
+        this.$set(this.ciEntityData.attrEntityData[key], 'valueList', []);
+      }
+      if (!this.ciEntityData.attrEntityData[key]['actualValueList']) {
+        this.$set(this.ciEntityData.attrEntityData[key], 'actualValueList', []);
+      }
+      let valueList = this.ciEntityData.attrEntityData[key]['valueList'];
+      if (valueList.findIndex(v => (typeof v == 'object' && (v.uuid == attrentity.uuid || v.id == attrentity.id)) || (typeof v == 'number' && v == attrentity.id)) == -1) {
+        this.ciEntityData.attrEntityData[key]['valueList'].push(attrentity);
+        this.ciEntityData.attrEntityData[key]['actualValueList'].push(attrentity);
+      }
+    },
+    valid() {
+      const attrHandlers = this.$refs['attrHandler'];
+      let isValid = true;
+      if (attrHandlers) {
+        attrHandlers.forEach(element => {
+          if (element.valid) {
+            if (!element.valid()) {
+              isValid = false;
+            }
+          }
+        });
+      }
+      return isValid;
+    },
+    setGlobalAttrData(attr, opt) {
+      if (!this.ciEntityData.globalAttrEntityData) {
+        this.ciEntityData.globalAttrEntityData = {};
+      }
+      if (!this.ciEntityData.globalAttrEntityData['global_' + attr.id]) {
+        this.ciEntityData.globalAttrEntityData['global_' + attr.id] = {};
+      }
+      this.$set(this.ciEntityData.globalAttrEntityData['global_' + attr.id], 'valueList', opt);
+    },
+    setAttrData(attr, value, actualValue) {
+      if (!this.ciEntityData.attrEntityData) {
+        this.ciEntityData.attrEntityData = {};
+      }
+      if (!this.ciEntityData.attrEntityData['attr_' + attr.id]) {
+        this.ciEntityData.attrEntityData['attr_' + attr.id] = {};
+      }
+      this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'config', attr.config);
+      this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'type', attr.type);
+      this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'valueList', value);
+      this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'actualValueList', actualValue);
+    },
+    setConfig(value, attrName, item) {
+      if (item.type === 'attr') {
+        if (!this.ciEntityData.attrEntityData) {
+          this.ciEntityData.attrEntityData = {};
+        }
+        if (!this.ciEntityData.attrEntityData['attr_' + item.element.id]) {
+          this.ciEntityData.attrEntityData['attr_' + item.element.id] = {};
+        }
+        if (attrName === 'valueList') {
+          if (Array.isArray(value)) {
+            this.$set(this.ciEntityData.attrEntityData['attr_' + item.element.id], attrName, value);
+          } else {
+            this.$set(this.ciEntityData.attrEntityData['attr_' + item.element.id], attrName, [value]);
+          }
+        } else {
+          this.$set(this.ciEntityData.attrEntityData['attr_' + item.element.id], attrName, value);
+        }
+      }
+    }
+  },
+  filter: {},
+  computed: {
+    elementTypeList() {
+      const typeList = [];
+      if (this.ciEntityData) {
+        const uniqueList = this.ciEntityData['_uniqueAttrList'] || [];
+        const elementList = this.ciEntityData['_elementList'];
+        const globalObj = { type: 'global', label: this.$t('term.cmdb.globalattr'), elementList: [], isShow: true };
+        globalObj.elementList = elementList.filter(d => d.type === 'global');
+        if (globalObj.elementList.length > 0) {
+          typeList.push(globalObj);
+        }
+        const uniqueObj = { type: 'unique', label: this.$t('term.cmdb.uniquerule'), elementList: [], isShow: true };
+        uniqueObj.elementList = elementList.filter(d => d.type === 'attr' && uniqueList.includes(d.element.id));
+        if (uniqueObj.elementList.length > 0) {
+          typeList.push(uniqueObj);
+        }
+        const manualObj = { type: 'manual', label: this.$t('term.cmdb.manualinput'), elementList: [], isShow: false };
+        manualObj.elementList = elementList.filter(d => !uniqueList.includes(d.element.id) && d.element.inputType === 'mt');
+        if (manualObj.elementList.length > 0) {
+          typeList.push(manualObj);
+        }
+        const autoObj = { type: 'auto', label: this.$t('page.autocollect'), elementList: [], isShow: true };
+        autoObj.elementList = elementList.filter(d => !uniqueList.includes(d.element.id) && d.element.inputType === 'at');
+        if (autoObj.elementList.length > 0) {
+          //自动采集不需要校验必填，处理必填属性
+          autoObj.elementList.forEach(e => {
+            if (e.type === 'rel') {
+              e.element.direction == 'from' && this.$set(e.element, 'toIsRequired', 0);
+              e.element.direction == 'to' && this.$set(e.element, 'fromIsRequired', 0);
+            } else if (e.type === 'attr') {
+              this.$set(e.element, 'isRequired', 0);
+            }
+          });
+          typeList.push(autoObj);
+        }
+        const desConfig = this.ciEntityData['_description'];
+        typeList.push(desConfig);
+      }
+      return typeList;
+    },
+    uniqueElementList() {
+      if (this.ciEntityData && this.ciEntityData['_uniqueAttrList'] && this.ciEntityData['_uniqueAttrList'].length > 0 && this.ciEntityData['_elementList'] && this.ciEntityData['_elementList'].length > 0) {
+        return this.ciEntityData['_elementList'].filter(d => d.type === 'attr' && this.ciEntityData['_uniqueAttrList'].includes(d.element.id));
+      }
+      return [];
+    },
+    ciEntityData() {
+      return this.ciEntityQueue[this.ciEntityQueue.length - 1];
+    },
+    fromCiEntityData() {
+      //来自哪个配置项
+      if (this.ciEntityQueue.length > 1) {
+        return this.ciEntityQueue[this.ciEntityQueue.length - 2];
+      }
+      return null;
+    },
+    getFormComponent() {
+      return (type) => {
+        let dataList = [];
+        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';
+            });
+          } else if (type === 'formTableComponent') { //table组件（表格数据组件、表单选择组件）
+            dataList = this.allFormitemList.filter(item => {
+              return item.handler === 'formtableselector' || item.handler === 'formtableinputer';
+            });
+          }
+        }
+        return dataList;
+      };
+    },
+    getAttrList() {
+      return (value) => {
+        let dataList = [];
+        if (this.allFormitemList && this.allFormitemList.length > 0) {
+          let find = this.allFormitemList.find(item => item.uuid === value);
+          if (find && find.config && find.config.dataConfig) {
+            find.config.dataConfig.forEach(d => {
+              dataList.push({
+                text: d.label,
+                value: d.uuid
+              });
+            });
+          }
+        }
+        return dataList;
+      };
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.ivu-form-item {
+  margin-bottom: 24px !important;
+}
+/deep/.tstabs {
+  .tstable-main {
+    max-height: initial !important;
+  }
+}
+/deep/.ivu-collapse {
+  border-top: 0px;
+  border-bottom: 0px;
+}
+/deep/.ivu-collapse-header {
+  border-bottom: 0px;
+}
+.formTableComponent {
+  position: relative;
+  .formTableComponent-tip {
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+}
+.tip-eg {
+  display: flex;
+  align-items: center;
+  .center-text {
+    position: relative;
+    border-bottom: 1px solid;
+    margin: 0 16px;
+    min-width: 50px;
+    &:after {
+      font-family: 'tsfont';
+      content: '\e899';
+      position: absolute;
+      bottom: -15px;
+      font-size: 18px;
+      right: -11px;
+    }
+  }
+}
+</style>
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/cmdbsync-setting.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
similarity index 59%
rename from src/views/pages/process/flow/flowedit/components/nodesetting/cmdbsync-setting.vue
rename to src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
index 7c3437073..9e1f63316 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/cmdbsync-setting.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
@@ -15,7 +15,7 @@
           </Tooltip>
         </span>
         <span class="control-btn">
-          <TsFormSwitch v-model="autoexecConfig.rerunStepToCreateNewJob"></TsFormSwitch>
+          <TsFormSwitch v-model="ciEntityConfig.rerunStepToSync"></TsFormSwitch>
         </span>
       </div>
     </div>
@@ -25,7 +25,7 @@
         <div class="input-border">
           <TsFormSelect
             ref="failPolicy"
-            v-model="failPolicy"
+            v-model="ciEntityConfig.failPolicy"
             :dataList="failPolicyList"
             :validateList="validateList"
             border="border"
@@ -33,6 +33,16 @@
         </div>
       </div>
     </div>
+    <div class="mode-mapping">
+      <div class="top">
+        <div class="second-title text-grey require-label">模型映射</div>
+        <div class="text-href" @click="edit()">
+          编辑
+        </div>
+      </div>
+      <div v-if="ciEntityConfig.configList.length" class="pt-sm">{{ ciEntityConfig.configList[0].ciName }}</div>
+    </div>
+    <CmdbsyncDialog v-if="isShowDialog" :configList="ciEntityConfig.configList" @close="close"></CmdbsyncDialog>
   </div>
 </template>
 <script>
@@ -40,15 +50,23 @@ export default {
   name: '',
   components: {
     TsFormSwitch: resolve => require(['@/resources/plugins/TsForm/TsFormSwitch'], resolve),
-    TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve)
+    TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
+    CmdbsyncDialog: resolve => require(['./cmdbsync-dialog.vue'], resolve)
  
   },
-  props: {},
+  props: {
+    defaultCiEntityConfig: Object
+  },
   data() {
     return {
       failPolicyList: [], //失败策略
-      failPolicy: '',
-      validateList: ['required']
+      validateList: ['required'],
+      isShowDialog: false,
+      ciEntityConfig: {
+        failPolicy: '',
+        rerunStepToSync: 0,
+        configList: []
+      }
     };
   },
   beforeCreate() {},
@@ -56,7 +74,9 @@ export default {
     this.getFailPolicyList();
   },
   beforeMount() {},
-  mounted() {},
+  mounted() {
+    this.initData();
+  },
   beforeUpdate() {},
   updated() {},
   activated() {},
@@ -64,6 +84,14 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    initData() {
+      let config = this.$utils.deepClone(this.defaultCiEntityConfig);
+      if (!this.$utils.isEmpty(config)) {
+        Object.keys(config).forEach(key => {
+          this.ciEntityConfig[key] = config[key];
+        });
+      }
+    },
     getFailPolicyList() {
       let data = {
         enumClass: 'FailPolicy'
@@ -88,6 +116,20 @@ export default {
           this.failPolicyList = newfailPolicyList;
         }
       });
+    },
+    edit() {
+      this.isShowDialog = true;
+    },
+    close(data) {
+      if (data) {
+        Object.keys(data).forEach(key => {
+          this.$set(this.ciEntityConfig, key, data[key]);
+        });
+      }
+      this.isShowDialog = false;
+    },
+    save() {
+      return this.ciEntityConfig;
     }
   },
   filter: {},
@@ -95,5 +137,12 @@ export default {
   watch: {}
 };
 </script>
-<style lang="less">
+<style lang="less" scpoed>
+.mode-mapping {
+  padding: 10px 16px;
+  .top {
+    display: flex;
+    justify-content: space-between;
+  }
+}
 </style>
diff --git a/src/views/pages/process/flow/flowedit/components/index.js b/src/views/pages/process/flow/flowedit/components/index.js
index 19273316f..08884cb10 100644
--- a/src/views/pages/process/flow/flowedit/components/index.js
+++ b/src/views/pages/process/flow/flowedit/components/index.js
@@ -9,7 +9,6 @@ import autoexec from './autoexec-node';
 import timer from './timer-node';
 //cmdb
 import cmdb from '@/views/pages/cmdb/flow/node/index.js';
-import cmdbsync from './cmdbsync-node';
 
 export default {
   condition,
@@ -21,6 +20,5 @@ export default {
   event,
   autoexec,
   ...cmdb,
-  timer,
-  cmdbsync
+  timer
 };
-- 
Gitee


From 5933ce82d21ba304d5e0e65e11a8eebda988602b Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 27 Oct 2023 17:38:58 +0800
Subject: [PATCH 03/16] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20cmbd=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/term/en.json   |  3 +-
 src/resources/assets/languages/term/zh.json   |  3 +-
 .../cmdb/ci/attrhandler/input/table-attr.vue  |  1 +
 src/views/pages/cmdb/flow/node/cmdbsync.vue   |  6 +--
 .../flow/node/nodesetting/cmdbsync-dialog.vue |  2 -
 .../flow/node/nodesetting/cmdbsync-edit.vue   | 38 ++++++++++++++---
 .../node/nodesetting/cmdbsync-setting.vue     | 41 +++++++++++++++----
 src/views/pages/process/flow/flow-valid.js    | 20 +++++++++
 8 files changed, 92 insertions(+), 22 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 74c1834db..011f8df87 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -163,7 +163,8 @@
     "gotoresourcetypetreesetting": "Please set the root directory in Configuration Management - Asset List",
     "resourcebatchsearchtooltip": "Batch search is a keyword fuzzy search, in which the wildcard * is supported for batch search of IP, matching any character, such as 192.168.1.1, 192.168.12.1, and 192.168.123.1",
     "onlybackbone": "Show only backbone relationships",
-    "showallrel": "Show all branch relationships"
+    "showallrel": "Show all branch relationships",
+    "modemapping": "Model Mapping"
   },
   "process": {
     "workordercenter": "Work Center",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 9572d9380..55de14872 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -163,7 +163,8 @@
     "gotoresourcetypetreesetting": "请到配置管理-资产清单中设置根目录",
     "resourcebatchsearchtooltip": "批量搜索是关键字模糊搜索，其中批量搜索ip时，支持通配符*，匹配任意个字符，例如192.168.*.1可匹配192.168.1.1、192.168.12.1、192.168.123.1",
     "onlybackbone": "只显示主干关系",
-    "showallrel": "显示所有分支关系"
+    "showallrel": "显示所有分支关系",
+    "modemapping": "模型映射"
   },
   "process": {
     "workordercenter": "工单中心",
diff --git a/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue b/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue
index be6320fe1..b8bf3532f 100644
--- a/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue
+++ b/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue
@@ -172,6 +172,7 @@ export default {
   watch: {
     valueList: {
       handler: function(val) {
+        console.log(val, 'val');
         if (val && val.length > 0) {
           //添加配置项
           const newCiEntityIdList = [];
diff --git a/src/views/pages/cmdb/flow/node/cmdbsync.vue b/src/views/pages/cmdb/flow/node/cmdbsync.vue
index af6a30fb2..d140a7119 100644
--- a/src/views/pages/cmdb/flow/node/cmdbsync.vue
+++ b/src/views/pages/cmdb/flow/node/cmdbsync.vue
@@ -41,7 +41,7 @@
       @updatebutton="updatebutton"
     ></ButtonSetting>
     <!-- 模型设置 -->
-    <CmdbsyncSetting ref="ciEntityConfig" :defaultCiEntityConfig="ciEntityConfig"></CmdbsyncSetting>
+    <CmdbsyncSetting id="ciEntityConfig" ref="ciEntityConfig" :defaultCiEntityConfig="ciEntityConfig"></CmdbsyncSetting>
     <!-- 异常处理人 -->
     <AssignSetting
       id="assignData"
@@ -121,9 +121,9 @@ export default {
       let querySelect = href.substring(1);
       this.$nextTick(() => {
         if (querySelect != 'assignData') {
-          this.$refs[`${querySelect}`].valid();
+          this.$refs[`${querySelect}`] && this.$refs[`${querySelect}`].valid();
         } else {
-          this.$refs.assignData.assignValid();
+          this.$refs.assignData && this.$refs.assignData.assignValid();
         }
       });
     },
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
index b85751361..dcfe353e3 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
@@ -145,8 +145,6 @@ export default {
     changeCiId(val, item) {
       this.saveCiEntityMap = {};
       if (val) {
-        this.ciData.ciId = val;
-        this.ciData.ciName = item.text;
         this.getCiEntityById();
       }
     },
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
index 00a8412c6..82918139e 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
@@ -136,6 +136,8 @@
                             :attrData="e.element"
                             :valueList="getValueList(ciEntityData.attrEntityData, e.element)"
                             @setData="setAttrData(e.element, arguments[0], arguments[1])"
+                            @delete="deleteAttrEntity('attr_' + e.element.id, $event)"
+                            @select="selectAttrEntity('attr_' + e.element.id, $event)"
                           ></AttrInputer>
                         </div>
                         <div v-else-if="e.type === 'global'">
@@ -343,7 +345,8 @@ export default {
       } else if (!data['attr_' + id]['valueList']) {
         this.$set(data['attr_' + id], 'valueList', []);
       }
-      return data['attr_' + id]['valueList'];
+      console.log(this.ciEntityData.attrEntityData, ' this.ciEntityData.attrEntityData1000');
+      return this.$utils.deepClone(data['attr_' + id]['valueList']);
     },
     disabledFn(elementId) {
       if (this.ciEntityData.editableAttrRelIdList && this.ciEntityData.editableAttrRelIdList.length > 0 && !this.ciEntityData.editableAttrRelIdList.includes(elementId)) {
@@ -482,11 +485,13 @@ export default {
       if (!this.ciEntityData.attrEntityData[key]['actualValueList']) {
         this.$set(this.ciEntityData.attrEntityData[key], 'actualValueList', []);
       }
-      let valueList = this.ciEntityData.attrEntityData[key]['valueList'];
-      if (valueList.findIndex(v => (typeof v == 'object' && (v.uuid == attrentity.uuid || v.id == attrentity.id)) || (typeof v == 'number' && v == attrentity.id)) == -1) {
-        this.ciEntityData.attrEntityData[key]['valueList'].push(attrentity);
-        this.ciEntityData.attrEntityData[key]['actualValueList'].push(attrentity);
-      }
+      this.$nextTick(() => {
+        let valueList = this.ciEntityData.attrEntityData[key]['valueList'];
+        if (valueList.findIndex(v => (typeof v == 'object' && (v.uuid == attrentity.uuid || v.id == attrentity.id)) || (typeof v == 'number' && v == attrentity.id)) == -1) {
+          this.ciEntityData.attrEntityData[key]['valueList'].push(attrentity);
+          this.ciEntityData.attrEntityData[key]['actualValueList'].push(attrentity);
+        }
+      });
     },
     valid() {
       const attrHandlers = this.$refs['attrHandler'];
@@ -550,6 +555,12 @@ export default {
       if (this.ciEntityData) {
         const uniqueList = this.ciEntityData['_uniqueAttrList'] || [];
         const elementList = this.ciEntityData['_elementList'];
+        //流程节点中，模型映射，下框和table不能新增
+        elementList.forEach(e => {
+          if (e.element.type === 'select' || e.element.type === 'table') {
+            e.element.config && this.$delete(e.element.config, 'mode');
+          }
+        });
         const globalObj = { type: 'global', label: this.$t('term.cmdb.globalattr'), elementList: [], isShow: true };
         globalObj.elementList = elementList.filter(d => d.type === 'global');
         if (globalObj.elementList.length > 0) {
@@ -600,6 +611,21 @@ export default {
       }
       return null;
     },
+    // getValueList() {
+    //   return (data, attr) => {
+    //     if (attr) {
+    //       const id = attr.id;
+    //       if (!data['attr_' + id]) {
+    //         this.$set(data, 'attr_' + id, { type: attr.type, config: attr.config, valueList: [] });
+    //       } else if (!data['attr_' + id]['valueList']) {
+    //         this.$set(data['attr_' + id], 'valueList', []);
+    //       }
+    //       return data['attr_' + id]['valueList'];
+    //     } else {
+    //       return null;
+    //     }
+    //   };
+    // },
     getFormComponent() {
       return (type) => {
         let dataList = [];
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 9e1f63316..1a8d9874c 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
@@ -35,12 +35,17 @@
     </div>
     <div class="mode-mapping">
       <div class="top">
-        <div class="second-title text-grey require-label">模型映射</div>
+        <div class="second-title text-grey require-label">{{ $t('term.cmdb.modemapping') }}</div>
         <div class="text-href" @click="edit()">
-          编辑
+          {{ $t('page.edit') }}
         </div>
       </div>
-      <div v-if="ciEntityConfig.configList.length" class="pt-sm">{{ ciEntityConfig.configList[0].ciName }}</div>
+      <div v-if="ciEntityConfig.configList.length" class="pt-sm overflow">{{ ciEntityConfig.configList[0].ciLabel }}
+        <span v-if="ciEntityConfig.configList[0].ciName" class="text-tip">({{ ciEntityConfig.configList[0].ciName }})</span>
+      </div>
+      <div v-if="!isValid && $utils.isEmpty(ciEntityConfig.configList)" class="form-error-tip pl-nm">
+        {{ $t('form.validate.required', { target: $t('term.cmdb.modemapping') }) }}
+      </div>
     </div>
     <CmdbsyncDialog v-if="isShowDialog" :configList="ciEntityConfig.configList" @close="close"></CmdbsyncDialog>
   </div>
@@ -52,7 +57,6 @@ export default {
     TsFormSwitch: resolve => require(['@/resources/plugins/TsForm/TsFormSwitch'], resolve),
     TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
     CmdbsyncDialog: resolve => require(['./cmdbsync-dialog.vue'], resolve)
- 
   },
   props: {
     defaultCiEntityConfig: Object
@@ -66,7 +70,8 @@ export default {
         failPolicy: '',
         rerunStepToSync: 0,
         configList: []
-      }
+      },
+      isValid: true //校验
     };
   },
   beforeCreate() {},
@@ -74,9 +79,7 @@ export default {
     this.getFailPolicyList();
   },
   beforeMount() {},
-  mounted() {
-    this.initData();
-  },
+  mounted() {},
   beforeUpdate() {},
   updated() {},
   activated() {},
@@ -128,13 +131,33 @@ export default {
       }
       this.isShowDialog = false;
     },
+    valid() {
+      this.isValid = true;
+      if (!this.$refs.failPolicy.valid()) {
+        this.isValid = false;
+      }
+      if (this.$utils.isEmpty(this.ciEntityConfig.configList)) {
+        this.isValid = false;
+      }
+      return this.isValid;
+    },
     save() {
       return this.ciEntityConfig;
     }
   },
   filter: {},
   computed: {},
-  watch: {}
+  watch: {
+    defaultCiEntityConfig: {
+      handler(val) {
+        if (!this.$utils.isEmpty(val)) {
+          this.initData();
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  }
 };
 </script>
 <style lang="less" scpoed>
diff --git a/src/views/pages/process/flow/flow-valid.js b/src/views/pages/process/flow/flow-valid.js
index 574f3af65..60bef1870 100644
--- a/src/views/pages/process/flow/flow-valid.js
+++ b/src/views/pages/process/flow/flow-valid.js
@@ -246,6 +246,26 @@ let valid = {
     }
     return validList;
   },
+  cmdbsync(nodeConfig, d, that) { //cmdb
+    let validList = [];
+    let nodeData = nodeConfig.stepConfig || {};
+    let ciEntityConfig = nodeData.ciEntityConfig || {};
+    if (nodeConfig.handler === 'cmdbsync') {
+      if (!ciEntityConfig.failPolicy) {
+        validList.push({
+          name: $t('form.validate.required', { target: $t('page.failurestrategy') }),
+          href: '#ciEntityConfig'
+        });
+      }
+      if (that.$utils.isEmpty(ciEntityConfig.configList)) {
+        validList.push({
+          name: $t('form.validate.required', { target: $t('term.cmdb.modemapping') }),
+          href: '#ciEntityConfig'
+        });
+      }
+    }
+    return validList;
+  },
   autoexec(nodeConfig, d, that) { //自动化节点
     let validList = [];
     let nodeData = nodeConfig.stepConfig || {};
-- 
Gitee


From 2a97cd5d3d883f8e940b4c1497bd201bfce73044 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 1 Nov 2023 14:52:39 +0800
Subject: [PATCH 04/16] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[978033245126656]?=
 =?UTF-8?q?ITSM=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0CMDB=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=8D=95=E4=B8=8E=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=8A=E6=A8=A1=E5=9E=8B=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=85=B3=E7=B3=BB=EF=BC=9B=E6=9C=80=E7=BB=88?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8CMDB=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=86=99=E5=85=A5C=20http://192.168.0.96:809?=
 =?UTF-8?q?0/demo/rdm.html#/story-detail/939050947543040/939050947543042/9?=
 =?UTF-8?q?78033245126656?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdb/ci/attrhandler/input/table-attr.vue  |   1 -
 .../nodesetting/cmdbpolicy/filter-list.vue    | 157 ++++++++
 .../flow/node/nodesetting/cmdbsync-dialog.vue | 356 ++++++++++++++----
 .../flow/node/nodesetting/cmdbsync-edit.vue   | 223 +++++------
 .../node/nodesetting/cmdbsync-setting.vue     |   9 +-
 5 files changed, 543 insertions(+), 203 deletions(-)
 create mode 100644 src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/filter-list.vue

diff --git a/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue b/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue
index b8bf3532f..be6320fe1 100644
--- a/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue
+++ b/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue
@@ -172,7 +172,6 @@ export default {
   watch: {
     valueList: {
       handler: function(val) {
-        console.log(val, 'val');
         if (val && val.length > 0) {
           //添加配置项
           const newCiEntityIdList = [];
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
new file mode 100644
index 000000000..391e9b018
--- /dev/null
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/filter-list.vue
@@ -0,0 +1,157 @@
+<template>
+  <div>
+    <div class="filter-top pt-sm">
+      <span class="pr-sm label">{{ $t('term.dashboard.datafilter') }}</span>
+      <TsFormSwitch
+        v-model="isActive"
+        @on-change="changeActive"
+      ></TsFormSwitch>
+    </div>
+    <div v-if="isActive" class="pb-sm">
+      <TsRow v-for="(f,findex) in filterList" :key="findex" :gutter="8">
+        <Col span="10">
+          <TsFormSelect
+            ref="formValid"
+            v-model="f.column"
+            :dataList="dataList"
+            :validateList="validateList"
+            :firstSelect="false"
+            transfer
+            @change="setConfig()"
+          ></TsFormSelect>
+        </Col>
+        <Col span="7">
+          <TsFormSelect
+            ref="formValid"
+            v-model="f.expression"
+            :dataList="expressionList"
+            :validateList="validateList"
+            :firstSelect="false"
+            transfer
+            @change="setConfig()"
+          ></TsFormSelect>
+        </Col>
+        <Col span="7">
+          <TsFormInput
+            ref="formValid"
+            v-model="f.value"
+            :validateList="validateList"
+            @change="setConfig()"
+          ></TsFormInput>
+        </Col>
+      </TsRow>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormSwitch: resolve => require(['@/resources/plugins/TsForm/TsFormSwitch'], resolve),
+    TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
+    TsFormInput: resolve => require(['@/resources/plugins/TsForm/TsFormInput'], resolve)
+  },
+  props: {
+    dataList: { //属性列表
+      type: Array,
+      default: () => []
+    },
+    defaultFilterList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      isActive: 0,
+      filterList: [],
+      validateList: ['required'],
+      expressionList: [
+        {
+          value: 'like',
+          text: this.$t('term.expression.like')
+        },
+        {
+          value: 'notlike',
+          text: this.$t('term.expression.notlike')
+        },
+        {
+          value: 'equal',
+          text: this.$t('term.expression.eq')
+        },
+        {
+          value: 'unequal',
+          text: this.$t('term.expression.ne')
+        }
+      ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    changeActive(val) {
+      if (val) {
+        this.filterList = [
+          {
+            'column': '',
+            'expression': 'like',
+            'value': ''
+          }
+        ];
+      } else {
+        this.filterList = [];
+      }
+      this.$emit('setConfig', this.filterList);
+    },
+    setConfig() {
+      this.$emit('setConfig', this.filterList);
+    },
+    valid() {
+      const attrHandlers = this.$refs['formValid'];
+      let isValid = true;
+      if (attrHandlers) {
+        attrHandlers.forEach(element => {
+          if (element.valid) {
+            if (!element.valid()) {
+              isValid = false;
+            }
+          }
+        });
+      }
+      return isValid;
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {
+    defaultFilterList: {
+      handler(val) {
+        if (val && !this.$utils.isSame(val, this.filterList)) {
+          this.filterList = this.$utils.deepClone(val);
+          if (this.filterList.length > 0) {
+            this.isActive = 1;
+          }
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.filter-top {
+  display: flex;
+  .label {
+    flex: none;
+  }
+}
+</style>
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
index dcfe353e3..dec5c95b9 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
@@ -11,7 +11,26 @@
       <template v-slot>
         <div class="cmdbsync-main bg-op radius-sm mb-sm">
           <div class="title">
-            <div>起始模型</div>
+            <div>
+              <Breadcrumb v-if="ciEntityQueue && ciEntityQueue.length > 0" separator="<span class='tsfont-arrow-right'></span>">
+                <BreadcrumbItem v-for="(entity, index) in ciEntityQueue" :key="index">
+                  <span v-if="index == ciEntityQueue.length - 2" style="font-size: 15px">
+                    <a href="javascript:void(0)" class="text-info" @click="back()">
+                      <span :class="entity.ciIcon"></span>
+                      <span>{{ entity.ciLabel }}({{ entity.ciName }})</span>
+                    </a>
+                  </span>
+                  <span v-else-if="index == ciEntityQueue.length - 1" style="font-size: 15px">
+                    <span :class="entity.ciIcon"></span>
+                    <span>{{ entity.ciLabel }}({{ entity.ciName }})</span>
+                  </span>
+                  <span v-else class="text-grey" style="font-size: 15px">
+                    <span :class="entity.ciIcon"></span>
+                    <span>{{ entity.ciLabel }}({{ entity.ciName }})</span>
+                  </span>
+                </BreadcrumbItem>
+              </Breadcrumb>
+            </div>
             <div class="action-btn">
               <span class="text-tip-active" :class="isShow ? 'tsfont-down' : 'tsfont-up'" @click="isShow=!isShow"></span>
             </div>
@@ -19,8 +38,14 @@
           <div v-show="isShow" class="cmdbsync-content border-color padding">
             <Loading :loadingShow="loadingShow" type="fix"></Loading>
             <div class="pl-lg">
-              <TsFormItem label="配置模型" labelPosition="left">
+              <TsFormItem
+                v-if="ciEntityQueue.length < 2"
+                label="配置模型"
+                labelPosition="left"
+                required
+              >
                 <TsFormSelect
+                  ref="ciConfig"
                   v-model="ciData.ciId"
                   v-bind="ciConfig"
                   @on-change="changeCiId"
@@ -31,6 +56,49 @@
                   <TsFormRadio
                     v-model="ciData.createPolicy"
                     :dataList="createPolicyDataList"
+                    @on-change="(val)=>{
+                      changePolicy(val)
+                    }"
+                  ></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',ciData.batchDataSource)
+                      }"
+                    ></TsFormSelect>
+                  </TsFormItem>
+                  <TsFormItem v-if="ciData.createPolicy==='batch'" :label="$t('term.dashboard.datafilter')" labelPosition="left">
+                    <FilterList
+                      ref="attrHandler"
+                      :defaultFilterList="ciData.batchDataSource && ciData.batchDataSource.filterList"
+                      :dataList="getAttrList(ciData.batchDataSource)"
+                      @setConfig="(val)=> setBatchDataSource(val,'filterList',ciData.batchDataSource)"
+                    ></FilterList>
+                  </TsFormItem>
+                </template>
+                <TsFormItem
+                  v-if="ciEntityQueue.length > 1"
+                  label="关系策略"
+                  labelPosition="left"
+                  required
+                >
+                  <TsFormRadio
+                    :dataList="actionDataList"
+                    :value="ciData.action"
+                    @on-change="(val)=>{
+                      setConfig(val,'action')
+                    }"
                   ></TsFormRadio>
                 </TsFormItem>
                 <TsFormItem label="属性映射" labelPosition="top">
@@ -40,8 +108,10 @@
                       ref="cmdbsyncEdit"
                       :allFormitemList="allFormitemList"
                       :ciEntityQueue="ciEntityQueue"
+                      :ciData="ciData"
                       @new="addNewCiEntity"
                       @edit="editNewCiEntity"
+                      @remove="removeNewCiEntity"
                     ></CmdbsyncEdit>
                   </div>
                 </TsFormItem>
@@ -75,7 +145,8 @@ export default {
     TsFormItem: resolve => require(['@/resources/plugins/TsForm/TsFormItem'], resolve),
     TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
     TsFormRadio: resolve => require(['@/resources/plugins/TsForm/TsFormRadio'], resolve),
-    CmdbsyncEdit: resolve => require(['./cmdbsync-edit.vue'], resolve)
+    CmdbsyncEdit: resolve => require(['./cmdbsync-edit.vue'], resolve),
+    FilterList: resolve => require(['./cmdbpolicy/filter-list.vue'], resolve)
   },
   props: {
     configList: Array
@@ -83,10 +154,12 @@ export default {
   data() {
     return {
       loadingShow: false,
-      ciData: { 
+      ciData: { //当前配置
         ciId: null,
         ciName: '',
         createPolicy: 'single', 
+        batchDataSource: {},
+        mappingList: [],
         attrEntityData: {}, 
         relEntityData: {}, 
         globalAttrEntityData: {} 
@@ -99,6 +172,7 @@ export default {
           isAbstract: 0,
           isVirtual: 0
         },
+        validateList: ['required'],
         transfer: true
       },
       createPolicyDataList: [
@@ -111,6 +185,17 @@ export default {
           text: '添加多条数据'
         }
       ],
+      actionDataList: [
+        {
+          value: 'append',
+          text: this.$t('page.append')
+        },
+        {
+          value: 'replace',
+          text: this.$t('page.replace')
+        }
+      ],
+      validateList: ['required'],
       ciEntityQueue: [], //记录配置项添加队列
       tmpCiEntityData: {}, //临时数据，用于取消修改时还原
       saveCiEntityMap: {} //最后需要保存的配置项列表
@@ -130,12 +215,44 @@ export default {
   destroyed() {},
   methods: {
     init() {
+      this.saveCiEntityMap = {};
       if (!this.$utils.isEmpty(this.configList)) {
-        this.ciData = this.configList[0];
+        let findItem = this.configList.find(c => c.isStart);
+        if (findItem) {
+          this.ciData = this.$utils.deepClone(findItem);
+        }
+        this.configList.forEach(item => {
+          this.$set(this.saveCiEntityMap, item.uuid, item);
+        });
         this.getCiEntityById();
       }
     },
+    initValue(cientity) {
+      let findItem = this.saveCiEntityMap[cientity.uuid];
+      if (findItem) {
+        Object.keys(findItem).forEach(key => {
+          if (key === 'mappingList') {
+            if (!this.$utils.isEmpty(findItem.mappingList)) {
+              findItem.mappingList.forEach(m => {
+                if (m.key.indexOf('rel') > -1) {
+                  this.$set(cientity.relEntityData, m.key, m);
+                } else {
+                  this.$set(cientity.allCiEntityValue, m.key, m);
+                }
+              });
+            }
+          } else {
+            if (cientity.hasOwnProperty(key)) {
+              this.$set(cientity, key, findItem[key]);
+            }
+          }
+        });
+      }
+    },
     okDialog() {
+      if (!this.$refs.ciConfig.valid()) {
+        return;
+      }
       let data = this.save();
       this.$emit('close', data);
     },
@@ -144,6 +261,8 @@ export default {
     },
     changeCiId(val, item) {
       this.saveCiEntityMap = {};
+      this.ciEntityQueue = [];
+      this.$set(this.ciData, 'uuid', null);
       if (val) {
         this.getCiEntityById();
       }
@@ -155,16 +274,18 @@ export default {
           const ci = res.Return;
           if (ci.isVirtual == 0 && ci.isAbstract == 0) {
             const cientity = {
-              uuid: this.$utils.setUuid(),
+              isStart: 1,
+              uuid: this.ciData.uuid || this.$utils.setUuid(),
               ciId: this.ciData.ciId,
               ciName: ci.name,
               ciLabel: ci.label,
               ciIcon: ci.icon,
               createPolicy: 'single',
+              batchDataSource: {},
               attrEntityData: {},
               relEntityData: {},
               globalAttrEntityData: {},
-              mappingList: []
+              allCiEntityValue: {}
             };
             cientity['_elementList'] = await this.getElementByCiId(this.ciData.ciId);
             cientity['_uniqueAttrList'] = await this.getCiUniqueByCiId(this.ciData.ciId);
@@ -178,6 +299,7 @@ export default {
                 }
               }
             ], isShow: true };
+            this.initValue(cientity);
             this.ciEntityQueue = [cientity];
           } else {
             if (ci.isVirtual == 1) {
@@ -264,12 +386,12 @@ export default {
         return ciViewList;
       }
     },
-    addNewCiEntity(type, item) {
+    addNewCiEntity(type, item, uuid) {
       this.loadingShow = true;
       if (type === 'rel') {
         const rel = item;
-        const ciId = rel._ciId;
-        const relId = rel.id;
+        const ciId = rel.ciId;
+        const relId = rel._relId;
         const direction = rel.direction == 'from' ? 'to' : 'from'; //目标关系需要取反
         this.$api.cmdb.ci.getCiById(ciId).then(async res => {
           if (res.Return) {
@@ -277,7 +399,7 @@ export default {
             //获取当前配置项数据
             const currentCiEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
             const newCiEntity = {
-              uuid: this.$utils.setUuid(),
+              uuid: uuid || this.$utils.setUuid(),
               _relId: relId, //记录来自哪个关系，自动填上配置项
               _direction: rel.direction, //记录关系方向
               ciId: ciId,
@@ -285,23 +407,17 @@ export default {
               ciName: ci.name,
               ciLabel: ci.label,
               ciIcon: ci.icon,
+              createPolicy: 'single',
+              batchDataSource: {},
+              action: 'append',
               attrEntityData: {},
               relEntityData: {},
               globalAttrEntityData: {},
-              _disableRel: 'rel' + direction + '_' + relId //标记哪个关系不允许添加或选择
+              _disableRel: 'rel' + direction + '_' + relId, //标记哪个关系不允许添加或选择
+              allCiEntityValue: {} //所有的属性
             };
             newCiEntity['_elementList'] = await this.getElementByCiId(ciId);
             newCiEntity['_uniqueAttrList'] = await this.getCiUniqueByCiId(ciId);
-            newCiEntity['relEntityData']['rel' + direction + '_' + relId] = {
-              valueList: [
-                {
-                  ciEntityUuid: currentCiEntity.uuid,
-                  ciEntityName: this.$t('term.cmdb.fromcientity'),
-                  ciId: ciId,
-                  type: 'from'
-                }
-              ]
-            };
             newCiEntity['_description'] = { type: 'description', label: this.$t('term.cmdb.changememo'), elementList: [
               {
                 type: 'des',
@@ -312,54 +428,30 @@ export default {
                 }
               }
             ], isShow: true };
+            newCiEntity['relEntityData']['rel' + direction + '_' + relId] = {
+              valueList: [
+                {
+                  ciEntityUuid: currentCiEntity.uuid,
+                  ciEntityName: this.$t('term.cmdb.fromcientity'),
+                  ciId: ciId,
+                  type: 'from'
+                }
+              ]
+            };
+            this.initValue(newCiEntity);
+            this.ciData = newCiEntity;
             this.ciEntityQueue.push(newCiEntity);
           }
         }).finally(() => {
           this.loadingShow = false;
         });
-      } else if (type === 'attr') {
-        const attr = item;
-        const ciId = attr.targetCiId;
-        const attrId = attr.id;
-        const attrType = attr.type;
-        const attrConfig = attr.config;
-        if (ciId) {
-          this.$api.cmdb.ci.getCiById(ciId).then(async res => {
-            if (res.Return) {
-              const ci = res.Return;
-              //获取当前配置项数据
-              const newCiEntity = {
-                uuid: this.$utils.setUuid(),
-                _attrId: attrId, //记录来自哪个属性，自动填上配置项
-                _attrType: attrType,
-                _attrConfig: attrConfig,
-                rootCiId: this.propRootCiId,
-                name: this.$t('term.cmdb.newcientity'),
-                ciId: ciId,
-                ciName: ci.name,
-                ciLabel: ci.label,
-                ciIcon: ci.icon,
-                attrEntityData: {},
-                relEntityData: {},
-                globalAttrEntityData: {}
-              };
-              newCiEntity['_elementList'] = await this.getElementByCiId(ciId);
-              newCiEntity['_uniqueAttrList'] = await this.getCiUniqueByCiId(ciId);
-              newCiEntity['_description'] = { type: 'description', label: this.$t('term.cmdb.changememo'), elementList: [
-                {
-                  type: 'des',
-                  element: {
-                    label: this.$t('term.cmdb.changememo'),
-                    type: 'textarea',
-                    maxlength: 500
-                  }
-                }
-              ], isShow: true };
-              this.ciEntityQueue.push(newCiEntity);
-            }
-          }).finally(() => {
-            this.loadingShow = false;
-          });
+      } 
+    },
+    removeNewCiEntity(item) {
+      if (item._relId) { //关系删除
+        const relentity = item;
+        if (relentity.ciEntityUuid) {
+          this.$delete(this.saveCiEntityMap, relentity.ciEntityUuid);
         }
       }
     },
@@ -368,6 +460,7 @@ export default {
       if (cientity._isnew) {
         this.$set(this.saveCiEntityMap, cientity.uuid, this.tmpCiEntityData);
       }
+      this.ciData = this.ciEntityQueue[this.ciEntityQueue.length - 1];
       this.tmpCiEntityData = null;
     },
     cancelNewCiEntity() {
@@ -377,7 +470,7 @@ export default {
         this.closeDialog();
       }
     },
-    editNewCiEntity(uuid) {
+    editNewCiEntity(uuid, rel) {
       if (this.saveCiEntityMap[uuid]) {
         this.tmpCiEntityData = JSON.parse(JSON.stringify(this.saveCiEntityMap[uuid]));
         let index = -1;
@@ -390,7 +483,8 @@ export default {
         if (index > -1) {
           this.ciEntityQueue = this.ciEntityQueue.slice(0, index + 1);
         } else {
-          this.ciEntityQueue.push(this.saveCiEntityMap[uuid]);
+          this.addNewCiEntity('rel', rel, uuid);
+          // this.ciEntityQueue.push(this.saveCiEntityMap[uuid]);
         }
       }
     },
@@ -400,7 +494,7 @@ export default {
         isValid = this.$refs.cmdbsyncEdit.valid();
       }
       if (!isValid) {
-        return; 
+        return false; 
       }
       //队列只剩一个配置项时才写入数据库
       if (this.ciEntityQueue.length > 1) {
@@ -430,8 +524,6 @@ export default {
               Object.assign(currentCiEntity['attrEntityData'], tmp);
               Object.assign(currentCiEntity['attrEntityData']['attr_' + cientity._attrId], { type: cientity['_attrType'], config: cientity['_attrConfig'], valueList: [], actualValueList: [] });
             }
-            //加上type=new，后台需要这个属性将uuid转换成id
-            // currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'].push(cientity);
             const pos = currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'].length;
             this.$set(currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'], pos, cientity);
           }
@@ -454,6 +546,7 @@ export default {
         //标记为已保存的新配置项，用于点击“取消”后判断是否需要删除数据
         cientity._isnew = true;
         this.saveCiEntityMap[cientity.uuid] = cientity;
+        this.ciData = this.ciEntityQueue[this.ciEntityQueue.length - 1];
       } else if (this.ciEntityQueue.length == 1) {
         const cientity = this.ciEntityQueue[0];
         this.saveCiEntityMap[cientity.uuid] = cientity;
@@ -463,12 +556,129 @@ export default {
         }
         return ciEntityList;
       }
-      console.log(this.saveCiEntityMap);
+    },
+    setConfig(val, attr) {
+      this.$set(this.ciEntityQueue[this.ciEntityQueue.length - 1], attr, val);
+    },
+    setBatchDataSource(val, attr, config) {
+      let batchDataSource = config || {};
+      let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
+      this.$set(batchDataSource, attr, val);
+      if (ciEntity) {
+        this.$set(ciEntity, 'batchDataSource', batchDataSource);
+        this.$set(this.ciData, 'batchDataSource', batchDataSource);
+        Object.keys(ciEntity.allCiEntityValue).forEach(key => {
+          if (ciEntity.allCiEntityValue[key].mappingMode === 'formTableComponent') {
+            this.$set(ciEntity.allCiEntityValue[key], 'ValueList', val);
+            this.$set(ciEntity.allCiEntityValue[key], 'column', '');
+            this.$set(ciEntity.allCiEntityValue[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) {
+        Object.keys(ciEntity.allCiEntityValue).forEach(key => {
+          if (ciEntity.allCiEntityValue[key].mappingMode === 'formTableComponent') {
+            this.$set(ciEntity.allCiEntityValue[key], 'valueList', null);
+            this.$set(ciEntity.allCiEntityValue[key], 'column', '');
+            this.$set(ciEntity.allCiEntityValue[key], 'filterList', []);
+          }
+        });
+        this.$set(this.ciData, 'batchDataSource', {});
+        this.$set(ciEntity, 'batchDataSource', {});
+        this.setConfig(val, 'createPolicy');
+      }
     },
     save() {
       let data = {};
-      let configList = this.saveNewCiEntity();
-      console.log(configList, 'configList');
+      let configList = [];
+      let list = this.saveNewCiEntity();
+      if (!list) {
+        return;
+      }
+      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('allCiEntityValue')) {
+          if (!this.$utils.isEmpty(item.allCiEntityValue)) {
+            Object.keys(item.allCiEntityValue).forEach(key => {
+              if (!this.$utils.isEmpty(item.allCiEntityValue[key].valueList)) {
+                let objectData = {
+                  key: key,
+                  mappingMode: item.allCiEntityValue[key].mappingMode,
+                  valueList: item.allCiEntityValue[key].valueList 
+                };
+                if (item.allCiEntityValue[key].hasOwnProperty('column')) {
+                  objectData.column = item.allCiEntityValue[key].column;
+                }
+                if (item.allCiEntityValue[key].hasOwnProperty('filterList')) {
+                  objectData.filterList = item.allCiEntityValue[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;
     }
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
index 82918139e..af5080b67 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
@@ -6,26 +6,6 @@
       :loadingShow="isLoading"
       type="fix"
     ></Loading>
-    <div v-if="ciEntityQueue && ciEntityQueue.length > 1">
-      <Breadcrumb separator="<span class='tsfont-arrow-right'></span>">
-        <BreadcrumbItem v-for="(entity, index) in ciEntityQueue" :key="index">
-          <span v-if="index == ciEntityQueue.length - 2" style="font-size: 15px">
-            <a href="javascript:void(0)" class="text-info" @click="back()">
-              <span :class="entity.ciIcon"></span>
-              <span>{{ entity.ciLabel }}({{ entity.ciName }})</span>
-            </a>
-          </span>
-          <span v-else-if="index == ciEntityQueue.length - 1" style="font-size: 15px">
-            <span :class="entity.ciIcon"></span>
-            <span>{{ entity.ciLabel }}({{ entity.ciName }})</span>
-          </span>
-          <span v-else class="text-grey" style="font-size: 15px">
-            <span :class="entity.ciIcon"></span>
-            <span>{{ entity.ciLabel }}({{ entity.ciName }})</span>
-          </span>
-        </BreadcrumbItem>
-      </Breadcrumb>
-    </div>
     <div>
       <div class="tsForm tsForm-border-border ivu-form-label-right">
         <Collapse v-model="openPanel" simple>
@@ -58,7 +38,7 @@
                   <div v-if="e.type == 'rel'">  
                     <div v-if="isRelShow(e.element, ciEntityData) && !(ciEntityData.relEntityData && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList'] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList'].length > 0 && ((e.element.direction == 'to' && e.element.fromRule == 'O') || (e.element.direction == 'from' && e.element.toRule == 'O')))">
                       <a
-                        v-if="allowBatchAdd && ((e.element.direction == 'from' && e.element.toAllowInsert) || (e.element.direction == 'to' && e.element.fromAllowInsert))"
+                        v-if="((e.element.direction == 'from' && e.element.toAllowInsert) || (e.element.direction == 'to' && e.element.fromAllowInsert))"
                         href="javascript:void(0)"
                         :disabled="disabledFn('rel' + e.element.direction + '_' + e.element.id)"
                         @click.stop="addNewRelEntity(e.element)"
@@ -116,26 +96,27 @@
                   <TsRow v-else :gutter="8">
                     <Col span="10">
                       <TsFormSelect
-                        ref="formValid"
-                        v-model="e.mappingMode"
+                        ref="attrHandler"
+                        :value="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode')"
                         :dataList="mappingModeList"
                         :firstSelect="false"
                         transfer
                         border="border"
+                        :validateList="getValidList(e.type, e.element)"
                         @change="(val)=>setConfig(val,'mappingMode',e)"
                       ></TsFormSelect>
                     </Col>
                     <Col span="14">
-                      <template v-if="e.mappingMode == 'constant'">
+                      <template v-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') == 'constant'">
                         <div v-if="e.type === 'attr'">
                           <AttrInputer
                             ref="attrHandler"
-                            :allowBatchAdd="allowBatchAdd"
+                            :allowBatchAdd="true"
                             :attrEntity="ciEntityData.attrEntityData['attr_' + e.element.id]"
                             :disabled="disabledFn('attr_' + e.element.id)"
                             :attrData="e.element"
-                            :valueList="getValueList(ciEntityData.attrEntityData, e.element)"
-                            @setData="setAttrData(e.element, arguments[0], arguments[1])"
+                            :valueList="getValue(ciEntityData.allCiEntityValue, e, 'valueList')"
+                            @setData="setAttrData(e, e.element, arguments[0], arguments[1])"
                             @delete="deleteAttrEntity('attr_' + e.element.id, $event)"
                             @select="selectAttrEntity('attr_' + e.element.id, $event)"
                           ></AttrInputer>
@@ -143,61 +124,66 @@
                         <div v-else-if="e.type === 'global'">
                           <TsFormRadio
                             v-if="!e.element.isMultiple"
+                            :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
                             :allowToggle="true"
                             :dataList="e.element.itemList"
                             valueName="id"
                             textName="value"
-                            :value="getGlobalValueList(ciEntityData.globalAttrEntityData, e.element).length > 0 ? getGlobalValueList(ciEntityData.globalAttrEntityData, e.element)[0] : null"
+                            :validateList="getValidList(e.type, e.element)"
                             @change="
                               (val, opt) => {
                                 if (opt) {
-                                  setGlobalAttrData(e.element, [opt]);
+                                  setGlobalAttrData(e.element, [opt], val, e);
                                 } else {
-                                  setGlobalAttrData(e.element, []);
+                                  setGlobalAttrData(e.element, [], val, e);
                                 }
                               }
                             "
                           ></TsFormRadio>
                           <TsFormCheckbox
                             v-if="!!e.element.isMultiple"
+                            :value="getValue(ciEntityData.globalAttrEntityData, e, 'valueList')"
                             :dataList="e.element.itemList"
                             valueName="id"
                             textName="value"
-                            :value="getGlobalValueList(ciEntityData.globalAttrEntityData, e.element)"
-                            @change="(val, opt) => setGlobalAttrData(e.element, opt)"
+                            :validateList="getValidList(e.type, e.element)"
+                            @change="(val, opt) => setGlobalAttrData(e.element, opt, val, e)"
                           ></TsFormCheckbox>
                         </div>
                         <div v-else>
                           <TsFormInput
+                            :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
                             type="textarea"
                             maxlength="500"
+                            :validateList="getValidList(e.type, e.element)"
+                            @change="(val)=>setConfig(val,'valueList',e)"
                           ></TsFormInput>
                         </div>
                       </template>
-                      <template v-if="e.mappingMode === 'formCommonComponent'">
+                      <template v-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formCommonComponent'">
                         <TsFormSelect
-                          ref="formValid"
-                          v-model="e.valueList"
+                          ref="attrHandler"
+                          :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
                           :dataList="getFormComponent('formCommonComponent')"
                           textName="label"
                           valueName="uuid"
-                          :validateList="[]"
                           :firstSelect="false"
-                          transfer
                           border="border"
+                          :validateList="getValidList(e.type, e.element)"
+                          transfer
                           @change="(val)=>setConfig(val,'valueList',e)"
                         ></TsFormSelect>
                       </template>
-                      <template v-else-if="e.mappingMode === 'formTableComponent'">
+                      <template v-else-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formTableComponent'">
                         <TsRow :gutter="8">
                           <Col span="12">
                             <TsFormSelect
-                              ref="formValid"
-                              v-model="e.valueList"
+                              ref="attrHandler"
+                              :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
                               :dataList="getFormComponent('formTableComponent')"
                               textName="label"
                               valueName="uuid"
-                              :validateList="e.isRequired? validateList:[]"
+                              :validateList="getValidList(e.type, e.element)"
                               :firstSelect="false"
                               transfer
                               border="border"
@@ -207,10 +193,10 @@
                           <Col span="12">
                             <div class="formTableComponent pr-lg">
                               <TsFormSelect
-                                ref="formValid"
-                                v-model="e.column"
-                                :dataList="getAttrList(e.valueList)"
-                                :validateList="e.isRequired && e.valueList?validateList:[]"
+                                ref="attrHandler"
+                                :value="getValue(ciEntityData.allCiEntityValue, e, 'column')"
+                                :dataList="getAttrList(ciEntityData.allCiEntityValue, e)"
+                                :validateList="getValidList(e.type, e.element)"
                                 :firstSelect="false"
                                 transfer
                                 border="border"
@@ -253,13 +239,13 @@
                       </template>
                     </Col>
                   </TsRow>
-                  <div v-if="e.mappingMode === 'formTableComponent'">
-                    <div class="filter-top pb-sm">
-                      <span class="pr-sm label">{{ $t('term.dashboard.datafilter') }}</span>
-                      <TsFormSwitch
-                        v-model="e.isActive"
-                      ></TsFormSwitch>
-                    </div>
+                  <div v-if="ciData.createPolicy === 'single' && getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formTableComponent'">
+                    <FilterList
+                      ref="attrHandler"
+                      :defaultFilterList="getValue(ciEntityData.allCiEntityValue, e, 'filterList')"
+                      :dataList="getAttrList(ciEntityData.allCiEntityValue, e)"
+                      @setConfig="(val)=>setConfig(val,'filterList', e)"
+                    ></FilterList>
                   </div>
                 </Col>
               </TsRow>
@@ -279,11 +265,11 @@ 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),
-    TsFormSwitch: resolve => require(['@/resources/plugins/TsForm/TsFormSwitch'], resolve)
+    FilterList: resolve => require(['./cmdbpolicy/filter-list.vue'], resolve)
   },
   props: {
+    ciData: Object,
     allFormitemList: Array,
-    allowBatchAdd: { type: Boolean, default: true }, //是否允许批量创建新配置项
     ciEntityQueue: {
       type: Array,
       default: () => {
@@ -296,11 +282,6 @@ export default {
       openPanel: ['global', 'unique', 'manual', 'description'],
       relCiList: [], //关系的所有下游模型列表
       isRelPopShow: {},
-      activePanel: ['attr', 'rel'],
-      isRelMultiple: true,
-      targetCiId: null,
-      currentRel: null,
-      currentRelEntityValue: null,
       isLoading: false,
       mappingModeList: [
         {
@@ -329,24 +310,18 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    getGlobalValueList(data, attr) {
-      const id = attr.id;
-      if (!data['global_' + id]) {
-        this.$set(data, 'global_' + id, { valueList: [] });
-      } else if (!data['global_' + id]['valueList']) {
-        this.$set(data['global_' + id], 'valueList', []);
+    getValue(data, e, attr) {
+      let value = null;
+      let key = null;
+      if (e.type === 'des') {
+        key = 'description';
+      } else {
+        key = e.type + '_' + e.element.id;
       }
-      return data['global_' + id]['valueList'].map(d => d.id);
-    },
-    getValueList(data, attr) {
-      const id = attr.id;
-      if (!data['attr_' + id]) {
-        this.$set(data, 'attr_' + id, { type: attr.type, config: attr.config, valueList: [] });
-      } else if (!data['attr_' + id]['valueList']) {
-        this.$set(data['attr_' + id], 'valueList', []);
+      if (data && data[key]) {
+        value = data[key][attr];
       }
-      console.log(this.ciEntityData.attrEntityData, ' this.ciEntityData.attrEntityData1000');
-      return this.$utils.deepClone(data['attr_' + id]['valueList']);
+      return value;
     },
     disabledFn(elementId) {
       if (this.ciEntityData.editableAttrRelIdList && this.ciEntityData.editableAttrRelIdList.length > 0 && !this.ciEntityData.editableAttrRelIdList.includes(elementId)) {
@@ -391,12 +366,9 @@ export default {
     delRelEntity(key, relentity, rowdata) {
       this.ciEntityDatafn(key, relentity, rowdata);
     },
-    back() {
-      this.$emit('back');
-    },
     editNewRelEntity(rel) {
       if (this.getTagType(rel) == 'success') {
-        this.$emit('edit', rel.ciEntityUuid);
+        this.$emit('edit', rel.ciEntityUuid, rel);
       }
     },
     addNewRelEntity(rel) {
@@ -417,18 +389,11 @@ export default {
       });
     },
     newCiEntity(rel, ciId) {
-      rel._ciId = ciId;
+      rel.ciId = ciId;
+      rel._relId = rel.id;
       this.isRelPopShow[rel.id + '_' + rel.direction] = false;
       this.$emit('new', 'rel', rel);
     },
-    addNewAttrEntity(attr) {
-      //添加新的引用属性
-      this.$emit('new', 'attr', attr);
-    },
-    editNewAttrEntity(uuid) {
-      //删除引用属性（只支持新添加的目标，已存在的目标不允许修改）
-      this.$emit('edit', uuid);
-    },
     //删除选中的属性
     deleteAttrEntity(key, attrentity) {
       //删除引用属性
@@ -493,6 +458,15 @@ export default {
         }
       });
     },
+    getValidList(type, data) {
+      let validateList = [];
+      if (type == 'rel' && (data.direction == 'from' && data.toIsRequired) || (data.direction == 'to' && data.fromIsRequired)) {
+        validateList = ['required'];
+      } else if (type === 'attr' && !!data.isRequired) {
+        validateList = ['required'];
+      }
+      return validateList;
+    },
     valid() {
       const attrHandlers = this.$refs['attrHandler'];
       let isValid = true;
@@ -507,7 +481,7 @@ export default {
       }
       return isValid;
     },
-    setGlobalAttrData(attr, opt) {
+    setGlobalAttrData(attr, opt, value, item) {
       if (!this.ciEntityData.globalAttrEntityData) {
         this.ciEntityData.globalAttrEntityData = {};
       }
@@ -515,8 +489,9 @@ export default {
         this.ciEntityData.globalAttrEntityData['global_' + attr.id] = {};
       }
       this.$set(this.ciEntityData.globalAttrEntityData['global_' + attr.id], 'valueList', opt);
+      this.setConfig(value, 'valueList', item);
     },
-    setAttrData(attr, value, actualValue) {
+    setAttrData(item, attr, value, actualValue) {
       if (!this.ciEntityData.attrEntityData) {
         this.ciEntityData.attrEntityData = {};
       }
@@ -527,24 +502,32 @@ export default {
       this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'type', attr.type);
       this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'valueList', value);
       this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'actualValueList', actualValue);
+      this.setConfig(value, 'valueList', item);
     },
     setConfig(value, attrName, item) {
-      if (item.type === 'attr') {
-        if (!this.ciEntityData.attrEntityData) {
-          this.ciEntityData.attrEntityData = {};
-        }
-        if (!this.ciEntityData.attrEntityData['attr_' + item.element.id]) {
-          this.ciEntityData.attrEntityData['attr_' + item.element.id] = {};
-        }
-        if (attrName === 'valueList') {
-          if (Array.isArray(value)) {
-            this.$set(this.ciEntityData.attrEntityData['attr_' + item.element.id], attrName, value);
-          } else {
-            this.$set(this.ciEntityData.attrEntityData['attr_' + item.element.id], attrName, [value]);
-          }
+      if (!this.ciEntityData.allCiEntityValue) {
+        this.ciEntityData.allCiEntityValue = {};
+      }
+      let key = null;
+      if (item.type === 'des') {
+        key = 'description';
+      } else {
+        key = item.type + '_' + item.element.id;
+      }
+      if (!this.ciEntityData.allCiEntityValue[key]) {
+        this.$set(this.ciEntityData.allCiEntityValue, key, {});
+      }
+      if (!this.ciEntityData.allCiEntityValue[key]) {
+        this.$set(this.ciEntityData.allCiEntityValue, key, {});
+      }
+      if (attrName === 'valueList') {
+        if (Array.isArray(value)) {
+          this.$set(this.ciEntityData.allCiEntityValue[key], attrName, value);
         } else {
-          this.$set(this.ciEntityData.attrEntityData['attr_' + item.element.id], attrName, value);
+          this.$set(this.ciEntityData.allCiEntityValue[key], attrName, [value]);
         }
+      } else {
+        this.$set(this.ciEntityData.allCiEntityValue[key], attrName, value);
       }
     }
   },
@@ -595,12 +578,6 @@ export default {
       }
       return typeList;
     },
-    uniqueElementList() {
-      if (this.ciEntityData && this.ciEntityData['_uniqueAttrList'] && this.ciEntityData['_uniqueAttrList'].length > 0 && this.ciEntityData['_elementList'] && this.ciEntityData['_elementList'].length > 0) {
-        return this.ciEntityData['_elementList'].filter(d => d.type === 'attr' && this.ciEntityData['_uniqueAttrList'].includes(d.element.id));
-      }
-      return [];
-    },
     ciEntityData() {
       return this.ciEntityQueue[this.ciEntityQueue.length - 1];
     },
@@ -611,21 +588,6 @@ export default {
       }
       return null;
     },
-    // getValueList() {
-    //   return (data, attr) => {
-    //     if (attr) {
-    //       const id = attr.id;
-    //       if (!data['attr_' + id]) {
-    //         this.$set(data, 'attr_' + id, { type: attr.type, config: attr.config, valueList: [] });
-    //       } else if (!data['attr_' + id]['valueList']) {
-    //         this.$set(data['attr_' + id], 'valueList', []);
-    //       }
-    //       return data['attr_' + id]['valueList'];
-    //     } else {
-    //       return null;
-    //     }
-    //   };
-    // },
     getFormComponent() {
       return (type) => {
         let dataList = [];
@@ -644,10 +606,17 @@ export default {
       };
     },
     getAttrList() {
-      return (value) => {
+      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 => item.uuid === value);
+          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({
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 1a8d9874c..75a2cead1 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
@@ -40,8 +40,8 @@
           {{ $t('page.edit') }}
         </div>
       </div>
-      <div v-if="ciEntityConfig.configList.length" class="pt-sm overflow">{{ ciEntityConfig.configList[0].ciLabel }}
-        <span v-if="ciEntityConfig.configList[0].ciName" class="text-tip">({{ ciEntityConfig.configList[0].ciName }})</span>
+      <div v-if="!$utils.isEmpty(startCiEntity)" class="pt-sm overflow">{{ startCiEntity.ciLabel }}
+        <span v-if="startCiEntity.ciName" class="text-tip">({{ startCiEntity.ciName }})</span>
       </div>
       <div v-if="!isValid && $utils.isEmpty(ciEntityConfig.configList)" class="form-error-tip pl-nm">
         {{ $t('form.validate.required', { target: $t('term.cmdb.modemapping') }) }}
@@ -71,6 +71,7 @@ export default {
         rerunStepToSync: 0,
         configList: []
       },
+      startCiEntity: {},
       isValid: true //校验
     };
   },
@@ -93,6 +94,9 @@ export default {
         Object.keys(config).forEach(key => {
           this.ciEntityConfig[key] = config[key];
         });
+        if (!this.$utils.isEmpty(this.ciEntityConfig.configList)) {
+          this.startCiEntity = this.ciEntityConfig.configList.find(c => c.isStart);
+        }
       }
     },
     getFailPolicyList() {
@@ -128,6 +132,7 @@ export default {
         Object.keys(data).forEach(key => {
           this.$set(this.ciEntityConfig, key, data[key]);
         });
+        this.startCiEntity = this.ciEntityConfig.configList.find(c => c.isStart);
       }
       this.isShowDialog = false;
     },
-- 
Gitee


From 82282dd4dbdd88bb0adb3309b7dfafa9a1395660 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 1 Nov 2023 15:08:19 +0800
Subject: [PATCH 05/16] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20cmdb=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=EF=BC=9A=E5=B7=A5=E5=8D=95=E5=A4=84=E7=90=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/process/task/processdetail/index.js |   4 +-
 .../processdetail/process-cientitysync.vue    | 696 ++++++++++++++++++
 2 files changed, 699 insertions(+), 1 deletion(-)
 create mode 100644 src/views/pages/process/task/processdetail/process-cientitysync.vue

diff --git a/src/views/pages/process/task/processdetail/index.js b/src/views/pages/process/task/processdetail/index.js
index c4b086911..c3bd06eb5 100644
--- a/src/views/pages/process/task/processdetail/index.js
+++ b/src/views/pages/process/task/processdetail/index.js
@@ -5,6 +5,7 @@ import changehandle from './process-changehandle';
 import event from './process-event'; //事件
 import autoexec from './process-autoexec'; 
 import timer from './process-timer';
+import cientitysync from './process-cientitysync';
 export default {
   omnipotent,
   automatic,
@@ -12,5 +13,6 @@ export default {
   changehandle,
   event,
   autoexec,
-  timer
+  timer,
+  cientitysync
 };
diff --git a/src/views/pages/process/task/processdetail/process-cientitysync.vue b/src/views/pages/process/task/processdetail/process-cientitysync.vue
new file mode 100644
index 000000000..cd28757dd
--- /dev/null
+++ b/src/views/pages/process/task/processdetail/process-cientitysync.vue
@@ -0,0 +1,696 @@
+<template>
+  <div class="taskdetail-autoexec">
+    <Loading :loadingShow="taskLoading" type="fix"></Loading>
+    <TsContain
+      :leftWidth="260"
+      :isSiderHide="!isOrderLeft"
+      :sessionName="sessionName"
+    >
+      <template v-slot:navigation>
+        <span class="tsfont-left text-action" @click="$back(prevPath.router)">{{ $getFromPage(prevPath.name) }}</span>
+      </template>
+      <template v-slot:topLeft>
+        <div class="taskdetail-top">
+          <NavTop
+            :prevPath="prevPath"
+            :processTaskConfig="processTaskConfig"
+            :isEditTitle="isEditTitle"
+            :taskTitle="processTaskConfig.title"
+            :actionConfig="actionConfig"
+            @isTslayout="isTslayout"
+            @editTitle="editTitle"
+            @changeTitle="changeTitle"
+            @toPrevpath="toPrevpath"
+          ></NavTop>
+          <div class="toolbar-right">
+            <div class="action-group">
+              <!-- 开始_start -->
+              <span
+                v-if="actionConfig.start"
+                :class="{disable: disabledConfig.starting}"
+                class="action-item tsfont-play-o"
+                @click="startTaskStep('start')"
+              >{{ actionConfig.start }}</span>
+              <!-- 开始_end -->
+              <!-- accept_start -->
+              <span
+                v-if="actionConfig.accept"
+                :class="{disable: disabledConfig.accepting}"
+                class="action-item tsfont-play-o"
+                @click="startTaskStep('accept')"
+              >{{ actionConfig.accept }}</span>
+              <!-- accept_end -->
+              <!-- 暂存、保存_start -->
+              <span
+                v-if="actionConfig.save"
+                :class="{disable: disabledConfig.saving}"
+                class="action-item tsfont-save"
+                @click="saveTaskData()"
+              >{{ actionConfig.save }}</span>
+              <!-- 暂存、保存_end -->
+              <!-- 转交_start -->
+              <span
+                v-if="actionConfig.transfer"
+                :class="{disable: disabledConfig.transferring}"
+                class="action-item tsfont-arrow-corner-right"
+                @click="transferTask"
+              >{{ actionConfig.transfer }}</span>
+              <!-- 转交_end -->
+              <!-- 暂停步骤 -->
+              <span
+                v-if="actionConfig.pause"
+                :class="{disable: disabledConfig.pausing}"
+                class="action-item tsfont-pause"
+                @click="pauseStep"
+              >{{ actionConfig.pause }}</span>
+              <!-- 恢复步骤 -->
+              <span
+                v-if="actionConfig.recover"
+                :class="{disable: disabledConfig.recoverstep}"
+                class="action-item tsfont-play-o"
+                @click="recoverStep"
+              >{{ actionConfig.recover }}</span>
+              <!-- 查看流程图_start -->
+              <span v-if="!pocesstaskview" class="action-item" @click="lookSitemap">
+                <Tooltip :content="$t('term.process.viewflowchart')" theme="light">
+                  <i class="tsfont-topo"></i>
+                </Tooltip>
+              </span>
+              <!-- 工单关注 -->
+              <span
+                :class="{disable: disabledConfig.focusing}"
+                class="action-item"
+                @click="updateFocus"
+              >
+                <Tooltip v-if="processTaskConfig.isFocus" :content="$t('term.process.notfocustask')" theme="light">
+                  <i :class="['text-danger', 'tsfont-heart-s']"></i>
+                </Tooltip>
+                <Tooltip v-else :content="$t('term.process.focustask')" theme="light">
+                  <i :class="['text-danger', 'tsfont-heart-o']"></i>
+                </Tooltip>
+              </span>
+              <!-- 更多操作 -->
+              <span v-if="isMoreAction" class="action-item">
+                <Dropdown trigger="click" placement="bottom-end">
+                  <span class="tsfont-option-vertical"></span>
+                  <DropdownMenu slot="list">
+                    <!-- 撤回_start -->
+                    <DropdownItem v-if="actionConfig.retreat" :disabled="disabledConfig.retreating" @click.native="retreatTaskStep">
+                      {{ actionConfig.retreat }}
+                    </DropdownItem>
+                    <!-- 撤回_end -->
+                    <!--转报  -->
+                    <DropdownItem v-if="actionConfig.tranferreport" @click.native="openRanferreport">
+                      {{ actionConfig.tranferreport }}
+                    </DropdownItem>
+                    <!-- 取消_start -->
+                    <DropdownItem v-if="actionConfig.abortprocessTask" :disabled="disabledConfig.aborting" @click.native="cancelTask">
+                      {{ actionConfig.abortprocessTask }}
+                    </DropdownItem>
+                    <!-- 取消_end -->
+                    <!-- 恢复_start -->
+                    <DropdownItem v-if="actionConfig.recoverprocessTask" :disabled="disabledConfig.recovertask" @click.native="recoverTask">
+                      {{ actionConfig.recoverprocessTask }}
+                    </DropdownItem>
+                    <!-- 恢复_end -->
+                    <!-- 恢复_start -->
+                    <DropdownItem v-if="actionConfig.urge" :disabled="disabledConfig.urging" @click.native="urgeTask">
+                      {{ actionConfig.urge }}
+                    </DropdownItem>
+                    <!-- 恢复_end -->
+                    <!-- 复制上报 -->
+                    <DropdownItem v-if="actionConfig.copyprocesstask" @click.native="copyProcessTask">
+                      {{ actionConfig.copyprocesstask }}
+                    </DropdownItem>
+                    <!-- 复制上报 -->
+                    <DropdownItem v-if="knowledgeConfig && knowledgeConfig.isTransferKnowledge == 1" @click.native="createKnowledge">
+                      转为知识文档
+                    </DropdownItem>
+                  </DropdownMenu>
+                </Dropdown>
+              </span>
+              <!-- 回退s -->
+              <span v-if="actionConfig.back && backStepList.length > 1" class="action-item">
+                <Button 
+                  icon="tsfont tsfont-reply"
+                  @click="backTask"
+                >{{ actionConfig.back }}</Button>
+              </span>
+              <span v-if="actionConfig.back && backStepList.length == 1" class="action-item">
+                <Button
+                  style="max-width:180px"
+                  class="overflow"
+                  icon="tsfont tsfont-reply"
+                  :title="selectBackConfig.name ? selectBackConfig.flowDirection + selectBackConfig.name : null"
+                  @click="backTask"
+                >{{ actionConfig.back }}</Button>
+              </span>
+              <!-- 回退_end -->
+              <!-- 流转_start -->
+              <span v-if="actionConfig.complete" class="action-item">
+                <template v-if="completeAuth">
+                  <!-- 接下来步骤大于1个，弹窗选择 -->
+                  <Button
+                    v-if="nextStepList.length > 1"
+                    icon="tsfont tsfont-refresh"
+                    type="primary"
+                    :disabled="disabledConfig.completing"
+                    @click="completeTask"
+                  >{{ actionConfig.complete }}</Button>
+                  <!-- 接下来步骤1个 直接选择-->
+                  <Button
+                    v-else-if="nextStepList.length == 1"
+                    icon="tsfont tsfont-refresh"
+                    type="primary"
+                    :disabled="disabledConfig.completing"
+                    :title="nextStepList[0].name ? nextStepList[0].flowDirection + nextStepList[0].name : null"
+                    @click="completeStep(nextStepList[0])"
+                  >
+                    <div class="overflow" style="max-width:150px">{{ nextStepList[0].aliasName || actionConfig.complete }}</div>
+                  </Button>
+                </template>
+                <Tooltip
+                  v-else
+                  placement="bottom-end"
+                  :content="completeErrorText"
+                  transfer
+                >
+                  <Button
+                    icon="tsfont tsfont-refresh"
+                    type="primary"
+                    :disabled="true"
+                  >{{ actionConfig.complete }}</Button>
+                </Tooltip>
+              </span>
+              <!-- 流转_end -->
+              <!-- 评分前回退 -->
+              <span v-if="actionConfig.redo" class="action-item">
+                <Button
+                  icon="tsfont tsfont-reply"
+                  @click="redoTask"
+                >{{ actionConfig.redo }}</Button>
+              </span>
+            </div>
+          </div>
+        </div>
+      </template>
+      <template v-slot:left>
+        <slot></slot>
+      </template>
+      <template v-slot:content>
+        <div class="task-main">
+          <template v-if="(processTaskStepRemindList && processTaskStepRemindList.length > 0) || (processTaskConfig.tranferReportProcessTaskList && processTaskConfig.tranferReportProcessTaskList.length > 0)">
+            <!-- 提示：回退，转交，转报等 -->
+            <TaskAlert :list="processTaskStepRemindList" :tranferReportProcessTaskList="processTaskConfig.tranferReportProcessTaskList" @getTaskAlertHeight="(taskHeight) => taskAlertHeight = taskHeight"></TaskAlert>
+          </template>
+          <TsContain
+            :rightWidth="290"
+            :hasContentPadding="false"
+            hideHeader
+            :isSiderHide="!isOrderRight"
+            siderPosition="right"
+            :rightBtn="true"
+            @rightSiderToggle="rightSiderToggle"
+          >
+            <template v-slot:content>
+              <div
+                v-if="actionConfig.pocesstaskview && processTaskConfig && startProcessTaskStep"
+                class="pt-nm"
+                style="overflow-y: scroll;"
+                :style="{height: `calc(100% - ${taskAlertHeight}px)`}"
+              >
+                <CenterDetail
+                  ref="TaskCenterDetail"
+                  :actionConfig="actionConfig"
+                  :formConfig="formConfig"
+                  :processTaskConfig="processTaskConfig"
+                  :processTaskStepConfig="processTaskStepConfig"
+                  :formEdit="formEdit"
+                  :showActive="showActive"
+                  :addAssist="addAssist"
+                  :startProcessTaskStep="startProcessTaskStep"
+                  :defaultProcessTaskId="processTaskId"
+                  :defaultProcessTaskStepId="processTaskStepId"
+                  :replaceableTextConfig="replaceableTextConfig"
+                  :priorityList="priorityList"
+                  :defaultTabValue="isShowJob? 'autoexec' : ''"
+                  @update="update"
+                  @changeDisableCommet="(val)=>{
+                    isDisableCommet = val
+                  }"
+                >
+                  <div slot="replyBtn">
+                    <!-- 回退/流转按钮 -->
+                    <FooterOperationBtn
+                      :actionConfig="actionConfig"
+                      :nextStepList="nextStepList"
+                      :disabledConfig="disabledConfig"
+                      :backStepList="backStepList"
+                      :selectBackConfig="selectBackConfig"
+                      :currentProcessTaskStep="processTask.currentProcessTaskStep"
+                      :completeAuth="completeAuth"
+                      :completeErrorText="completeErrorText"
+                      :isDisableCommet="isDisableCommet"
+                      @completeTask="completeTask"
+                      @completeStep="completeStep"
+                      @backTask="backTask"
+                      @comment="comment"
+                    ></FooterOperationBtn>
+                  </div>
+                </CenterDetail>
+              </div>
+            </template>
+            <template v-slot:right>
+              <RightSetting
+                ref="RightSetting"
+                :actionConfig="actionConfig"
+                :addAssist="addAssist"
+                :processTaskConfig="processTaskConfig"
+                :knowledgeConfig="knowledgeConfig"
+                :replaceableTextConfig="replaceableTextConfig"
+                :isOrderRight="isOrderRight"
+                :priorityList="priorityList"
+                @updateActiveStep="updateActiveStep"
+              ></RightSetting>
+            </template>
+          </TsContain>
+        </div>
+      </template>
+    </TsContain>
+    <!-- 流转 -->
+    <TsDialog
+      type="modal"
+      :isShow.sync="completeModal"
+      :className="stepDialogClass"
+      :title="actionConfig.complete"
+      @on-ok="completeOk"
+    >
+      <template>
+        <div class="step-list" style="max-height:400px">
+          <div v-if="selectStepConfig">
+            <StepSelect :id="selectStepConfig.id" :list="nextStepList" @selecStep="selecStep"></StepSelect>
+            <div v-if="assignableWorkerStepList.length > 0" class="pb-nm">
+              <TsFormItem
+                v-for="(item, index) in assignableWorkerStepList"
+                :key="index"
+                :label="$t('term.process.selectaskuser', {target: item.name})"
+                :validateList="item.isRequired ? validateList : []"
+                class="input-border"
+                labelPosition="top"
+              >
+                <UserSelect
+                  v-model="item.value"
+                  transfer
+                  :groupList=" item.groupList && item.groupList.length > 0 ? item.groupList :assignGroupList"
+                  :rangeList="item.rangeList"
+                  :validateList="item.isRequired ? validateList : []"
+                ></UserSelect>
+              </TsFormItem>
+            </div>
+          </div>
+          <TsForm ref="completeForm" :itemList="completeList" labelPosition="top"></TsForm>
+        </div>
+      </template>
+    </TsDialog>
+    <!-- 转交 -->
+    <TransferDialog
+      :isShow.sync="transferModal"
+      :processTaskId="processTaskId"
+      :processTaskStepId="processTaskStepId"
+      :content="transferContent"
+    ></TransferDialog>
+    <!-- 查看流程图 -->
+    <LookSitemapDialog
+      ref="isLookSitemap"
+      :lookSitemapModel="lookSitemapModel"
+      :stepDialogClass="stepDialogClass"
+      :tsDialoglookSitemap="tsDialoglookSitemap"
+      :sitemapTitle="sitemapTitle"
+      :tooltipStyle="tooltipStyle"
+      :stepTooltip="stepTooltip"
+    ></LookSitemapDialog>
+    <!-- 校验 -->
+    <div v-if="validCardOpen" class="tsscroll-container valid-main">
+      <Card style="width:100%;" :padding="0">
+        <p slot="title">{{ $t('page.validate') }}</p>
+        <a slot="extra" href="javascript:void(0);" @click.prevent="validCardOpen = false">
+          <Icon custom="tsfont-close text-title"></Icon>
+        </a>
+        <CellGroup style="max-height: 340px; overflow: auto;">
+          <Cell
+            v-for="(item, index) in validList"
+            :key="index"
+            :title="item.msg"
+            @click.native="validItemClick(item.focus)"
+          >
+            <Icon
+              slot="icon"
+              :custom="item.icon"
+              size="20"
+              :color="item.iconColor"
+            ></Icon>
+          </Cell>
+        </CellGroup>
+      </Card>
+    </div>
+    <!-- 撤回 -->
+    <TsDialog
+      type="modal"
+      :isShow.sync="retreatModal"
+      :title="actionConfig.retreat"
+      :className="stepDialogClass"
+      @on-ok="retreatOk"
+    >
+      <template>
+        <div class="step-list">
+          <TsForm ref="retreatForm" :itemList="retreatConfig" labelPosition="top">
+            <template v-slot:processTaskStepId>
+              <StepSelect :id="retreatId" :list="retreatList" @selecStep="retreatStep"></StepSelect>
+            </template>
+          </TsForm>
+        </div>
+      </template>
+    </TsDialog>
+    <!-- 开始 处理-->
+    <TsDialog
+      type="modal"
+      :isShow.sync="startModal"
+      class="vertical-center-modal"
+      :hasHeader="false"
+      :hasFooter="false"
+      :className="stepDialogClass"
+    >
+      <template>
+        <div class="submitModelBox">
+          <p class="text-grey text-line">{{ $t('term.process.pleselectprioritystep') }}</p>
+          <div v-for="(st, stindex) in startList" :key="stindex" class="submit-btn-list">
+            <Button
+              size="large"
+              style="width:190px;"
+              class="overflow"
+              @click="selecStartStep(st)"
+            >{{ st.name }}</Button>
+          </div>
+        </div>
+      </template>
+    </TsDialog>
+    <!-- 回退 -->
+    <TsDialog
+      type="modal"
+      :isShow.sync="backModal"
+      :className="stepDialogClass"
+      :title="actionConfig.back"
+      @on-ok="backOk"
+    >
+      <template>
+        <div class="step-list">
+          <TsForm ref="backForm" :itemList="backList" labelPosition="top">
+            <template v-slot:step>
+              <StepSelect :id="selectBackConfig.id" :list="backStepList" @selecStep="(val)=>{selecStep(val, 'back')}"></StepSelect>
+            </template>
+          </TsForm>
+        </div>
+      </template>
+    </TsDialog>
+    <TsDialog
+      type="modal"
+      :isShow.sync="assignModal"
+      :className="stepDialogClass"
+      :title="assignTitle"
+      @on-ok="assignOk"
+    >
+      <template>
+        <TsFormItem
+          v-for="(item, index) in assignableWorkerStepList"
+          :key="index"
+          :label="item.name"
+          :labelWidth="150"
+          :validateList="item.isRequired ? validateList : []"
+          class="input-border"
+        >
+          <UserSelect
+            v-model="item.value"
+            transfer
+            :groupList=" item.groupList && item.groupList.length > 0 ? item.groupList :assignGroupList"
+            :rangeList="item.rangeList"
+            :validateList="item.isRequired ? validateList : []"
+            width="90%"
+          ></UserSelect>
+        </TsFormItem>
+      </template>
+    </TsDialog>
+    <!-- 转报 -->
+    <RanferreportDialog v-if="actionConfig.tranferreport" :isShow.sync="ranferreportModel" :processTaskConfig="processTaskConfig"></RanferreportDialog>
+    <RedoDialog :isShow.sync="redoModel" :processTaskConfig="processTaskConfig"></RedoDialog>
+    <KnowledgeDialog :isShow.sync="knowledgeModel" :processTaskConfig="processTaskConfig"></KnowledgeDialog>
+  </div>
+</template>
+
+<script>
+import '@/views/pages/process/flow/topoComponent/index.js';
+import clipboard from '@/resources/directives/clipboard.js';
+import itemDialog from './workorder/actiondialog/index.js';
+import detailmixin from './detailmixin.js';
+import FooterOperationBtn from './workorder/footer-operation-btn.vue'; // 底部操作按钮组件
+
+let Vm;
+
+export default {
+  //工单处理
+  name: '',
+  tagComponent: 'taskDeal', //主要用来标识是上报页面，为表单修改优先级做标志
+  components: {
+    TsDialog: resolve => require(['@/resources/plugins/TsDialog/TsDialog.vue'], resolve),
+    TsForm: resolve => require(['@/resources/plugins/TsForm/TsForm.vue'], resolve),
+    CenterDetail: resolve => require(['./workorder/CenterDetail.vue'], resolve),
+    LookSitemapDialog: resolve => require(['./workorder/actiondialog/lookSitemap.vue'], resolve),
+    RightSetting: resolve => require(['./workorder/RightSetting.vue'], resolve),
+    NavTop: resolve => require(['./navTop.vue'], resolve),
+    TsFormItem: resolve => require(['@/resources/plugins/TsForm/TsFormItem.vue'], resolve),
+    UserSelect: resolve => require(['@/resources/components/UserSelect/UserSelect.vue'], resolve),
+    ...itemDialog,
+    TaskAlert: resolve => require(['@/views/pages/process/task/processdetail/workorder/alert/top-alert.vue'], resolve),
+    StepSelect: resolve => require(['@/views/pages/process/task/processdetail/workorder/common/step-select.vue'], resolve),
+    FooterOperationBtn
+  },
+  provide() {
+    return {
+      $taskBox: this
+    };
+  },
+  directives: {
+    clipboard
+  },
+  mixins: [detailmixin],
+  props: {},
+  data() {
+    return {
+      ranferreportModel: false, // 转报弹框
+      redoModel: false, //评分工单回退
+      knowledgeModel: false,
+      knowledgeConfig: null,
+      transferStepList: [], //转交步骤列表
+      transferId: null,
+      handlerStepInfo: null,
+      completeAuth: false, //人工流转权限判断
+      completeErrorText: '正在执行，无法人工流转',
+      taskAlertHeight: 0 // taskAlert高度
+      // taskForm: null, //工单表单查看权限
+    
+    };
+  },
+  created() {
+  },
+  mounted() {
+    this.getAllData();
+    this.getKnowledgeDetail(); //转知识权限
+    Vm = this;
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+    this.timer = null;
+  },
+  methods: {
+    getMessage() { 
+      //初始化当前步骤:cmdb同步
+      if (this.processTaskStepConfig) {
+        this.handlerStepInfo = this.processTaskStepConfig.handlerStepInfo || null;
+        if (this.handlerStepInfo) {
+          this.completeAuth = !(this.handlerStepInfo.status == 'pending' || this.handlerStepInfo.status == 'running');
+        } else {
+          this.completeAuth = true;
+        }
+      }
+    },
+    async completeTask() {
+      //流转
+      let val = this.$refs.TaskCenterDetail ? this.$refs.TaskCenterDetail.getTaskStepContent() : null;
+      this.completeList.forEach(item => {
+        if (item.name == 'content') {
+          item.value = val;
+          if (this.isStepRequired === 0) {
+            item.validateList = [];
+          }
+        }
+      });
+      let isValid = await this.taskValid();
+      if (isValid) {
+        this.nextStepList.length && this.selecStep(this.nextStepList[0]);
+        this.completeModal = true;
+      }
+    },
+    async completeOk() {
+      //流转完成
+      let completeForm = this.$refs.completeForm;
+      if (completeForm.valid()) {
+        await this.saveTaskData(true);
+        let obj = completeForm.getFormValue();
+        let isSave = true;
+        for (let i = 0; i < this.assignableWorkerStepList.length; i++) {
+          if (this.assignableWorkerStepList[i].isRequired == 1 && !this.assignableWorkerStepList[i].value.length) {
+            isSave = false;
+            this.$Notice.error({
+              title: this.$t('form.placeholder.pleaseselect', {target: this.$t('term.process.stepuser')}),
+              duration: 1.5
+            });
+            break;
+          }
+        }
+        if (isSave) {
+          let data = {
+            processTaskId: this.processTaskId,
+            processTaskStepId: this.processTaskStepId,
+            nextStepId: this.selectStepConfig.id,
+            content: obj.content,
+            action: 'complete'
+          };
+          if (this.assignableWorkerStepList.length > 0) {
+            let userArr = [];
+            this.assignableWorkerStepList.forEach(a => {
+              if (a.value && a.value.length > 0) {
+                let userObj = {};
+                userObj.processTaskStepId = a.id;
+                userObj.workerList = a.value;
+                userArr.push(userObj);
+              }
+            });
+            if (userArr.length > 0) {
+              data.assignWorkerList = userArr;
+            }
+          }
+          if (!this.disabledConfig.completing) {
+            this.disabledConfig.completing = true;
+            this.$api.process.processtask.complete(data).then(res => {
+              this.disabledConfig.completing = false;
+              if (res.Status == 'OK') {
+                this.$Message.success(this.$t('message.executesuccess'));
+                this.completeModal = false;
+                this.toTask(this.processTaskId);
+              }
+            }).catch(error => {
+              this.disabledConfig.completing = false;
+            });
+          }
+        }
+      }
+    },
+    saveCompleData() {
+      if (!this.disabledConfig.completing) {
+        let conntent = this.$refs.TaskCenterDetail ? this.$refs.TaskCenterDetail.getTaskStepContent() : null;
+        let data = {
+          processTaskId: this.processTaskId,
+          processTaskStepId: this.processTaskStepId,
+          nextStepId: this.nestStepId,
+          content: conntent,
+          action: 'complete'
+        };
+        if (this.assignableWorkerStepList.length > 0) {
+          let userArr = [];
+          this.assignableWorkerStepList.forEach(a => {
+            if (a.value && a.value.length > 0) {
+              let userObj = {};
+              userObj.processTaskStepId = a.id;
+              userObj.workerList = a.value;
+              userArr.push(userObj);
+            }
+          });
+          if (userArr.length > 0) {
+            data.assignWorkerList = userArr;
+          }
+        }
+        this.disabledConfig.completing = true;
+        this.$api.process.processtask.complete(data).then(res => {
+          this.disabledConfig.completing = false;
+          if (res.Status == 'OK') {
+            this.$Message.success(this.$t('message.executesuccess'));
+            this.toTask(this.processTaskId);
+          }
+        }).catch(error => {
+          this.disabledConfig.completing = false;
+        });
+      }
+    },
+    //评分前回退
+    redoTask() {
+      this.redoModel = true;
+    },
+    createKnowledge() {
+      //创建知识
+      this.knowledgeModel = true;
+    },
+    getKnowledgeDetail() {
+      //获取工单知识信息
+      let moduleList = JSON.parse(localStorage.getItem('moduleList'));
+      let find = moduleList.find(d => d.moduleId == 'knowledge');
+      if (find && (this.processTask.status == 'succeed' || this.processTask.status == 'scored')) {
+        //工单：完成或者评分状态时，都需要调知识接口
+        let data = {
+          invokeId: this.processTaskId,
+          source: 'processtask'
+        };
+        this.$api.process.processtask.knowledgeDetail(data).then(res => {
+          if (res.Status == 'OK') {
+            let obj = res.Return;
+            this.knowledgeConfig = obj;
+          }
+        });
+      }
+    }
+  },
+  computed: {
+    isMoreAction() {
+      //更多操作按钮
+      let actionConfig = this.actionConfig;
+      let moreAction = false;
+      if (actionConfig.createsubtask || actionConfig.retreat || actionConfig.abortprocessTask || actionConfig.recoverprocessTask || actionConfig.urge || actionConfig.tranferreport || actionConfig.copyprocesstask || (this.knowledgeConfig && this.knowledgeConfig.isTransferKnowledge == 1)) {
+        moreAction = true;
+      }
+      return moreAction;
+    },
+    isShowJob() {
+      return this.handlerStepInfo && (!this.$utils.isEmpty(this.handlerStepInfo.jobList) || !this.$utils.isEmpty(this.handlerStepInfo.errorList));
+    }
+  },
+
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.task-title{
+  font-size: 16px;
+}
+.task-main{
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow-y: hidden;
+}
+.channel-type{
+  padding: 4px 12px;
+  margin-right: 4px;
+  border-radius: 20px;
+}
+/deep/ .ivu-layout-content{
+  overflow-y: hidden !important;
+}
+</style>
-- 
Gitee


From c309654c2a4a2e7cf7f0006461881cd25f40e62b Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 1 Nov 2023 16:17:07 +0800
Subject: [PATCH 06/16] =?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=9A=E8=A1=A8=E6=A0=BC=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/node/nodesetting/cmdbsync-dialog.vue |  34 +-
 .../flow/node/nodesetting/cmdbsync-edit.vue   | 425 +++++++++---------
 2 files changed, 227 insertions(+), 232 deletions(-)

diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
index dec5c95b9..19fa1bb74 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
@@ -198,7 +198,17 @@ export default {
       validateList: ['required'],
       ciEntityQueue: [], //记录配置项添加队列
       tmpCiEntityData: {}, //临时数据，用于取消修改时还原
-      saveCiEntityMap: {} //最后需要保存的配置项列表
+      saveCiEntityMap: {}, //最后需要保存的配置项列表
+      descriptionConfig: { type: 'description', label: this.$t('term.cmdb.changememo'), elementList: [
+        {
+          type: 'des',
+          element: {
+            label: this.$t('term.cmdb.changememo'),
+            type: 'textarea',
+            maxlength: 500
+          }
+        }
+      ], isShow: true }
     };
   },
   beforeCreate() {},
@@ -289,16 +299,7 @@ export default {
             };
             cientity['_elementList'] = await this.getElementByCiId(this.ciData.ciId);
             cientity['_uniqueAttrList'] = await this.getCiUniqueByCiId(this.ciData.ciId);
-            cientity['_description'] = { type: 'description', label: this.$t('term.cmdb.changememo'), elementList: [
-              {
-                type: 'des',
-                element: {
-                  label: this.$t('term.cmdb.changememo'),
-                  type: 'textarea',
-                  maxlength: 500
-                }
-              }
-            ], isShow: true };
+            cientity['_description'] = this.descriptionConfig;
             this.initValue(cientity);
             this.ciEntityQueue = [cientity];
           } else {
@@ -418,16 +419,7 @@ export default {
             };
             newCiEntity['_elementList'] = await this.getElementByCiId(ciId);
             newCiEntity['_uniqueAttrList'] = await this.getCiUniqueByCiId(ciId);
-            newCiEntity['_description'] = { type: 'description', label: this.$t('term.cmdb.changememo'), elementList: [
-              {
-                type: 'des',
-                element: {
-                  label: this.$t('term.cmdb.changememo'),
-                  type: 'textarea',
-                  maxlength: 500
-                }
-              }
-            ], isShow: true };
+            newCiEntity['_description'] = this.descriptionConfig;
             newCiEntity['relEntityData']['rel' + direction + '_' + relId] = {
               valueList: [
                 {
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
index af5080b67..756a7fc55 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
@@ -16,239 +16,241 @@
               slot="content"
               class="pt-nm"
             >
-              <TsRow
-                v-for="(e, index) in elementType.elementList"
-                :key="index"
-                :gutter="8"
-                class="pb-sm"
-              >
-                <Col span="4">
-                  <template v-if="e.type == 'rel'">
-                    <div class="text-title overflow" :class="{'require-label':!!((e.element.direction == 'from' && e.element.toIsRequired) || (e.element.direction == 'to' && e.element.fromIsRequired))}">
-                      {{ e.element.direction === 'from' ? e.element.toLabel : e.element.fromLabel }}
-                    </div>
-                  </template>
-                  <template v-else>
-                    <div class="text-title overflow" :class="{'require-label': e.type === 'attr' && !!e.element.isRequired}">
-                      {{ e.element.label }}
-                    </div>
-                  </template>
-                </Col>
-                <Col span="20">
-                  <div v-if="e.type == 'rel'">  
-                    <div v-if="isRelShow(e.element, ciEntityData) && !(ciEntityData.relEntityData && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList'] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList'].length > 0 && ((e.element.direction == 'to' && e.element.fromRule == 'O') || (e.element.direction == 'from' && e.element.toRule == 'O')))">
-                      <a
-                        v-if="((e.element.direction == 'from' && e.element.toAllowInsert) || (e.element.direction == 'to' && e.element.fromAllowInsert))"
-                        href="javascript:void(0)"
-                        :disabled="disabledFn('rel' + e.element.direction + '_' + e.element.id)"
-                        @click.stop="addNewRelEntity(e.element)"
-                      >
-                        <i class="tsfont-plus"></i>
-                        {{ $t('page.choose') }}
-                      </a>
-                      <Poptip
-                        v-model="isRelPopShow[e.element.id + '_' + e.element.direction]"
-                        placement="right"
-                        trigger="hover"
-                        :transfer="true"
-                      >
-                        <a></a>
-                        <div slot="content">
-                          <div v-if="relCiList" :style="'overflow:auto;max-height:300px;width:' + Math.min(550, relCiList.length * 90) + 'px'">
-                            <div
-                              v-for="relci in relCiList"
-                              :key="relci.id"
-                              style="text-align: center; margin-right: 10px; float: left; cursor: pointer; width: 80px"
-                              @click="newCiEntity(e.element, relci.id)"
-                            >
-                              <div>
-                                <a href="javascript:void(0)"><i style="font-size: 20px" :class="relci.icon"></i></a>
-                              </div>
-                              <div class="overflow" :title="relci.label">
-                                <a href="javascript:void(0)">{{ relci.label }}</a>
+              <template v-for="(e, index) in elementType.elementList">
+                <TsRow
+                  v-if="e.type !== 'attr' || (e.type === 'attr' && e.element.canInput)"
+                  :key="index"
+                  :gutter="8"
+                  class="pb-sm"
+                >
+                  <Col span="4">
+                    <template v-if="e.type == 'rel'">
+                      <div class="text-title overflow" :class="{'require-label':!!((e.element.direction == 'from' && e.element.toIsRequired) || (e.element.direction == 'to' && e.element.fromIsRequired))}">
+                        {{ e.element.direction === 'from' ? e.element.toLabel : e.element.fromLabel }}
+                      </div>
+                    </template>
+                    <template v-else>
+                      <div class="text-title overflow" :class="{'require-label': e.type === 'attr' && !!e.element.isRequired}">
+                        {{ e.element.label }}
+                      </div>
+                    </template>
+                  </Col>
+                  <Col span="20">
+                    <div v-if="e.type == 'rel'">  
+                      <div v-if="isRelShow(e.element, ciEntityData) && !(ciEntityData.relEntityData && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList'] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList'].length > 0 && ((e.element.direction == 'to' && e.element.fromRule == 'O') || (e.element.direction == 'from' && e.element.toRule == 'O')))">
+                        <a
+                          v-if="((e.element.direction == 'from' && e.element.toAllowInsert) || (e.element.direction == 'to' && e.element.fromAllowInsert))"
+                          href="javascript:void(0)"
+                          :disabled="disabledFn('rel' + e.element.direction + '_' + e.element.id)"
+                          @click.stop="addNewRelEntity(e.element)"
+                        >
+                          <i class="tsfont-plus"></i>
+                          {{ $t('page.choose') }}
+                        </a>
+                        <Poptip
+                          v-model="isRelPopShow[e.element.id + '_' + e.element.direction]"
+                          placement="right"
+                          trigger="hover"
+                          :transfer="true"
+                        >
+                          <a></a>
+                          <div slot="content">
+                            <div v-if="relCiList" :style="'overflow:auto;max-height:300px;width:' + Math.min(550, relCiList.length * 90) + 'px'">
+                              <div
+                                v-for="relci in relCiList"
+                                :key="relci.id"
+                                style="text-align: center; margin-right: 10px; float: left; cursor: pointer; width: 80px"
+                                @click="newCiEntity(e.element, relci.id)"
+                              >
+                                <div>
+                                  <a href="javascript:void(0)"><i style="font-size: 20px" :class="relci.icon"></i></a>
+                                </div>
+                                <div class="overflow" :title="relci.label">
+                                  <a href="javascript:void(0)">{{ relci.label }}</a>
+                                </div>
                               </div>
                             </div>
                           </div>
-                        </div>
-                      </Poptip>
-                    </div>
-                    <div v-if="ciEntityData.relEntityData && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList']">
-                      <Tag
-                        v-for="(relentity, reindex) in ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList']"
-                        :key="reindex"
-                        :color="getTagType(relentity)"
-                        type="dot"
-                        size="large"
-                        :closable="!disabledFn('rel' + e.element.direction + '_' + e.element.id) && (relentity.ciEntityId || relentity.type == 'new') ? true : false"
-                        :style="getTagType(relentity) == 'success' ? 'cursor:pointer' : ''"
-                        @click.native="
-                          e => {
-                            e.stopPropagation();
-                            editNewRelEntity(relentity);
-                          }
-                        "
-                        @on-close="delRelEntity('rel' + e.element.direction + '_' + e.element.id, relentity, ciEntityData || '')"
-                      >
-                        <span>{{ relentity.ciEntityName }}</span>
-                      </Tag>
+                        </Poptip>
+                      </div>
+                      <div v-if="ciEntityData.relEntityData && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id] && ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList']">
+                        <Tag
+                          v-for="(relentity, reindex) in ciEntityData.relEntityData['rel' + e.element.direction + '_' + e.element.id]['valueList']"
+                          :key="reindex"
+                          :color="getTagType(relentity)"
+                          type="dot"
+                          size="large"
+                          :closable="!disabledFn('rel' + e.element.direction + '_' + e.element.id) && (relentity.ciEntityId || relentity.type == 'new') ? true : false"
+                          :style="getTagType(relentity) == 'success' ? 'cursor:pointer' : ''"
+                          @click.native="
+                            e => {
+                              e.stopPropagation();
+                              editNewRelEntity(relentity);
+                            }
+                          "
+                          @on-close="delRelEntity('rel' + e.element.direction + '_' + e.element.id, relentity, ciEntityData || '')"
+                        >
+                          <span>{{ relentity.ciEntityName }}</span>
+                        </Tag>
+                      </div>
                     </div>
-                  </div>
-                  <TsRow v-else :gutter="8">
-                    <Col span="10">
-                      <TsFormSelect
-                        ref="attrHandler"
-                        :value="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode')"
-                        :dataList="mappingModeList"
-                        :firstSelect="false"
-                        transfer
-                        border="border"
-                        :validateList="getValidList(e.type, e.element)"
-                        @change="(val)=>setConfig(val,'mappingMode',e)"
-                      ></TsFormSelect>
-                    </Col>
-                    <Col span="14">
-                      <template v-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') == 'constant'">
-                        <div v-if="e.type === 'attr'">
-                          <AttrInputer
-                            ref="attrHandler"
-                            :allowBatchAdd="true"
-                            :attrEntity="ciEntityData.attrEntityData['attr_' + e.element.id]"
-                            :disabled="disabledFn('attr_' + e.element.id)"
-                            :attrData="e.element"
-                            :valueList="getValue(ciEntityData.allCiEntityValue, e, 'valueList')"
-                            @setData="setAttrData(e, e.element, arguments[0], arguments[1])"
-                            @delete="deleteAttrEntity('attr_' + e.element.id, $event)"
-                            @select="selectAttrEntity('attr_' + e.element.id, $event)"
-                          ></AttrInputer>
-                        </div>
-                        <div v-else-if="e.type === 'global'">
-                          <TsFormRadio
-                            v-if="!e.element.isMultiple"
-                            :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
-                            :allowToggle="true"
-                            :dataList="e.element.itemList"
-                            valueName="id"
-                            textName="value"
-                            :validateList="getValidList(e.type, e.element)"
-                            @change="
-                              (val, opt) => {
-                                if (opt) {
-                                  setGlobalAttrData(e.element, [opt], val, e);
-                                } else {
-                                  setGlobalAttrData(e.element, [], val, e);
-                                }
-                              }
-                            "
-                          ></TsFormRadio>
-                          <TsFormCheckbox
-                            v-if="!!e.element.isMultiple"
-                            :value="getValue(ciEntityData.globalAttrEntityData, e, 'valueList')"
-                            :dataList="e.element.itemList"
-                            valueName="id"
-                            textName="value"
-                            :validateList="getValidList(e.type, e.element)"
-                            @change="(val, opt) => setGlobalAttrData(e.element, opt, val, e)"
-                          ></TsFormCheckbox>
-                        </div>
-                        <div v-else>
-                          <TsFormInput
-                            :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
-                            type="textarea"
-                            maxlength="500"
-                            :validateList="getValidList(e.type, e.element)"
-                            @change="(val)=>setConfig(val,'valueList',e)"
-                          ></TsFormInput>
-                        </div>
-                      </template>
-                      <template v-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formCommonComponent'">
+                    <TsRow v-else :gutter="8">
+                      <Col span="10">
                         <TsFormSelect
                           ref="attrHandler"
-                          :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
-                          :dataList="getFormComponent('formCommonComponent')"
-                          textName="label"
-                          valueName="uuid"
+                          :value="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode')"
+                          :dataList="mappingModeList"
                           :firstSelect="false"
+                          transfer
                           border="border"
                           :validateList="getValidList(e.type, e.element)"
-                          transfer
-                          @change="(val)=>setConfig(val,'valueList',e)"
+                          @change="(val)=>setConfig(val,'mappingMode',e)"
                         ></TsFormSelect>
-                      </template>
-                      <template v-else-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formTableComponent'">
-                        <TsRow :gutter="8">
-                          <Col span="12">
-                            <TsFormSelect
+                      </Col>
+                      <Col span="14">
+                        <template v-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') == 'constant'">
+                          <div v-if="e.type === 'attr'">
+                            <AttrInputer
                               ref="attrHandler"
+                              :allowBatchAdd="true"
+                              :attrEntity="ciEntityData.attrEntityData['attr_' + e.element.id]"
+                              :disabled="disabledFn('attr_' + e.element.id)"
+                              :attrData="e.element"
+                              :valueList="getValue(ciEntityData.allCiEntityValue, e, 'valueList')"
+                              @setData="setAttrData(e, e.element, arguments[0], arguments[1])"
+                              @delete="deleteAttrEntity('attr_' + e.element.id, $event)"
+                              @select="selectAttrEntity(e, 'attr_' + e.element.id, $event)"
+                            ></AttrInputer>
+                          </div>
+                          <div v-else-if="e.type === 'global'">
+                            <TsFormRadio
+                              v-if="!e.element.isMultiple"
                               :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
-                              :dataList="getFormComponent('formTableComponent')"
-                              textName="label"
-                              valueName="uuid"
+                              :allowToggle="true"
+                              :dataList="e.element.itemList"
+                              valueName="id"
+                              textName="value"
+                              :validateList="getValidList(e.type, e.element)"
+                              @change="
+                                (val, opt) => {
+                                  if (opt) {
+                                    setGlobalAttrData(e.element, [opt], val, e);
+                                  } else {
+                                    setGlobalAttrData(e.element, [], val, e);
+                                  }
+                                }
+                              "
+                            ></TsFormRadio>
+                            <TsFormCheckbox
+                              v-if="!!e.element.isMultiple"
+                              :value="getValue(ciEntityData.globalAttrEntityData, e, 'valueList')"
+                              :dataList="e.element.itemList"
+                              valueName="id"
+                              textName="value"
+                              :validateList="getValidList(e.type, e.element)"
+                              @change="(val, opt) => setGlobalAttrData(e.element, opt, val, e)"
+                            ></TsFormCheckbox>
+                          </div>
+                          <div v-else>
+                            <TsFormInput
+                              :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
+                              type="textarea"
+                              maxlength="500"
                               :validateList="getValidList(e.type, e.element)"
-                              :firstSelect="false"
-                              transfer
-                              border="border"
                               @change="(val)=>setConfig(val,'valueList',e)"
-                            ></TsFormSelect>
-                          </Col>
-                          <Col span="12">
-                            <div class="formTableComponent pr-lg">
+                            ></TsFormInput>
+                          </div>
+                        </template>
+                        <template v-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formCommonComponent'">
+                          <TsFormSelect
+                            ref="attrHandler"
+                            :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
+                            :dataList="getFormComponent('formCommonComponent')"
+                            textName="label"
+                            valueName="uuid"
+                            :firstSelect="false"
+                            border="border"
+                            :validateList="getValidList(e.type, e.element)"
+                            transfer
+                            @change="(val)=>setConfig(val,'valueList',e)"
+                          ></TsFormSelect>
+                        </template>
+                        <template v-else-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formTableComponent'">
+                          <TsRow :gutter="8">
+                            <Col span="12">
                               <TsFormSelect
                                 ref="attrHandler"
-                                :value="getValue(ciEntityData.allCiEntityValue, e, 'column')"
-                                :dataList="getAttrList(ciEntityData.allCiEntityValue, e)"
+                                :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, 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,'column',e)"
+                                @change="(val)=>setConfig(val,'valueList',e)"
                               ></TsFormSelect>
-                              <Tooltip
-                                max-width="660"
-                                theme="light"
-                                placement="bottom-end"
-                                transfer
-                                class="formTableComponent-tip"
-                              >
-                                <span class="text-href tsfont-info-o"></span>
-                                <div slot="content">
-                                  <div class="pb-sm">{{ $t('message.process.jobpolicycolumn') }}</div>
-                                  <div class="tip-eg">
-                                    <div class="text-center">
-                                      <table border="1" style="border-collapse: collapse; width:50px;">
-                                        <tr>
-                                          <td>A</td>
-                                        </tr>
-                                        <tr>
-                                          <td>B</td>
-                                        </tr>
-                                        <tr>
-                                          <td>C</td>
-                                        </tr>
-                                      </table>
-                                    </div>
-                                    <div class="center-text"></div>
-                                    <div style="width:100px">
-                                      [A,B,C]
+                            </Col>
+                            <Col span="12">
+                              <div class="formTableComponent pr-lg">
+                                <TsFormSelect
+                                  ref="attrHandler"
+                                  :value="getValue(ciEntityData.allCiEntityValue, e, 'column')"
+                                  :dataList="getAttrList(ciEntityData.allCiEntityValue, e)"
+                                  :validateList="getValidList(e.type, e.element)"
+                                  :firstSelect="false"
+                                  transfer
+                                  border="border"
+                                  @change="(val)=>setConfig(val,'column',e)"
+                                ></TsFormSelect>
+                                <Tooltip
+                                  max-width="660"
+                                  theme="light"
+                                  placement="bottom-end"
+                                  transfer
+                                  class="formTableComponent-tip"
+                                >
+                                  <span class="text-href tsfont-info-o"></span>
+                                  <div slot="content">
+                                    <div class="pb-sm">{{ $t('message.process.jobpolicycolumn') }}</div>
+                                    <div class="tip-eg">
+                                      <div class="text-center">
+                                        <table border="1" style="border-collapse: collapse; width:50px;">
+                                          <tr>
+                                            <td>A</td>
+                                          </tr>
+                                          <tr>
+                                            <td>B</td>
+                                          </tr>
+                                          <tr>
+                                            <td>C</td>
+                                          </tr>
+                                        </table>
+                                      </div>
+                                      <div class="center-text"></div>
+                                      <div style="width:100px">
+                                        [A,B,C]
+                                      </div>
                                     </div>
                                   </div>
-                                </div>
-                              </Tooltip>
-                            </div>
-                          </Col>
-                        </TsRow>
-                      </template>
-                    </Col>
-                  </TsRow>
-                  <div v-if="ciData.createPolicy === 'single' && getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formTableComponent'">
-                    <FilterList
-                      ref="attrHandler"
-                      :defaultFilterList="getValue(ciEntityData.allCiEntityValue, e, 'filterList')"
-                      :dataList="getAttrList(ciEntityData.allCiEntityValue, e)"
-                      @setConfig="(val)=>setConfig(val,'filterList', e)"
-                    ></FilterList>
-                  </div>
-                </Col>
-              </TsRow>
+                                </Tooltip>
+                              </div>
+                            </Col>
+                          </TsRow>
+                        </template>
+                      </Col>
+                    </TsRow>
+                    <div v-if="ciData.createPolicy === 'single' && getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formTableComponent'">
+                      <FilterList
+                        ref="attrHandler"
+                        :defaultFilterList="getValue(ciEntityData.allCiEntityValue, e, 'filterList')"
+                        :dataList="getAttrList(ciEntityData.allCiEntityValue, e)"
+                        @setConfig="(val)=>setConfig(val,'filterList', e)"
+                      ></FilterList>
+                    </div>
+                  </Col>
+                </TsRow>
+              </template>
             </div>
           </Panel>
         </Collapse>
@@ -438,7 +440,7 @@ export default {
       }
     },
     //选择引用属性
-    selectAttrEntity(key, attrentity) {
+    selectAttrEntity(item, key, attrentity) {
       if (!this.ciEntityData.attrEntityData[key]) {
         const vo = {};
         vo[key] = { valueList: [], actualValueList: [] };
@@ -456,6 +458,7 @@ export default {
           this.ciEntityData.attrEntityData[key]['valueList'].push(attrentity);
           this.ciEntityData.attrEntityData[key]['actualValueList'].push(attrentity);
         }
+        this.setConfig(valueList, 'valueList', item);
       });
     },
     getValidList(type, data) {
-- 
Gitee


From a17a1202401f18c6cb09f62077fd427c9bd5cd3c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 1 Nov 2023 16:30:38 +0800
Subject: [PATCH 07/16] =?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=9A=E5=85=A8=E5=B1=80=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/node/nodesetting/cmdbsync-edit.vue   | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
index 756a7fc55..9b972bf06 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
@@ -25,12 +25,12 @@
                 >
                   <Col span="4">
                     <template v-if="e.type == 'rel'">
-                      <div class="text-title overflow" :class="{'require-label':!!((e.element.direction == 'from' && e.element.toIsRequired) || (e.element.direction == 'to' && e.element.fromIsRequired))}">
+                      <div class="text-title overflow" :title="e.element.direction === 'from' ? e.element.toLabel : e.element.fromLabel" :class="{'require-label':!!((e.element.direction == 'from' && e.element.toIsRequired) || (e.element.direction == 'to' && e.element.fromIsRequired))}">
                         {{ e.element.direction === 'from' ? e.element.toLabel : e.element.fromLabel }}
                       </div>
                     </template>
                     <template v-else>
-                      <div class="text-title overflow" :class="{'require-label': e.type === 'attr' && !!e.element.isRequired}">
+                      <div class="text-title overflow" :class="{'require-label': e.type === 'attr' && !!e.element.isRequired}" :title="e.element.label">
                         {{ e.element.label }}
                       </div>
                     </template>
@@ -95,7 +95,7 @@
                       </div>
                     </div>
                     <TsRow v-else :gutter="8">
-                      <Col span="10">
+                      <Col span="6">
                         <TsFormSelect
                           ref="attrHandler"
                           :value="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode')"
@@ -107,7 +107,7 @@
                           @change="(val)=>setConfig(val,'mappingMode',e)"
                         ></TsFormSelect>
                       </Col>
-                      <Col span="14">
+                      <Col span="18">
                         <template v-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') == 'constant'">
                           <div v-if="e.type === 'attr'">
                             <AttrInputer
@@ -125,7 +125,7 @@
                           <div v-else-if="e.type === 'global'">
                             <TsFormRadio
                               v-if="!e.element.isMultiple"
-                              :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
+                              :value="getGlobalValueList(ciEntityData.allCiEntityValue, 'global_' + e.element.id)?getGlobalValueList(ciEntityData.allCiEntityValue, 'global_' + e.element.id)[0]:null"
                               :allowToggle="true"
                               :dataList="e.element.itemList"
                               valueName="id"
@@ -134,21 +134,21 @@
                               @change="
                                 (val, opt) => {
                                   if (opt) {
-                                    setGlobalAttrData(e.element, [opt], val, e);
+                                    setGlobalAttrData(e.element, [opt], e);
                                   } else {
-                                    setGlobalAttrData(e.element, [], val, e);
+                                    setGlobalAttrData(e.element, [], e);
                                   }
                                 }
                               "
                             ></TsFormRadio>
                             <TsFormCheckbox
                               v-if="!!e.element.isMultiple"
-                              :value="getValue(ciEntityData.globalAttrEntityData, e, 'valueList')"
+                              :value="getGlobalValueList(ciEntityData.allCiEntityValue, 'global_' + e.element.id)"
                               :dataList="e.element.itemList"
                               valueName="id"
                               textName="value"
                               :validateList="getValidList(e.type, e.element)"
-                              @change="(val, opt) => setGlobalAttrData(e.element, opt, val, e)"
+                              @change="(val, opt) => setGlobalAttrData(e.element, opt, e)"
                             ></TsFormCheckbox>
                           </div>
                           <div v-else>
@@ -325,6 +325,13 @@ export default {
       }
       return value;
     },
+    getGlobalValueList(data, key) {
+      let value = null;
+      if (data && data[key] && data[key]['valueList']) {
+        value = data[key]['valueList'].map(d => d.id);
+      }
+      return value;
+    },
     disabledFn(elementId) {
       if (this.ciEntityData.editableAttrRelIdList && this.ciEntityData.editableAttrRelIdList.length > 0 && !this.ciEntityData.editableAttrRelIdList.includes(elementId)) {
         return true;
@@ -484,7 +491,7 @@ export default {
       }
       return isValid;
     },
-    setGlobalAttrData(attr, opt, value, item) {
+    setGlobalAttrData(attr, opt, item) {
       if (!this.ciEntityData.globalAttrEntityData) {
         this.ciEntityData.globalAttrEntityData = {};
       }
@@ -492,7 +499,7 @@ export default {
         this.ciEntityData.globalAttrEntityData['global_' + attr.id] = {};
       }
       this.$set(this.ciEntityData.globalAttrEntityData['global_' + attr.id], 'valueList', opt);
-      this.setConfig(value, 'valueList', item);
+      this.setConfig(opt, 'valueList', item);
     },
     setAttrData(item, attr, value, actualValue) {
       if (!this.ciEntityData.attrEntityData) {
-- 
Gitee


From 560eb8bc8e361129b6fb0e86408f3fd52c680dac Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 2 Nov 2023 18:10:39 +0800
Subject: [PATCH 08/16] =?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=9A=E6=B7=BB=E5=8A=A0=E5=A4=9A?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/term/en.json   |  11 +-
 src/resources/assets/languages/term/zh.json   |  11 +-
 src/views/pages/cmdb/flow/node/cmdbsync.vue   |   2 +-
 .../nodesetting/cmdbpolicy/filter-list.vue    |   2 +-
 .../flow/node/nodesetting/cmdbsync-dialog.vue | 149 ++++++++----------
 .../flow/node/nodesetting/cmdbsync-edit.vue   | 140 ++++++----------
 .../node/nodesetting/cmdbsync-setting.vue     |   4 +-
 7 files changed, 140 insertions(+), 179 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 4c9984b49..ace6eca88 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -164,7 +164,16 @@
     "resourcebatchsearchtooltip": "Batch search is a keyword fuzzy search, in which the wildcard * is supported for batch search of IP, matching any character, such as 192.168.1.1, 192.168.12.1, and 192.168.123.1",
     "onlybackbone": "Show only backbone relationships",
     "showallrel": "Show all branch relationships",
-    "modemapping": "Model Mapping"
+    "modemapping": "Model Mapping",
+    "ciconfignumber": "Number of configuration items",
+    "relaction": "Relationship strategy",
+    "attrmapping": "Attribute Mapping",
+    "addonedata": "Add a piece of data",
+    "addmoredata": "Add multiple pieces of data",
+    "addonerel": "Add a single relationship",
+    "addmorerel": "Add multiple relationships",
+    "rerunsteptosync": "Fallback Resync",
+    "rerunsteptosynctip": "After the process is rolled back, when it flows back to the current step, resynchronize"
   },
   "process": {
     "workordercenter": "Work Center",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index dc9608be4..399d64b2a 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -164,7 +164,16 @@
     "resourcebatchsearchtooltip": "批量搜索是关键字模糊搜索，其中批量搜索ip时，支持通配符*，匹配任意个字符，例如192.168.*.1可匹配192.168.1.1、192.168.12.1、192.168.123.1",
     "onlybackbone": "只显示主干关系",
     "showallrel": "显示所有分支关系",
-    "modemapping": "模型映射"
+    "modemapping": "模型映射",
+    "ciconfignumber": "配置项数量",
+    "relaction": "关系策略",
+    "attrmapping": "属性映射",
+    "addonedata": "添加一条数据",
+    "addmoredata": "添加多条数据",
+    "addonerel": "添加单个关系",
+    "addmorerel": "添加多个关系",
+    "rerunsteptosync": "回退重新同步",
+    "rerunsteptosynctip": "流程回退后，再次流转至当前步骤时，重新同步"
   },
   "process": {
     "workordercenter": "工单中心",
diff --git a/src/views/pages/cmdb/flow/node/cmdbsync.vue b/src/views/pages/cmdb/flow/node/cmdbsync.vue
index d140a7119..88c28f6f8 100644
--- a/src/views/pages/cmdb/flow/node/cmdbsync.vue
+++ b/src/views/pages/cmdb/flow/node/cmdbsync.vue
@@ -144,7 +144,7 @@ export default {
         stepConfig.workerPolicyConfig = this.$refs.assignData.saveAssignData();
       }
       stepConfig['formSceneUuid'] = this.configData.stepConfig.formSceneUuid || '';
-      if (this.$refs.ciEntityConfig) { //组合工具cmdb
+      if (this.$refs.ciEntityConfig) { //cmdb
         let ciEntityConfig = this.$refs.ciEntityConfig.save();
         this.$set(stepConfig, 'ciEntityConfig', ciEntityConfig);
       }
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 391e9b018..03b71101a 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
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="filter-top pt-sm">
+    <div class="filter-top">
       <span class="pr-sm label">{{ $t('term.dashboard.datafilter') }}</span>
       <TsFormSwitch
         v-model="isActive"
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
index 19fa1bb74..9e14369c2 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
@@ -40,7 +40,7 @@
             <div class="pl-lg">
               <TsFormItem
                 v-if="ciEntityQueue.length < 2"
-                label="配置模型"
+                :label="$t('term.deploy.configurationmodel')"
                 labelPosition="left"
                 required
               >
@@ -52,15 +52,29 @@
                 ></TsFormSelect>
               </TsFormItem>
               <div v-if="ciData.ciId">
-                <TsFormItem label="配置项数量" labelPosition="left">
+                <TsFormItem :label="$t('term.cmdb.ciconfignumber')" labelPosition="left">
                   <TsFormRadio
                     v-model="ciData.createPolicy"
-                    :dataList="createPolicyDataList"
+                    :dataList="ciEntityQueue.length <= 1?createPolicyDataList:createRelDataList"
                     @on-change="(val)=>{
                       changePolicy(val)
                     }"
                   ></TsFormRadio>
                 </TsFormItem>
+                <TsFormItem
+                  v-if="ciEntityQueue.length > 1"
+                  :label="$t('term.cmdb.relaction')"
+                  labelPosition="left"
+                  required
+                >
+                  <TsFormRadio
+                    :dataList="actionDataList"
+                    :value="ciData.action"
+                    @on-change="(val)=>{
+                      setConfig(val,'action')
+                    }"
+                  ></TsFormRadio>
+                </TsFormItem>
                 <template v-if="ciData.createPolicy==='batch'">
                   <TsFormItem v-if="ciData.createPolicy==='batch'" :label="$t('page.foreachtable')" labelPosition="left">
                     <TsFormSelect
@@ -74,7 +88,7 @@
                       transfer
                       border="border"
                       @on-change="(val)=>{
-                        setBatchDataSource(val,'attributeUuid',ciData.batchDataSource)
+                        setBatchDataSource(val,'attributeUuid')
                       }"
                     ></TsFormSelect>
                   </TsFormItem>
@@ -83,25 +97,11 @@
                       ref="attrHandler"
                       :defaultFilterList="ciData.batchDataSource && ciData.batchDataSource.filterList"
                       :dataList="getAttrList(ciData.batchDataSource)"
-                      @setConfig="(val)=> setBatchDataSource(val,'filterList',ciData.batchDataSource)"
+                      @setConfig="(val)=> setBatchDataSource(val,'filterList')"
                     ></FilterList>
                   </TsFormItem>
                 </template>
-                <TsFormItem
-                  v-if="ciEntityQueue.length > 1"
-                  label="关系策略"
-                  labelPosition="left"
-                  required
-                >
-                  <TsFormRadio
-                    :dataList="actionDataList"
-                    :value="ciData.action"
-                    @on-change="(val)=>{
-                      setConfig(val,'action')
-                    }"
-                  ></TsFormRadio>
-                </TsFormItem>
-                <TsFormItem label="属性映射" labelPosition="top">
+                <TsFormItem :label="$t('term.cmdb.attrmapping')" labelPosition="top">
                   <div class="pt-sm">
                     <CmdbsyncEdit
                       v-if="!loadingShow"
@@ -160,9 +160,7 @@ export default {
         createPolicy: 'single', 
         batchDataSource: {},
         mappingList: [],
-        attrEntityData: {}, 
-        relEntityData: {}, 
-        globalAttrEntityData: {} 
+        relEntityData: {}
       },
       isShow: true,
       ciConfig: {
@@ -178,11 +176,21 @@ export default {
       createPolicyDataList: [
         {
           value: 'single',
-          text: '添加一条数据'
+          text: this.$t('term.cmdb.addonedata')
+        },
+        {
+          value: 'batch',
+          text: this.$t('term.cmdb.addmoredata')
+        }
+      ],
+      createRelDataList: [
+        {
+          value: 'single',
+          text: this.$t('term.cmdb.addonerel')
         },
         {
           value: 'batch',
-          text: '添加多条数据'
+          text: this.$t('term.cmdb.addmorerel')
         }
       ],
       actionDataList: [
@@ -247,7 +255,7 @@ export default {
                 if (m.key.indexOf('rel') > -1) {
                   this.$set(cientity.relEntityData, m.key, m);
                 } else {
-                  this.$set(cientity.allCiEntityValue, m.key, m);
+                  this.$set(cientity.allAttrEntityData, m.key, m);
                 }
               });
             }
@@ -292,10 +300,8 @@ export default {
               ciIcon: ci.icon,
               createPolicy: 'single',
               batchDataSource: {},
-              attrEntityData: {},
               relEntityData: {},
-              globalAttrEntityData: {},
-              allCiEntityValue: {}
+              allAttrEntityData: {}
             };
             cientity['_elementList'] = await this.getElementByCiId(this.ciData.ciId);
             cientity['_uniqueAttrList'] = await this.getCiUniqueByCiId(this.ciData.ciId);
@@ -411,11 +417,9 @@ export default {
               createPolicy: 'single',
               batchDataSource: {},
               action: 'append',
-              attrEntityData: {},
               relEntityData: {},
-              globalAttrEntityData: {},
               _disableRel: 'rel' + direction + '_' + relId, //标记哪个关系不允许添加或选择
-              allCiEntityValue: {} //所有的属性
+              allAttrEntityData: {} //所有的属性
             };
             newCiEntity['_elementList'] = await this.getElementByCiId(ciId);
             newCiEntity['_uniqueAttrList'] = await this.getCiUniqueByCiId(ciId);
@@ -509,30 +513,6 @@ export default {
               currentCiEntity['relEntityData']['rel' + cientity._direction + '_' + cientity._relId] = { valueList: [] };
             }
             currentCiEntity['relEntityData']['rel' + cientity._direction + '_' + cientity._relId]['valueList'].push(newRelEntity);
-          } else if (cientity['_attrId']) {
-            if (!currentCiEntity['attrEntityData']['attr_' + cientity._attrId]) {
-              const tmp = {};
-              tmp['attr_' + cientity._attrId] = {};
-              Object.assign(currentCiEntity['attrEntityData'], tmp);
-              Object.assign(currentCiEntity['attrEntityData']['attr_' + cientity._attrId], { type: cientity['_attrType'], config: cientity['_attrConfig'], valueList: [], actualValueList: [] });
-            }
-            const pos = currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'].length;
-            this.$set(currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'], pos, cientity);
-          }
-        } else {
-          //更新临时数据时，需要更新attr的数据，因为显示字段可能有变化，而关系用不到可能发生变化的字段，所以暂时不用更新，将来可能要补充
-          if (cientity['_attrId']) {
-            if (!currentCiEntity['attrEntityData']['attr_' + cientity._attrId]) {
-              const k = {};
-              k['attr_' + cientity._attrId] = { type: cientity['_attrType'], config: cientity['_attrConfig'], valueList: [] };
-              this.$set(currentCiEntity, 'attrEntityData', k);
-            }
-            for (let index = 0; index < currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'].length; index++) {
-              const d = currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'][index];
-              if (d.uuid && d.uuid === cientity.uuid) {
-                this.$set(currentCiEntity['attrEntityData']['attr_' + cientity._attrId]['valueList'], index, cientity);
-              }
-            }
           }
         }
         //标记为已保存的新配置项，用于点击“取消”后判断是否需要删除数据
@@ -552,18 +532,19 @@ export default {
     setConfig(val, attr) {
       this.$set(this.ciEntityQueue[this.ciEntityQueue.length - 1], attr, val);
     },
-    setBatchDataSource(val, attr, config) {
-      let batchDataSource = config || {};
+    setBatchDataSource(val, attr) {
       let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
-      this.$set(batchDataSource, attr, val);
       if (ciEntity) {
-        this.$set(ciEntity, 'batchDataSource', batchDataSource);
-        this.$set(this.ciData, 'batchDataSource', batchDataSource);
-        Object.keys(ciEntity.allCiEntityValue).forEach(key => {
-          if (ciEntity.allCiEntityValue[key].mappingMode === 'formTableComponent') {
-            this.$set(ciEntity.allCiEntityValue[key], 'ValueList', val);
-            this.$set(ciEntity.allCiEntityValue[key], 'column', '');
-            this.$set(ciEntity.allCiEntityValue[key], 'filterList', []);
+        if (!ciEntity.batchDataSource) {
+          this.$set(ciEntity, 'batchDataSource', {});
+        }
+        this.$set(ciEntity.batchDataSource, attr, val);
+        this.$set(this.ciData, 'batchDataSource', ciEntity.batchDataSource);
+        Object.keys(ciEntity.allAttrEntityData).forEach(key => {
+          if (ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent') {
+            this.$set(ciEntity.allAttrEntityData[key], 'valueList', [val]);
+            this.$set(ciEntity.allAttrEntityData[key], 'column', '');
+            this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
           }
         });
       }
@@ -600,16 +581,16 @@ export default {
     changePolicy(val) {
       let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
       if (ciEntity) {
-        Object.keys(ciEntity.allCiEntityValue).forEach(key => {
-          if (ciEntity.allCiEntityValue[key].mappingMode === 'formTableComponent') {
-            this.$set(ciEntity.allCiEntityValue[key], 'valueList', null);
-            this.$set(ciEntity.allCiEntityValue[key], 'column', '');
-            this.$set(ciEntity.allCiEntityValue[key], 'filterList', []);
+        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', []);
           }
         });
-        this.$set(this.ciData, 'batchDataSource', {});
-        this.$set(ciEntity, 'batchDataSource', {});
-        this.setConfig(val, 'createPolicy');
       }
     },
     save() {
@@ -636,20 +617,20 @@ export default {
         if (item.hasOwnProperty('action')) {
           config.action = item.action;
         }
-        if (item.hasOwnProperty('allCiEntityValue')) {
-          if (!this.$utils.isEmpty(item.allCiEntityValue)) {
-            Object.keys(item.allCiEntityValue).forEach(key => {
-              if (!this.$utils.isEmpty(item.allCiEntityValue[key].valueList)) {
+        if (item.hasOwnProperty('allAttrEntityData')) {
+          if (!this.$utils.isEmpty(item.allAttrEntityData)) {
+            Object.keys(item.allAttrEntityData).forEach(key => {
+              if (!this.$utils.isEmpty(item.allAttrEntityData[key].valueList)) {
                 let objectData = {
                   key: key,
-                  mappingMode: item.allCiEntityValue[key].mappingMode,
-                  valueList: item.allCiEntityValue[key].valueList 
+                  mappingMode: item.allAttrEntityData[key].mappingMode,
+                  valueList: item.allAttrEntityData[key].valueList 
                 };
-                if (item.allCiEntityValue[key].hasOwnProperty('column')) {
-                  objectData.column = item.allCiEntityValue[key].column;
+                if (item.allAttrEntityData[key].hasOwnProperty('column')) {
+                  objectData.column = item.allAttrEntityData[key].column;
                 }
-                if (item.allCiEntityValue[key].hasOwnProperty('filterList')) {
-                  objectData.filterList = item.allCiEntityValue[key].filterList;
+                if (item.allAttrEntityData[key].hasOwnProperty('filterList')) {
+                  objectData.filterList = item.allAttrEntityData[key].filterList;
                 }
                 config.mappingList.push(objectData);
               }
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
index 9b972bf06..2c0a2ce9b 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
@@ -1,11 +1,5 @@
 <template>
   <div>
-    <Loading
-      v-if="isLoading"
-      :text="$t('page.validating')"
-      :loadingShow="isLoading"
-      type="fix"
-    ></Loading>
     <div>
       <div class="tsForm tsForm-border-border ivu-form-label-right">
         <Collapse v-model="openPanel" simple>
@@ -98,26 +92,29 @@
                       <Col span="6">
                         <TsFormSelect
                           ref="attrHandler"
-                          :value="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode')"
+                          :value="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode')"
                           :dataList="mappingModeList"
                           :firstSelect="false"
                           transfer
                           border="border"
                           :validateList="getValidList(e.type, e.element)"
-                          @change="(val)=>setConfig(val,'mappingMode',e)"
+                          @change="(val)=>{
+                            changeMappingMode(val,e)
+                            setConfig(val,'mappingMode',e)
+                          }"
                         ></TsFormSelect>
                       </Col>
                       <Col span="18">
-                        <template v-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') == 'constant'">
+                        <template v-if="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode') == 'constant'">
                           <div v-if="e.type === 'attr'">
                             <AttrInputer
                               ref="attrHandler"
                               :allowBatchAdd="true"
-                              :attrEntity="ciEntityData.attrEntityData['attr_' + e.element.id]"
+                              :attrEntity="ciEntityData.allAttrEntityData['attr_' + e.element.id]"
                               :disabled="disabledFn('attr_' + e.element.id)"
                               :attrData="e.element"
-                              :valueList="getValue(ciEntityData.allCiEntityValue, e, 'valueList')"
-                              @setData="setAttrData(e, e.element, arguments[0], arguments[1])"
+                              :valueList="getValue(ciEntityData.allAttrEntityData, e, 'valueList')"
+                              @setData="setConfig(arguments[0],'valueList', e)"
                               @delete="deleteAttrEntity('attr_' + e.element.id, $event)"
                               @select="selectAttrEntity(e, 'attr_' + e.element.id, $event)"
                             ></AttrInputer>
@@ -125,7 +122,7 @@
                           <div v-else-if="e.type === 'global'">
                             <TsFormRadio
                               v-if="!e.element.isMultiple"
-                              :value="getGlobalValueList(ciEntityData.allCiEntityValue, 'global_' + e.element.id)?getGlobalValueList(ciEntityData.allCiEntityValue, 'global_' + e.element.id)[0]:null"
+                              :value="getGlobalValueList(ciEntityData.allAttrEntityData, 'global_' + e.element.id)?getGlobalValueList(ciEntityData.allAttrEntityData, 'global_' + e.element.id)[0]:null"
                               :allowToggle="true"
                               :dataList="e.element.itemList"
                               valueName="id"
@@ -143,7 +140,7 @@
                             ></TsFormRadio>
                             <TsFormCheckbox
                               v-if="!!e.element.isMultiple"
-                              :value="getGlobalValueList(ciEntityData.allCiEntityValue, 'global_' + e.element.id)"
+                              :value="getGlobalValueList(ciEntityData.allAttrEntityData, 'global_' + e.element.id)"
                               :dataList="e.element.itemList"
                               valueName="id"
                               textName="value"
@@ -153,7 +150,7 @@
                           </div>
                           <div v-else>
                             <TsFormInput
-                              :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
+                              :value="getValue(ciEntityData.allAttrEntityData, e, 'valueList')?getValue(ciEntityData.allAttrEntityData, e, 'valueList')[0]:null"
                               type="textarea"
                               maxlength="500"
                               :validateList="getValidList(e.type, e.element)"
@@ -161,10 +158,10 @@
                             ></TsFormInput>
                           </div>
                         </template>
-                        <template v-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formCommonComponent'">
+                        <template v-if="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode') === 'formCommonComponent'">
                           <TsFormSelect
                             ref="attrHandler"
-                            :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
+                            :value="getValue(ciEntityData.allAttrEntityData, e, 'valueList')?getValue(ciEntityData.allAttrEntityData, e, 'valueList')[0]:null"
                             :dataList="getFormComponent('formCommonComponent')"
                             textName="label"
                             valueName="uuid"
@@ -175,12 +172,12 @@
                             @change="(val)=>setConfig(val,'valueList',e)"
                           ></TsFormSelect>
                         </template>
-                        <template v-else-if="getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formTableComponent'">
+                        <template v-else-if="getValue(ciEntityData.allAttrEntityData, e, 'mappingMode') === 'formTableComponent'">
                           <TsRow :gutter="8">
-                            <Col span="12">
+                            <Col v-if="ciData.createPolicy === 'single'" span="12">
                               <TsFormSelect
                                 ref="attrHandler"
-                                :value="getValue(ciEntityData.allCiEntityValue, e, 'valueList')?getValue(ciEntityData.allCiEntityValue, e, 'valueList')[0]:null"
+                                :value="getValue(ciEntityData.allAttrEntityData, e, 'valueList')?getValue(ciEntityData.allAttrEntityData, e, 'valueList')[0]:null"
                                 :dataList="getFormComponent('formTableComponent')"
                                 textName="label"
                                 valueName="uuid"
@@ -191,12 +188,12 @@
                                 @change="(val)=>setConfig(val,'valueList',e)"
                               ></TsFormSelect>
                             </Col>
-                            <Col span="12">
+                            <Col :span="ciData.createPolicy === 'single'?12:'24'">
                               <div class="formTableComponent pr-lg">
                                 <TsFormSelect
                                   ref="attrHandler"
-                                  :value="getValue(ciEntityData.allCiEntityValue, e, 'column')"
-                                  :dataList="getAttrList(ciEntityData.allCiEntityValue, e)"
+                                  :value="getValue(ciEntityData.allAttrEntityData, e, 'column')"
+                                  :dataList="getAttrList(ciEntityData.allAttrEntityData, e)"
                                   :validateList="getValidList(e.type, e.element)"
                                   :firstSelect="false"
                                   transfer
@@ -240,11 +237,11 @@
                         </template>
                       </Col>
                     </TsRow>
-                    <div v-if="ciData.createPolicy === 'single' && getValue(ciEntityData.allCiEntityValue, e, 'mappingMode') === 'formTableComponent'">
+                    <div v-if="ciData.createPolicy === 'single' && getValue(ciEntityData.allAttrEntityData, e, 'mappingMode') === 'formTableComponent'" class="pt-sm">
                       <FilterList
                         ref="attrHandler"
-                        :defaultFilterList="getValue(ciEntityData.allCiEntityValue, e, 'filterList')"
-                        :dataList="getAttrList(ciEntityData.allCiEntityValue, e)"
+                        :defaultFilterList="getValue(ciEntityData.allAttrEntityData, e, 'filterList')"
+                        :dataList="getAttrList(ciEntityData.allAttrEntityData, e)"
                         @setConfig="(val)=>setConfig(val,'filterList', e)"
                       ></FilterList>
                     </div>
@@ -284,7 +281,6 @@ export default {
       openPanel: ['global', 'unique', 'manual', 'description'],
       relCiList: [], //关系的所有下游模型列表
       isRelPopShow: {},
-      isLoading: false,
       mappingModeList: [
         {
           text: this.$t('page.constant'),
@@ -406,8 +402,8 @@ export default {
     //删除选中的属性
     deleteAttrEntity(key, attrentity) {
       //删除引用属性
-      if (this.ciEntityData.attrEntityData[key]) {
-        let valueList = this.ciEntityData.attrEntityData[key]['valueList'];
+      if (this.ciEntityData.allAttrEntityData[key]) {
+        let valueList = this.ciEntityData.allAttrEntityData[key]['valueList'];
         if (valueList) {
           let j = -1;
           valueList.forEach((v, i) => {
@@ -422,50 +418,24 @@ export default {
             }
           });
           if (j > -1) {
-            this.$delete(this.ciEntityData.attrEntityData[key]['valueList'], j);
+            this.$delete(this.ciEntityData.allAttrEntityData[key]['valueList'], j);
           }
         }
-        let actualValueList = this.ciEntityData.attrEntityData[key]['actualValueList'];
-        if (actualValueList) {
-          let j = -1;
-          actualValueList.forEach((v, i) => {
-            if (typeof v == 'string' || typeof v == 'number') {
-              if (v == attrentity.uuid || v == attrentity.id) {
-                j = i;
-              }
-            } else if (typeof v == 'object') {
-              if (v.uuid == attrentity.uuid || v.id == attrentity.id) {
-                j = i;
-              }
-            }
-          });
-          if (j > -1) {
-            this.$delete(this.ciEntityData.attrEntityData[key]['actualValueList'], j);
-          }
-        }
-        this.$emit('remove', attrentity);
       }
     },
     //选择引用属性
     selectAttrEntity(item, key, attrentity) {
-      if (!this.ciEntityData.attrEntityData[key]) {
-        const vo = {};
-        vo[key] = { valueList: [], actualValueList: [] };
-        Object.assign(this.ciEntityData.attrEntityData, vo);
-      }
-      if (!this.ciEntityData.attrEntityData[key]['valueList']) {
-        this.$set(this.ciEntityData.attrEntityData[key], 'valueList', []);
+      if (!this.ciEntityData.allAttrEntityData[key]) {
+        Object.assign(this.ciEntityData.allAttrEntityData, key, {});
       }
-      if (!this.ciEntityData.attrEntityData[key]['actualValueList']) {
-        this.$set(this.ciEntityData.attrEntityData[key], 'actualValueList', []);
+      if (!this.ciEntityData.allAttrEntityData[key]['valueList']) {
+        this.$set(this.ciEntityData.allAttrEntityData[key], 'valueList', []);
       }
       this.$nextTick(() => {
-        let valueList = this.ciEntityData.attrEntityData[key]['valueList'];
+        let valueList = this.ciEntityData.allAttrEntityData[key]['valueList'];
         if (valueList.findIndex(v => (typeof v == 'object' && (v.uuid == attrentity.uuid || v.id == attrentity.id)) || (typeof v == 'number' && v == attrentity.id)) == -1) {
-          this.ciEntityData.attrEntityData[key]['valueList'].push(attrentity);
-          this.ciEntityData.attrEntityData[key]['actualValueList'].push(attrentity);
+          this.ciEntityData.allAttrEntityData[key]['valueList'].push(attrentity);
         }
-        this.setConfig(valueList, 'valueList', item);
       });
     },
     getValidList(type, data) {
@@ -492,31 +462,18 @@ export default {
       return isValid;
     },
     setGlobalAttrData(attr, opt, item) {
-      if (!this.ciEntityData.globalAttrEntityData) {
-        this.ciEntityData.globalAttrEntityData = {};
+      if (!this.ciEntityData.allAttrEntityData) {
+        this.ciEntityData.allAttrEntityData = {};
       }
-      if (!this.ciEntityData.globalAttrEntityData['global_' + attr.id]) {
-        this.ciEntityData.globalAttrEntityData['global_' + attr.id] = {};
+      if (!this.ciEntityData.allAttrEntityData['global_' + attr.id]) {
+        this.ciEntityData.allAttrEntityData['global_' + attr.id] = {};
       }
-      this.$set(this.ciEntityData.globalAttrEntityData['global_' + attr.id], 'valueList', opt);
+      this.$set(this.ciEntityData.allAttrEntityData['global_' + attr.id], 'valueList', opt);
       this.setConfig(opt, 'valueList', item);
     },
-    setAttrData(item, attr, value, actualValue) {
-      if (!this.ciEntityData.attrEntityData) {
-        this.ciEntityData.attrEntityData = {};
-      }
-      if (!this.ciEntityData.attrEntityData['attr_' + attr.id]) {
-        this.ciEntityData.attrEntityData['attr_' + attr.id] = {};
-      }
-      this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'config', attr.config);
-      this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'type', attr.type);
-      this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'valueList', value);
-      this.$set(this.ciEntityData.attrEntityData['attr_' + attr.id], 'actualValueList', actualValue);
-      this.setConfig(value, 'valueList', item);
-    },
     setConfig(value, attrName, item) {
-      if (!this.ciEntityData.allCiEntityValue) {
-        this.ciEntityData.allCiEntityValue = {};
+      if (!this.ciEntityData.allAttrEntityData) {
+        this.ciEntityData.allAttrEntityData = {};
       }
       let key = null;
       if (item.type === 'des') {
@@ -524,20 +481,25 @@ export default {
       } else {
         key = item.type + '_' + item.element.id;
       }
-      if (!this.ciEntityData.allCiEntityValue[key]) {
-        this.$set(this.ciEntityData.allCiEntityValue, key, {});
+      if (!this.ciEntityData.allAttrEntityData[key]) {
+        this.$set(this.ciEntityData.allAttrEntityData, key, {});
       }
-      if (!this.ciEntityData.allCiEntityValue[key]) {
-        this.$set(this.ciEntityData.allCiEntityValue, key, {});
+      if (!this.ciEntityData.allAttrEntityData[key]) {
+        this.$set(this.ciEntityData.allAttrEntityData, key, {});
       }
       if (attrName === 'valueList') {
         if (Array.isArray(value)) {
-          this.$set(this.ciEntityData.allCiEntityValue[key], attrName, value);
+          this.$set(this.ciEntityData.allAttrEntityData[key], attrName, value);
         } else {
-          this.$set(this.ciEntityData.allCiEntityValue[key], attrName, [value]);
+          this.$set(this.ciEntityData.allAttrEntityData[key], attrName, [value]);
         }
       } else {
-        this.$set(this.ciEntityData.allCiEntityValue[key], attrName, value);
+        this.$set(this.ciEntityData.allAttrEntityData[key], attrName, value);
+      }
+    },
+    changeMappingMode(val, e) {
+      if (val === 'formTableComponent' && this.ciEntityData.batchDataSource && this.ciEntityData.batchDataSource.attributeUuid) {
+        this.setConfig(this.ciEntityData.batchDataSource.attributeUuid, 'valueList', e);
       }
     }
   },
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 75a2cead1..195dac8fc 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
@@ -3,10 +3,10 @@
     <div class="control-box">
       <div class="control-setting">
         <span class="label">
-          <span>回退重新同步</span>
+          <span>{{ $t('term.cmdb.rerunsteptosync') }}</span>
           <Tooltip
             max-width="300"
-            content="流程回退后，再次流转至当前步骤时，重新同步"
+            :content="$t('term.cmdb.rerunsteptosynctip')"
             theme="light"
             placement="bottom"
             :transfer="true"
-- 
Gitee


From 43c09e1a6a6de38f543823e99771035357c671c2 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 3 Nov 2023 11:07:12 +0800
Subject: [PATCH 09/16] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20#[978033245126?=
 =?UTF-8?q?656]ITSM=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0CMDB=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=8D=95=E4=B8=8E?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8F=8A=E6=A8=A1=E5=9E=8B=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=9A=84=E6=98=A0=E5=B0=84=E5=85=B3=E7=B3=BB=EF=BC=9B=E6=9C=80?=
 =?UTF-8?q?=E7=BB=88=E8=B0=83=E7=94=A8CMDB=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=86=E6=95=B0=E6=8D=AE=E5=86=99=E5=85=A5C=20http://192.168?=
 =?UTF-8?q?.0.96:8090/demo/rdm.html#/story-detail/939050947543040/93905094?=
 =?UTF-8?q?7543042/978033245126656?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => cmdbpolicy}/cmdbsync-dialog.vue      | 22 ++++++++++++-------
 .../{ => cmdbpolicy}/cmdbsync-edit.vue        |  2 +-
 .../node/nodesetting/cmdbsync-setting.vue     |  4 ++--
 3 files changed, 17 insertions(+), 11 deletions(-)
 rename src/views/pages/cmdb/flow/node/nodesetting/{ => cmdbpolicy}/cmdbsync-dialog.vue (97%)
 rename src/views/pages/cmdb/flow/node/nodesetting/{ => cmdbpolicy}/cmdbsync-edit.vue (99%)

diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue
similarity index 97%
rename from src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
rename to src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue
index 9e14369c2..a1c63e761 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-dialog.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue
@@ -146,7 +146,7 @@ export default {
     TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
     TsFormRadio: resolve => require(['@/resources/plugins/TsForm/TsFormRadio'], resolve),
     CmdbsyncEdit: resolve => require(['./cmdbsync-edit.vue'], resolve),
-    FilterList: resolve => require(['./cmdbpolicy/filter-list.vue'], resolve)
+    FilterList: resolve => require(['./filter-list.vue'], resolve)
   },
   props: {
     configList: Array
@@ -540,13 +540,19 @@ export default {
         }
         this.$set(ciEntity.batchDataSource, attr, val);
         this.$set(this.ciData, 'batchDataSource', ciEntity.batchDataSource);
-        Object.keys(ciEntity.allAttrEntityData).forEach(key => {
-          if (ciEntity.allAttrEntityData[key].mappingMode === 'formTableComponent') {
-            this.$set(ciEntity.allAttrEntityData[key], 'valueList', [val]);
-            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', '');
+              this.$set(ciEntity.allAttrEntityData[key], 'filterList', []);
+            }
+          });
+        }
       }
     },
     getFormTableComponent() { //获取表单table组件
diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue
similarity index 99%
rename from src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
rename to src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue
index 2c0a2ce9b..8e67d8b74 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-edit.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue
@@ -264,7 +264,7 @@ 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(['./cmdbpolicy/filter-list.vue'], resolve)
+    FilterList: resolve => require(['./filter-list.vue'], resolve)
   },
   props: {
     ciData: Object,
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 195dac8fc..1f1142c5d 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbsync-setting.vue
@@ -56,7 +56,7 @@ export default {
   components: {
     TsFormSwitch: resolve => require(['@/resources/plugins/TsForm/TsFormSwitch'], resolve),
     TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
-    CmdbsyncDialog: resolve => require(['./cmdbsync-dialog.vue'], resolve)
+    CmdbsyncDialog: resolve => require(['./cmdbpolicy/cmdbsync-dialog.vue'], resolve)
   },
   props: {
     defaultCiEntityConfig: Object
@@ -71,7 +71,7 @@ export default {
         rerunStepToSync: 0,
         configList: []
       },
-      startCiEntity: {},
+      startCiEntity: {}, //起始模型数据
       isValid: true //校验
     };
   },
-- 
Gitee


From 91af3d3ba129ecf952662b93cde03ecb3584012e Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 3 Nov 2023 17:23:14 +0800
Subject: [PATCH 10/16] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=9A=20cmdb=E5=90=8C=E6=AD=A5=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormMaker/formedit/view/select.vue        |   2 +-
 .../pages/process/task/processdetail/index.js |   4 +-
 ...-cientitysync.vue => process-cmdbsync.vue} | 104 ++++--------------
 .../workorder/base-setting.vue                |   2 -
 4 files changed, 22 insertions(+), 90 deletions(-)
 rename src/views/pages/process/task/processdetail/{process-cientitysync.vue => process-cmdbsync.vue} (87%)

diff --git a/src/resources/components/FormMaker/formedit/view/select.vue b/src/resources/components/FormMaker/formedit/view/select.vue
index edf0a2b2f..1fdd13b4d 100755
--- a/src/resources/components/FormMaker/formedit/view/select.vue
+++ b/src/resources/components/FormMaker/formedit/view/select.vue
@@ -107,7 +107,7 @@ export default {
         let param = {
           matrixUuid: config.matrixUuid,
           keywordColumn: config.mapping.text,
-          valueField: setting.mapping.value,
+          valueField: config.mapping.value,
           textField: config.mapping.text,
           needPage: false
         };
diff --git a/src/views/pages/process/task/processdetail/index.js b/src/views/pages/process/task/processdetail/index.js
index c3bd06eb5..09733d719 100644
--- a/src/views/pages/process/task/processdetail/index.js
+++ b/src/views/pages/process/task/processdetail/index.js
@@ -5,7 +5,7 @@ import changehandle from './process-changehandle';
 import event from './process-event'; //事件
 import autoexec from './process-autoexec'; 
 import timer from './process-timer';
-import cientitysync from './process-cientitysync';
+import cmdbsync from './process-cmdbsync';
 export default {
   omnipotent,
   automatic,
@@ -14,5 +14,5 @@ export default {
   event,
   autoexec,
   timer,
-  cientitysync
+  cmdbsync
 };
diff --git a/src/views/pages/process/task/processdetail/process-cientitysync.vue b/src/views/pages/process/task/processdetail/process-cmdbsync.vue
similarity index 87%
rename from src/views/pages/process/task/processdetail/process-cientitysync.vue
rename to src/views/pages/process/task/processdetail/process-cmdbsync.vue
index cd28757dd..bcbc2e487 100644
--- a/src/views/pages/process/task/processdetail/process-cientitysync.vue
+++ b/src/views/pages/process/task/processdetail/process-cmdbsync.vue
@@ -123,9 +123,6 @@
                       {{ actionConfig.copyprocesstask }}
                     </DropdownItem>
                     <!-- 复制上报 -->
-                    <DropdownItem v-if="knowledgeConfig && knowledgeConfig.isTransferKnowledge == 1" @click.native="createKnowledge">
-                      转为知识文档
-                    </DropdownItem>
                   </DropdownMenu>
                 </Dropdown>
               </span>
@@ -148,39 +145,25 @@
               <!-- 回退_end -->
               <!-- 流转_start -->
               <span v-if="actionConfig.complete" class="action-item">
-                <template v-if="completeAuth">
-                  <!-- 接下来步骤大于1个，弹窗选择 -->
-                  <Button
-                    v-if="nextStepList.length > 1"
-                    icon="tsfont tsfont-refresh"
-                    type="primary"
-                    :disabled="disabledConfig.completing"
-                    @click="completeTask"
-                  >{{ actionConfig.complete }}</Button>
-                  <!-- 接下来步骤1个 直接选择-->
-                  <Button
-                    v-else-if="nextStepList.length == 1"
-                    icon="tsfont tsfont-refresh"
-                    type="primary"
-                    :disabled="disabledConfig.completing"
-                    :title="nextStepList[0].name ? nextStepList[0].flowDirection + nextStepList[0].name : null"
-                    @click="completeStep(nextStepList[0])"
-                  >
-                    <div class="overflow" style="max-width:150px">{{ nextStepList[0].aliasName || actionConfig.complete }}</div>
-                  </Button>
-                </template>
-                <Tooltip
-                  v-else
-                  placement="bottom-end"
-                  :content="completeErrorText"
-                  transfer
+                <!-- 接下来步骤大于1个，弹窗选择 -->
+                <Button
+                  v-if="nextStepList.length > 1"
+                  icon="tsfont tsfont-refresh"
+                  type="primary"
+                  :disabled="disabledConfig.completing"
+                  @click="completeTask"
+                >{{ actionConfig.complete }}</Button>
+                <!-- 接下来步骤1个 直接选择-->
+                <Button
+                  v-else-if="nextStepList.length == 1"
+                  icon="tsfont tsfont-refresh"
+                  type="primary"
+                  :disabled="disabledConfig.completing"
+                  :title="nextStepList[0].name ? nextStepList[0].flowDirection + nextStepList[0].name : null"
+                  @click="completeStep(nextStepList[0])"
                 >
-                  <Button
-                    icon="tsfont tsfont-refresh"
-                    type="primary"
-                    :disabled="true"
-                  >{{ actionConfig.complete }}</Button>
-                </Tooltip>
+                  <div class="overflow" style="max-width:150px">{{ nextStepList[0].aliasName || actionConfig.complete }}</div>
+                </Button>
               </span>
               <!-- 流转_end -->
               <!-- 评分前回退 -->
@@ -248,8 +231,6 @@
                       :backStepList="backStepList"
                       :selectBackConfig="selectBackConfig"
                       :currentProcessTaskStep="processTask.currentProcessTaskStep"
-                      :completeAuth="completeAuth"
-                      :completeErrorText="completeErrorText"
                       :isDisableCommet="isDisableCommet"
                       @completeTask="completeTask"
                       @completeStep="completeStep"
@@ -266,7 +247,6 @@
                 :actionConfig="actionConfig"
                 :addAssist="addAssist"
                 :processTaskConfig="processTaskConfig"
-                :knowledgeConfig="knowledgeConfig"
                 :replaceableTextConfig="replaceableTextConfig"
                 :isOrderRight="isOrderRight"
                 :priorityList="priorityList"
@@ -442,7 +422,6 @@
     <!-- 转报 -->
     <RanferreportDialog v-if="actionConfig.tranferreport" :isShow.sync="ranferreportModel" :processTaskConfig="processTaskConfig"></RanferreportDialog>
     <RedoDialog :isShow.sync="redoModel" :processTaskConfig="processTaskConfig"></RedoDialog>
-    <KnowledgeDialog :isShow.sync="knowledgeModel" :processTaskConfig="processTaskConfig"></KnowledgeDialog>
   </div>
 </template>
 
@@ -453,8 +432,6 @@ import itemDialog from './workorder/actiondialog/index.js';
 import detailmixin from './detailmixin.js';
 import FooterOperationBtn from './workorder/footer-operation-btn.vue'; // 底部操作按钮组件
 
-let Vm;
-
 export default {
   //工单处理
   name: '',
@@ -487,24 +464,16 @@ export default {
     return {
       ranferreportModel: false, // 转报弹框
       redoModel: false, //评分工单回退
-      knowledgeModel: false,
-      knowledgeConfig: null,
       transferStepList: [], //转交步骤列表
       transferId: null,
       handlerStepInfo: null,
-      completeAuth: false, //人工流转权限判断
-      completeErrorText: '正在执行，无法人工流转',
       taskAlertHeight: 0 // taskAlert高度
-      // taskForm: null, //工单表单查看权限
-    
     };
   },
   created() {
   },
   mounted() {
     this.getAllData();
-    this.getKnowledgeDetail(); //转知识权限
-    Vm = this;
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -515,11 +484,6 @@ export default {
       //初始化当前步骤:cmdb同步
       if (this.processTaskStepConfig) {
         this.handlerStepInfo = this.processTaskStepConfig.handlerStepInfo || null;
-        if (this.handlerStepInfo) {
-          this.completeAuth = !(this.handlerStepInfo.status == 'pending' || this.handlerStepInfo.status == 'running');
-        } else {
-          this.completeAuth = true;
-        }
       }
     },
     async completeTask() {
@@ -633,28 +597,6 @@ export default {
     //评分前回退
     redoTask() {
       this.redoModel = true;
-    },
-    createKnowledge() {
-      //创建知识
-      this.knowledgeModel = true;
-    },
-    getKnowledgeDetail() {
-      //获取工单知识信息
-      let moduleList = JSON.parse(localStorage.getItem('moduleList'));
-      let find = moduleList.find(d => d.moduleId == 'knowledge');
-      if (find && (this.processTask.status == 'succeed' || this.processTask.status == 'scored')) {
-        //工单：完成或者评分状态时，都需要调知识接口
-        let data = {
-          invokeId: this.processTaskId,
-          source: 'processtask'
-        };
-        this.$api.process.processtask.knowledgeDetail(data).then(res => {
-          if (res.Status == 'OK') {
-            let obj = res.Return;
-            this.knowledgeConfig = obj;
-          }
-        });
-      }
     }
   },
   computed: {
@@ -662,7 +604,7 @@ export default {
       //更多操作按钮
       let actionConfig = this.actionConfig;
       let moreAction = false;
-      if (actionConfig.createsubtask || actionConfig.retreat || actionConfig.abortprocessTask || actionConfig.recoverprocessTask || actionConfig.urge || actionConfig.tranferreport || actionConfig.copyprocesstask || (this.knowledgeConfig && this.knowledgeConfig.isTransferKnowledge == 1)) {
+      if (actionConfig.createsubtask || actionConfig.retreat || actionConfig.abortprocessTask || actionConfig.recoverprocessTask || actionConfig.urge || actionConfig.tranferreport || actionConfig.copyprocesstask) {
         moreAction = true;
       }
       return moreAction;
@@ -676,20 +618,12 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.task-title{
-  font-size: 16px;
-}
 .task-main{
   position: relative;
   width: 100%;
   height: 100%;
   overflow-y: hidden;
 }
-.channel-type{
-  padding: 4px 12px;
-  margin-right: 4px;
-  border-radius: 20px;
-}
 /deep/ .ivu-layout-content{
   overflow-y: hidden !important;
 }
diff --git a/src/views/pages/process/task/processdispatch/workorder/base-setting.vue b/src/views/pages/process/task/processdispatch/workorder/base-setting.vue
index 468ed5fca..18fb76b6e 100644
--- a/src/views/pages/process/task/processdispatch/workorder/base-setting.vue
+++ b/src/views/pages/process/task/processdispatch/workorder/base-setting.vue
@@ -253,8 +253,6 @@ export default {
         if (res.Status == 'OK') {
           this.knowledgeList = res.Return.dataList;
         }
-      }).catch(error => {
-        this.$Message.error(this.$t('message.failed'), {taregt: this.$t('term.process.relateknowledge')});
       });
     },
     createContent(index, title) {
-- 
Gitee


From 44d00d33f80300e0405e6d6b2e17634bdf5cae03 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 6 Nov 2023 14:20:46 +0800
Subject: [PATCH 11/16] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1016661191131136?=
 =?UTF-8?q?]cmdb=E5=90=8C=E6=AD=A5:=20=E5=B7=A5=E5=8D=95=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=20http://192.168.0.96:8090/demo/rdm.html#/task-detail?=
 =?UTF-8?q?/939050947543040/939050947543050/1016661191131136?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/nodesetting/notice-setting.vue |   2 +-
 .../task/processdetail/process-cmdbsync.vue   |  14 +-
 .../processdetail/workorder/CenterDetail.vue  |  25 ++-
 .../workorder/cmdbsync/cmdbsync-detail.vue    | 145 ++++++++++++++++++
 4 files changed, 180 insertions(+), 6 deletions(-)
 create mode 100644 src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue

diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/notice-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/notice-setting.vue
index 53db2073e..3abe153ab 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/notice-setting.vue
+++ b/src/views/pages/process/flow/flowedit/components/nodesetting/notice-setting.vue
@@ -213,7 +213,7 @@ export default {
         paramMappingList: this.notifyPolicyConfig.paramMappingList || [],
         excludeTriggerList: this.notifyPolicyConfig.excludeTriggerList || []
       };
-      if (this.notifyPolicyConfig.hasOwnProperty('policyId')) {
+      if (this.notifyPolicyConfig.hasOwnProperty('policyId') && this.notifyPolicyConfig.policyId) {
         this.$set(data, 'policyId', this.notifyPolicyConfig.policyId);
       }
       if (this.notifyPolicyConfig.hasOwnProperty('policyName')) {
diff --git a/src/views/pages/process/task/processdetail/process-cmdbsync.vue b/src/views/pages/process/task/processdetail/process-cmdbsync.vue
index bcbc2e487..15ff013ca 100644
--- a/src/views/pages/process/task/processdetail/process-cmdbsync.vue
+++ b/src/views/pages/process/task/processdetail/process-cmdbsync.vue
@@ -216,12 +216,16 @@
                   :defaultProcessTaskStepId="processTaskStepId"
                   :replaceableTextConfig="replaceableTextConfig"
                   :priorityList="priorityList"
-                  :defaultTabValue="isShowJob? 'autoexec' : ''"
+                  :defaultTabValue="isShowCmdbsync? 'cmdbsync' : ''"
                   @update="update"
                   @changeDisableCommet="(val)=>{
                     isDisableCommet = val
                   }"
                 >
+                  <template v-if="isShowCmdbsync" v-slot:cmdbsync>
+                    <!-- 配置项 -->
+                    <CmdbsyncDetail :handlerStepInfo="handlerStepInfo"></CmdbsyncDetail>
+                  </template>
                   <div slot="replyBtn">
                     <!-- 回退/流转按钮 -->
                     <FooterOperationBtn
@@ -448,7 +452,9 @@ export default {
     ...itemDialog,
     TaskAlert: resolve => require(['@/views/pages/process/task/processdetail/workorder/alert/top-alert.vue'], resolve),
     StepSelect: resolve => require(['@/views/pages/process/task/processdetail/workorder/common/step-select.vue'], resolve),
-    FooterOperationBtn
+    FooterOperationBtn,
+    CmdbsyncDetail: resolve => require(['@/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue'], resolve)
+    
   },
   provide() {
     return {
@@ -609,8 +615,8 @@ export default {
       }
       return moreAction;
     },
-    isShowJob() {
-      return this.handlerStepInfo && (!this.$utils.isEmpty(this.handlerStepInfo.jobList) || !this.$utils.isEmpty(this.handlerStepInfo.errorList));
+    isShowCmdbsync() {
+      return this.handlerStepInfo && (!this.$utils.isEmpty(this.handlerStepInfo.tbodyList) || !this.$utils.isEmpty(this.handlerStepInfo.errorList));
     }
   },
 
diff --git a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
index 10f52999d..dee0aaeb9 100644
--- a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
@@ -129,6 +129,19 @@
             <!--  auto回调 -->
           </div>
         </TabPane>
+        <TabPane
+          v-if="fixedPageTab.cmdbsync && $slots.cmdbsync"
+          :label="render => renderTabPaneLabel(render, 'cmdbsync', 'cmdb')"
+          name="cmdbsync"
+          class="tab-content"
+          tab="tab1"
+        >
+          <div class="padding">
+            <!--cmdb同步s -->
+            <slot name="cmdbsync"></slot>
+            <!-- cmdb同步end -->
+          </div>
+        </TabPane>
         <template v-for="subStep in taskConfigList">
           <TabPane
             v-if="fixedPageTab[`subTask${subStep.id}`]"
@@ -311,6 +324,15 @@
           <slot name="automatic"></slot>
         </div>
       </template>
+      <template v-else-if="item.tabValue == 'cmdbsync'">
+        <div class="mb-xs">
+          <span>{{ item.label }}</span>
+          <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+        </div>
+        <div class="padding">
+          <slot name="cmdbsync"></slot>
+        </div>
+      </template>
       <template v-else>
         <div class="mb-xs">
           <span>{{ item.label }}</span>
@@ -444,7 +466,8 @@ export default {
         reportingHistory: true,
         changeDetails: true,
         autoexec: true,
-        automatic: true // 自动处理节点
+        automatic: true, // 自动处理节点
+        cmdbsync: true
       },
       loadingShow: false, // 解决固定页面之后，tab的顺序改变了，不是渲染前的顺序
       fixedPageList: [],
diff --git a/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue b/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
new file mode 100644
index 000000000..2527ace7f
--- /dev/null
+++ b/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
@@ -0,0 +1,145 @@
+<template>
+  <div v-if="handlerStepInfo">
+    <Alert v-if="!$utils.isEmpty(handlerStepInfo.errorList)" type="error">
+      <template slot="desc">
+        <div v-for="(e,eindex) in handlerStepInfo.errorList" :key="eindex">
+          创建配置项失败：{{ e.error.length > 500 && !e.isMore? e.error.slice(0,500) : e.error }}
+          <span v-if="e.error.length > 500" class="text-href pl-sm" @click="viewDetail(e)">{{ !e.isMore?$t('page.viewmore'):$t('page.packup') }}</span>
+        </div>
+      </template>
+    </Alert>
+    <TsTable v-if="handlerStepInfo.tbodyList && handlerStepInfo.tbodyList.length > 0" :theadList="theadList" :tbodyList="handlerStepInfo.tbodyList">
+      <template v-slot:detail="{ row }">
+        <span style="cursor:pointer" class="tsfont-task" @click="showHistoryDetail(row)"></span>
+      </template>
+      <template v-slot:ciName="{ row }">
+        <div>
+          <span>{{ row.ciLabel }}</span>
+          <span class="text-grey">({{ row.ciName }})</span>
+        </div>
+      </template>
+      <template v-slot:error="{ row }">
+        <Poptip
+          v-if="row.error"
+          trigger="hover"
+          title="异常"
+          word-wrap
+          width="400"
+          :transfer="true"
+          :content="row.error"
+          placement="left"
+        >
+          <span class="text-error tsfont-warning-s"></span>
+        </Poptip>
+      </template>
+      <template v-slot:status="{ row }">
+        <span v-if="row.status === 'commited'" class="text-success">{{ row.statusText }}</span>
+        <span v-else class="text-grey">{{ row.statusText }}</span>
+      </template>
+      <template v-slot:createTime="{ row }">
+        <Poptip v-if="row.createTime" trigger="hover" :transfer="true">
+          <div style="cursor:help">
+            <span>{{ row.createTime | formatDate }}</span>
+            <span class="fz10 tsfont-taskperson"></span>
+          </div>
+          <div slot="content">
+            <UserCard :uuid="row.createUser"></UserCard>
+          </div>
+        </Poptip>
+      </template>
+      <template v-slot:commitTime="{ row }">
+        <Poptip v-if="row.commitTime" trigger="hover" :transfer="true">
+          <div style="cursor:help">
+            <span>{{ row.commitTime | formatDate }}</span>
+            <span class="fz10 tsfont-taskperson"></span>
+          </div>
+          <div slot="content">
+            <UserCard :uuid="row.commitUser"></UserCard>
+          </div>
+        </Poptip>
+      </template>
+      <template v-slot:action="{ row }">
+        <div class="tstable-action">
+          <ul class="tstable-action-ul">
+            <li v-if="!(row.action === 'delete' && row.status === 'commited')" class="tsfont-formtextarea" @click="toCiEntity(row.ciEntityId, row.ciId)">配置项详情</li>
+          </ul>
+        </div>
+      </template>
+    </TsTable>
+    <HistoryDetail
+      v-if="isHistoryDetailShow"
+      :transactionId="currentTransactionId"
+      :ciEntityId="currentCiEntityId"
+      :ciId="currentCiId"
+      @close="closeHistoryDetail"
+    ></HistoryDetail>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsTable: resolve => require(['@/resources/components/TsTable/TsTable.vue'], resolve),
+    UserCard: resolve => require(['@/resources/components/UserCard/UserCard.vue'], resolve),
+    HistoryDetail: resolve => require(['@/views/pages/cmdb/cientity/history-detail.vue'], resolve)
+  },
+  props: {
+    handlerStepInfo: Object
+  },
+  data() {
+    return {
+      theadList: [
+        { key: 'detail', title: this.$t('page.detail') },
+        { key: 'ciName', title: this.$t('page.model') },
+        { key: 'ciEntityName', title: this.$t('term.cmdb.cientity') },
+        { key: 'status', title: this.$t('page.status') },
+        { key: 'actionText', title: this.$t('page.action') },
+        { key: 'inputFromText', title: this.$t('page.updatefrom') },
+        { key: 'createTime', title: this.$t('page.createtime') },
+        { key: 'commitTime', title: this.$t('page.committime') },
+        { key: 'error', title: this.$t('page.exception') }
+      ],
+      isHistoryDetailShow: false,
+      currentTransactionId: null,
+      currentCiEntityId: null,
+      currentCiId: null
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    toCiEntity(id, ciId) {
+      window.open(HOME + '/cmdb.html#/ci/' + ciId + '/cientity-view/' + id, '_blank');
+      // this.$router.push({ path: '/ci/' + ciId + '/cientity-view/' + id });
+    },
+    viewDetail(e) {
+      this.$set(e, 'isMore', !e.isMore);
+    },
+    showHistoryDetail(transaction) {
+      this.currentTransactionId = transaction.id;
+      this.currentCiEntityId = transaction.ciEntityId;
+      this.currentCiId = transaction.ciId;
+      this.isHistoryDetailShow = true;
+    },
+    closeHistoryDetail() {
+      this.isHistoryDetailShow = false;
+      this.currentTransactionId = null;
+      this.currentCiEntityId = null;
+      this.currentCiId = null;
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
-- 
Gitee


From a6e1295cb57b08fca2a905268b134341da2575f5 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 7 Nov 2023 10:30:25 +0800
Subject: [PATCH 12/16] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=9A=E6=9F=A5=E7=9C=8Bcmdb=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E8=8A=82=E7=82=B9=EF=BC=8C=E6=97=B6=E9=97=B4=E7=BA=BF?=
 =?UTF-8?q?=EF=BC=8C=E6=AD=A5=E9=AA=A4=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/cmdb/cientity/history-detail.vue    | 12 ++-
 .../task/processdetail/process-cmdbsync.vue   |  5 +-
 .../activity/item/cmdbsyncmessage-handler.vue | 46 ++++++++++++
 .../workorder/activity/item/index.js          |  4 +-
 .../workorder/cmdbsync/cmdbsync-detail.vue    | 20 ++---
 .../workorder/taskstep/item/cmdbsync.vue      | 73 +++++++++++++++++++
 .../workorder/taskstep/item/index.js          |  5 +-
 7 files changed, 148 insertions(+), 17 deletions(-)
 create mode 100644 src/views/pages/process/task/processdetail/workorder/activity/item/cmdbsyncmessage-handler.vue
 create mode 100644 src/views/pages/process/task/processdetail/workorder/taskstep/item/cmdbsync.vue

diff --git a/src/views/pages/cmdb/cientity/history-detail.vue b/src/views/pages/cmdb/cientity/history-detail.vue
index d8cd0a211..87ef30e27 100644
--- a/src/views/pages/cmdb/cientity/history-detail.vue
+++ b/src/views/pages/cmdb/cientity/history-detail.vue
@@ -97,7 +97,11 @@ export default {
     transactionId: { type: Number },
     ciId: { type: Number },
     ciEntityId: { type: Number },
-    isShow: { type: Boolean }
+    isShow: { type: Boolean },
+    isOpenNewPage: { //是否需要打开新窗口查看详情
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -192,7 +196,11 @@ export default {
       });
     },
     toCiEntity(ciEntityId, ciId) {
-      this.$router.push({ path: '/ci/' + ciId + '/cientity-view/' + ciEntityId });
+      if (this.isOpenNewPage) {
+        window.open(HOME + '/cmdb.html#/ci/' + ciId + '/cientity-view/' + ciEntityId, '_blank');
+      } else {
+        this.$router.push({ path: '/ci/' + ciId + '/cientity-view/' + ciEntityId });
+      }
     },
     getAttrByCiId() {
       this.$api.cmdb.ci.getAttrByCiId(this.ciId).then(res => {
diff --git a/src/views/pages/process/task/processdetail/process-cmdbsync.vue b/src/views/pages/process/task/processdetail/process-cmdbsync.vue
index 15ff013ca..24c4da066 100644
--- a/src/views/pages/process/task/processdetail/process-cmdbsync.vue
+++ b/src/views/pages/process/task/processdetail/process-cmdbsync.vue
@@ -224,7 +224,7 @@
                 >
                   <template v-if="isShowCmdbsync" v-slot:cmdbsync>
                     <!-- 配置项 -->
-                    <CmdbsyncDetail :handlerStepInfo="handlerStepInfo"></CmdbsyncDetail>
+                    <CmdbsyncDetail :errorList="handlerStepInfo.errorList" :tbodyList="!$utils.isEmpty(handlerStepInfo.tableList)?handlerStepInfo.tableList[0].tbodyList:[]" :handlerStepInfo="handlerStepInfo"></CmdbsyncDetail>
                   </template>
                   <div slot="replyBtn">
                     <!-- 回退/流转按钮 -->
@@ -454,7 +454,6 @@ export default {
     StepSelect: resolve => require(['@/views/pages/process/task/processdetail/workorder/common/step-select.vue'], resolve),
     FooterOperationBtn,
     CmdbsyncDetail: resolve => require(['@/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue'], resolve)
-    
   },
   provide() {
     return {
@@ -616,7 +615,7 @@ export default {
       return moreAction;
     },
     isShowCmdbsync() {
-      return this.handlerStepInfo && (!this.$utils.isEmpty(this.handlerStepInfo.tbodyList) || !this.$utils.isEmpty(this.handlerStepInfo.errorList));
+      return this.handlerStepInfo && (!this.$utils.isEmpty(this.handlerStepInfo.tableList) || !this.$utils.isEmpty(this.handlerStepInfo.errorList));
     }
   },
 
diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/cmdbsyncmessage-handler.vue b/src/views/pages/process/task/processdetail/workorder/activity/item/cmdbsyncmessage-handler.vue
new file mode 100644
index 000000000..49466e004
--- /dev/null
+++ b/src/views/pages/process/task/processdetail/workorder/activity/item/cmdbsyncmessage-handler.vue
@@ -0,0 +1,46 @@
+<template>
+  <div v-if="!$utils.isEmpty(cmdbsyncConfig)">
+    <CmdbsyncDetail v-bind="cmdbsyncConfig"></CmdbsyncDetail>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    CmdbsyncDetail: resolve => require(['@/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue'], resolve)
+  
+  },
+  props: {
+    config: Object
+  },
+  data() {
+    return {
+      cmdbsyncConfig: {}
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.init();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    init() {
+      if (this.config && this.config.newContent) {
+        this.cmdbsyncConfig = JSON.parse(this.config.newContent);
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/index.js b/src/views/pages/process/task/processdetail/workorder/activity/item/index.js
index d030ef3d7..4c604232e 100644
--- a/src/views/pages/process/task/processdetail/workorder/activity/item/index.js
+++ b/src/views/pages/process/task/processdetail/workorder/activity/item/index.js
@@ -17,6 +17,7 @@ import changestepinfoHandler from './list-handler';
 import eventinfoHandler from './list-handler';
 import focususerHandler from './focususer-handler';
 import automaticinfoHandler from './automaticinfo-handler';
+import cmdbsyncmessageHandler from './cmdbsyncmessage-handler';
 
 export default {
   defaultHandler, //默认活动展示
@@ -37,5 +38,6 @@ export default {
   changestepinfoHandler, //变更步骤
   eventinfoHandler, //事件
   focususerHandler, //修改工单关注人
-  automaticinfoHandler
+  automaticinfoHandler,
+  cmdbsyncmessageHandler
 };
diff --git a/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue b/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
index 2527ace7f..1cb29806f 100644
--- a/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
@@ -1,14 +1,14 @@
 <template>
-  <div v-if="handlerStepInfo">
-    <Alert v-if="!$utils.isEmpty(handlerStepInfo.errorList)" type="error">
+  <div>
+    <Alert v-if="!$utils.isEmpty(errorList)" type="error">
       <template slot="desc">
-        <div v-for="(e,eindex) in handlerStepInfo.errorList" :key="eindex">
-          创建配置项失败：{{ e.error.length > 500 && !e.isMore? e.error.slice(0,500) : e.error }}
+        <div v-for="(e,eindex) in errorList" :key="eindex">
+          {{ $t('dialog.title.createtarget',{'target':$t('page.fail')}) }}：{{ e.error.length > 500 && !e.isMore? e.error.slice(0,500) : e.error }}
           <span v-if="e.error.length > 500" class="text-href pl-sm" @click="viewDetail(e)">{{ !e.isMore?$t('page.viewmore'):$t('page.packup') }}</span>
         </div>
       </template>
     </Alert>
-    <TsTable v-if="handlerStepInfo.tbodyList && handlerStepInfo.tbodyList.length > 0" :theadList="theadList" :tbodyList="handlerStepInfo.tbodyList">
+    <TsTable v-if="tbodyList && tbodyList.length > 0" :theadList="theadList" :tbodyList="tbodyList">
       <template v-slot:detail="{ row }">
         <span style="cursor:pointer" class="tsfont-task" @click="showHistoryDetail(row)"></span>
       </template>
@@ -61,7 +61,7 @@
       <template v-slot:action="{ row }">
         <div class="tstable-action">
           <ul class="tstable-action-ul">
-            <li v-if="!(row.action === 'delete' && row.status === 'commited')" class="tsfont-formtextarea" @click="toCiEntity(row.ciEntityId, row.ciId)">配置项详情</li>
+            <li class="tsfont-formtextarea" @click="toCiEntity(row.ciEntityId, row.ciId)">配置项详情</li>
           </ul>
         </div>
       </template>
@@ -71,6 +71,7 @@
       :transactionId="currentTransactionId"
       :ciEntityId="currentCiEntityId"
       :ciId="currentCiId"
+      :isOpenNewPage="true"
       @close="closeHistoryDetail"
     ></HistoryDetail>
   </div>
@@ -84,7 +85,8 @@ export default {
     HistoryDetail: resolve => require(['@/views/pages/cmdb/cientity/history-detail.vue'], resolve)
   },
   props: {
-    handlerStepInfo: Object
+    errorList: Array,
+    tbodyList: Array
   },
   data() {
     return {
@@ -97,7 +99,8 @@ export default {
         { key: 'inputFromText', title: this.$t('page.updatefrom') },
         { key: 'createTime', title: this.$t('page.createtime') },
         { key: 'commitTime', title: this.$t('page.committime') },
-        { key: 'error', title: this.$t('page.exception') }
+        { key: 'error', title: this.$t('page.exception') },
+        {key: 'action'}
       ],
       isHistoryDetailShow: false,
       currentTransactionId: null,
@@ -118,7 +121,6 @@ export default {
   methods: {
     toCiEntity(id, ciId) {
       window.open(HOME + '/cmdb.html#/ci/' + ciId + '/cientity-view/' + id, '_blank');
-      // this.$router.push({ path: '/ci/' + ciId + '/cientity-view/' + id });
     },
     viewDetail(e) {
       this.$set(e, 'isMore', !e.isMore);
diff --git a/src/views/pages/process/task/processdetail/workorder/taskstep/item/cmdbsync.vue b/src/views/pages/process/task/processdetail/workorder/taskstep/item/cmdbsync.vue
new file mode 100644
index 000000000..6f9e6b862
--- /dev/null
+++ b/src/views/pages/process/task/processdetail/workorder/taskstep/item/cmdbsync.vue
@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <Timeline>
+      <TimelineItem v-if="!$utils.isEmpty(errorList)">
+        <div v-if="time" class="text-grey date-text">{{ time | formatDate }}</div>
+        <CmdbsyncDetail :errorList="errorList"></CmdbsyncDetail>
+      </TimelineItem>
+      <template v-if="!$utils.isEmpty(tableList)">
+        <TimelineItem v-for="(t, index) in tableList" :key="index">
+          <div class="comment-list-box">
+            <div class="pb-xs avatar-date-box">
+              <div class="ml-sm pr-nm">
+                <span class="text-grey date-text">{{ t.time | formatDate }}</span>
+              </div>
+            </div>
+            <div class="bottom-content-box">
+              <CmdbsyncDetail :tbodyList="t.tbodyList"></CmdbsyncDetail>
+            </div>
+          </div>
+        </TimelineItem>
+      </template>
+    </Timeline>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    CmdbsyncDetail: resolve => require(['@/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue'], resolve)
+  
+  },
+  props: {
+    item: Object
+  },
+  data() {
+    return {
+      errorList: [],
+      time: null,
+      tableList: []
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.init();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    init() {
+      if (this.item && !this.$utils.isEmpty(this.item.handlerStepInfo)) {
+        if (!this.$utils.isEmpty(this.item.handlerStepInfo.errorList)) {
+          this.errorList = this.item.handlerStepInfo.errorList;
+          this.time = this.item.handlerStepInfo.time;
+        }
+        if (!this.$utils.isEmpty(this.item.handlerStepInfo.tableList)) {
+          this.tableList = this.item.handlerStepInfo.tableList;
+        }
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/process/task/processdetail/workorder/taskstep/item/index.js b/src/views/pages/process/task/processdetail/workorder/taskstep/item/index.js
index 7b9563de1..ab7545501 100644
--- a/src/views/pages/process/task/processdetail/workorder/taskstep/item/index.js
+++ b/src/views/pages/process/task/processdetail/workorder/taskstep/item/index.js
@@ -2,10 +2,11 @@ import common from './common.vue';
 import automatic from './automatic.vue'; 
 import stepLogCommon from './step-log-common.vue';
 import cmdb from '@/views/pages/cmdb/task/processdetail/workorder/taskstep/index.js';
-
+import cmdbsync from './cmdbsync.vue';
 export default {
   common,
   automatic,
   ...cmdb,
-  stepLogCommon
+  stepLogCommon,
+  cmdbsync
 };
-- 
Gitee


From 3ee59db76c04117546aa27fc972b8be80f82fde4 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 8 Nov 2023 09:49:03 +0800
Subject: [PATCH 13/16] commit

---
 .../cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a1c63e761..3ac85378c 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
@@ -626,7 +626,7 @@ export default {
         if (item.hasOwnProperty('allAttrEntityData')) {
           if (!this.$utils.isEmpty(item.allAttrEntityData)) {
             Object.keys(item.allAttrEntityData).forEach(key => {
-              if (!this.$utils.isEmpty(item.allAttrEntityData[key].valueList)) {
+              if (!this.$utils.isEmpty(item.allAttrEntityData[key].mappingMode) && !this.$utils.isEmpty(item.allAttrEntityData[key].valueList)) {
                 let objectData = {
                   key: key,
                   mappingMode: item.allAttrEntityData[key].mappingMode,
-- 
Gitee


From aa3d203a6644549b4bdb4cd27589c7ddb8c53cca Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 8 Nov 2023 10:20:20 +0800
Subject: [PATCH 14/16] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20cmdb=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=9A=E7=B1=BB=E5=9E=8B=E6=98=A0=E5=B0=84=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=85=E7=A9=BAvalueList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-edit.vue     | 2 ++
 1 file changed, 2 insertions(+)

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 8e67d8b74..70e336ac6 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
@@ -500,6 +500,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);
       }
     }
   },
-- 
Gitee


From 7057b17bdb126d19de93637b653fa473c22f3c9d Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 8 Nov 2023 16:27:14 +0800
Subject: [PATCH 15/16] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20cmdb=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=9A=E6=A8=A1=E5=9E=8B=E5=85=B3=E7=B3=BB=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue  | 12 +++++++-----
 .../node/nodesetting/cmdbpolicy/cmdbsync-edit.vue    | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 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 3ac85378c..b57cf542a 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
@@ -393,20 +393,21 @@ export default {
         return ciViewList;
       }
     },
-    addNewCiEntity(type, item, uuid) {
+    addNewCiEntity(type, item) {
       this.loadingShow = true;
       if (type === 'rel') {
         const rel = item;
         const ciId = rel.ciId;
         const relId = rel._relId;
         const direction = rel.direction == 'from' ? 'to' : 'from'; //目标关系需要取反
+        const uuid = rel.ciEntityUuid || this.$utils.setUuid(); //新的配置项标识
         this.$api.cmdb.ci.getCiById(ciId).then(async res => {
           if (res.Return) {
             const ci = res.Return;
             //获取当前配置项数据
             const currentCiEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1];
             const newCiEntity = {
-              uuid: uuid || this.$utils.setUuid(),
+              uuid: uuid,
               _relId: relId, //记录来自哪个关系，自动填上配置项
               _direction: rel.direction, //记录关系方向
               ciId: ciId,
@@ -466,7 +467,8 @@ export default {
         this.closeDialog();
       }
     },
-    editNewCiEntity(uuid, rel) {
+    editNewCiEntity(rel) {
+      let uuid = rel.ciEntityUuid;
       if (this.saveCiEntityMap[uuid]) {
         this.tmpCiEntityData = JSON.parse(JSON.stringify(this.saveCiEntityMap[uuid]));
         let index = -1;
@@ -479,8 +481,8 @@ export default {
         if (index > -1) {
           this.ciEntityQueue = this.ciEntityQueue.slice(0, index + 1);
         } else {
-          this.addNewCiEntity('rel', rel, uuid);
-          // this.ciEntityQueue.push(this.saveCiEntityMap[uuid]);
+          //需要通过接口获取数据回显
+          this.addNewCiEntity('rel', rel);
         }
       }
     },
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 70e336ac6..a9a651e61 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
@@ -77,9 +77,9 @@
                           :closable="!disabledFn('rel' + e.element.direction + '_' + e.element.id) && (relentity.ciEntityId || relentity.type == 'new') ? true : false"
                           :style="getTagType(relentity) == 'success' ? 'cursor:pointer' : ''"
                           @click.native="
-                            e => {
-                              e.stopPropagation();
-                              editNewRelEntity(relentity);
+                            element => {
+                              element.stopPropagation();
+                              editNewRelEntity(relentity, e.element);
                             }
                           "
                           @on-close="delRelEntity('rel' + e.element.direction + '_' + e.element.id, relentity, ciEntityData || '')"
@@ -371,9 +371,11 @@ export default {
     delRelEntity(key, relentity, rowdata) {
       this.ciEntityDatafn(key, relentity, rowdata);
     },
-    editNewRelEntity(rel) {
+    editNewRelEntity(rel, config) {
       if (this.getTagType(rel) == 'success') {
-        this.$emit('edit', rel.ciEntityUuid, rel);
+        let data = this.$utils.deepClone(rel);
+        data.direction = config.direction;
+        this.$emit('edit', data);
       }
     },
     addNewRelEntity(rel) {
-- 
Gitee


From 22961ffe7f8af4652e86eae1f49e2f7d91ea03f8 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 8 Nov 2023 17:53:22 +0800
Subject: [PATCH 16/16] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20cmdb=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdbpolicy/cmdbsync-dialog.vue            | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 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 b57cf542a..65bdfd320 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
@@ -268,8 +268,8 @@ export default {
       }
     },
     okDialog() {
-      if (!this.$refs.ciConfig.valid()) {
-        return;
+      if (!this.valid()) {
+        return false; 
       }
       let data = this.save();
       this.$emit('close', data);
@@ -277,7 +277,7 @@ export default {
     closeDialog() {
       this.$emit('close');
     },
-    changeCiId(val, item) {
+    changeCiId(val) {
       this.saveCiEntityMap = {};
       this.ciEntityQueue = [];
       this.$set(this.ciData, 'uuid', null);
@@ -486,12 +486,18 @@ export default {
         }
       }
     },
-    saveNewCiEntity() {
+    valid() {
       let isValid = true;
-      if (this.$refs.cmdbsyncEdit) {
+      if (this.$refs.ciConfig && !this.$refs.ciConfig.valid()) {
+        isValid = false;
+      }
+      if (isValid && this.$refs.cmdbsyncEdit) {
         isValid = this.$refs.cmdbsyncEdit.valid();
       }
-      if (!isValid) {
+      return isValid; 
+    },
+    saveNewCiEntity() {
+      if (!this.valid()) {
         return false; 
       }
       //队列只剩一个配置项时才写入数据库
@@ -605,9 +611,6 @@ export default {
       let data = {};
       let configList = [];
       let list = this.saveNewCiEntity();
-      if (!list) {
-        return;
-      }
       list.forEach(item => {
         let config = {
           uuid: item.uuid,
-- 
Gitee