diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json index 9274c92a39c8a66d91b2a015e6332b1cf73b7172..1a21e16dfa32dccb17479316535fe451669e12df 100644 --- a/src/resources/assets/languages/page/en.json +++ b/src/resources/assets/languages/page/en.json @@ -958,5 +958,6 @@ "importoverdescrition": "The following associated objects already exist in the system. If you want to overwrite them, please check the objects you want to overwrite and click the [Import] button below to complete the import.", "uploadurlmustrequired": "The upload address cannot be empty", "existiscoverimport": "{type}【{target}】 already exists. Do you want to continue importing and overwrite it", - "userauthfailedpleaselogin": "authentication failed, please log in" + "userauthfailedpleaselogin": "authentication failed, please log in", + "partial": "local" } \ No newline at end of file diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json index 206155f6f9fccabc6ec47603f7e2f0ab250e9d46..97ba28830bf8e9c5153ff97fccf576b6087249be 100644 --- a/src/resources/assets/languages/page/zh.json +++ b/src/resources/assets/languages/page/zh.json @@ -960,5 +960,6 @@ "importoverdescrition": "以下关联的对象,在系统中已经存在,如需覆盖,请勾选需要覆盖的对象后,点击下方[导入]按钮,完成导入。", "uploadurlmustrequired": "上传地址不能为空", "existiscoverimport": "{type}【{target}】已存在,是否继续导入并覆盖", - "userauthfailedpleaselogin": "认证失败,请重新登录" -} + "userauthfailedpleaselogin": "认证失败,请重新登录", + "partial": "局部" +} \ No newline at end of file diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json index 7c9999883dc293393825d75cbfc4029ab5b002cc..807c0333296000e9dd5b4e7a97d3611668d184de 100644 --- a/src/resources/assets/languages/term/en.json +++ b/src/resources/assets/languages/term/en.json @@ -183,6 +183,9 @@ "noaddcidirectory": "No model directory added,", "currentcatalogcitenodeletedescrition": "The current directory node has been referenced. Please remove the reference and delete it", "autoexec": "Automated operations", + "asyncpolicy": "Synchronization strategy", + "globaleditmodetip": "Global mode, do not delete attribute representatives", + "partialeditmodetip": "Local mode, do not change if attribute is not given", "treedraginfo": "Dragging a model can change the order and affiliation of the model, and cannot be dragged when in search mode" }, "process": { diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json index f11e8886f4ef771027e7d4ddbc9efb29481c12ef..fa796fa7102e0e0c510f7d019c4cbcd50d5d7253 100644 --- a/src/resources/assets/languages/term/zh.json +++ b/src/resources/assets/languages/term/zh.json @@ -183,6 +183,9 @@ "noaddcidirectory": "未添加模型目录,", "currentcatalogcitenodeletedescrition": "当前目录节点已被引用,请解除引用后删除", "autoexec": "自动化操作", + "asyncpolicy": "同步策略", + "globaleditmodetip": "全局模式,不给属性代表删除", + "partialeditmodetip": "局部模式,不给属性则不改", "treedraginfo": "拖动模型可以改变模型的顺序和从属关系,处于搜索状态时不可拖动" }, "process": { 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 b9df2cf2690266e07a1eeb846ca3871974c1d7ed..18d20d53b31278a9d2ab9bae976f579af45d7476 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 @@ -38,6 +38,15 @@
+ + +
@@ -247,7 +258,19 @@ export default { } ], currentFormItemList: [], //当前表单组件(当配置项数量为多数据且遍历对象为子表单添加关系时,当前关系模型可选的表单组件为子表单内组件) - tableList: [] //遍历对象,选择表格组件 + tableList: [], //遍历对象,选择表格组件 + editModeList: [ + { + text: this.$t('page.global'), + value: 'global', + description: this.$t('term.cmdb.globaleditmodetip') + }, + { + text: this.$t('page.partial'), + value: 'partial', + description: this.$t('term.cmdb.partialeditmodetip') + } + ] }; }, beforeCreate() {}, @@ -346,6 +369,7 @@ export default { ciName: ci.name, ciLabel: ci.label, ciIcon: ci.icon, + editMode: this.ciData.editMode || '', createPolicy: 'single', batchDataSource: {}, relEntityData: {}, @@ -467,6 +491,7 @@ export default { ciName: ci.name, ciLabel: ci.label, ciIcon: ci.icon, + editMode: '', createPolicy: 'single', batchDataSource: {}, action: 'append', @@ -667,6 +692,7 @@ export default { ciId: item.ciId, ciLabel: item.ciLabel, ciName: item.ciName, + editMode: item.editMode, createPolicy: item.createPolicy, batchDataSource: item.batchDataSource || {}, mappingList: [] @@ -930,6 +956,12 @@ export default { } }); return treeList; + }, + changeEditMode(val) { + let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1]; + if (ciEntity) { + this.$set(ciEntity, 'editMode', val); + } } }, filter: {},