From 97a672e6459bd70564d87ef5563f5c86bb16a1df Mon Sep 17 00:00:00 2001 From: dengbf Date: Fri, 29 Dec 2023 10:46:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20cmdb=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E7=AD=96=E7=95=A5?= =?UTF-8?q?=20=20=20=20-=20[=E5=85=B3=E8=81=94]=20#[1057034345086976]ITSM-?= =?UTF-8?q?CMDB=E5=90=8C=E6=AD=A5=E8=8A=82=E7=82=B9-=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=AD=96=E7=95=A5=EF=BC=8C=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E6=88=96=E5=B1=80=E9=83=A8=20http://192.168.0.96:8090/demo/rdm?= =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/10570343450?= =?UTF-8?q?86976?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/assets/languages/page/en.json | 3 +- src/resources/assets/languages/page/zh.json | 5 +-- src/resources/assets/languages/term/en.json | 5 ++- src/resources/assets/languages/term/zh.json | 5 ++- .../cmdbpolicy/cmdbsync-dialog.vue | 36 +++++++++++++++++-- 5 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json index 9274c92a..1a21e16d 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 206155f6..97ba2883 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 0a9a1b70..fd3e0de7 100644 --- a/src/resources/assets/languages/term/en.json +++ b/src/resources/assets/languages/term/en.json @@ -182,7 +182,10 @@ "directoryname": "Catalog Name", "noaddcidirectory": "No model directory added,", "currentcatalogcitenodeletedescrition": "The current directory node has been referenced. Please remove the reference and delete it", - "autoexec": "Automated operations" + "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" }, "process": { "workordercenter": "Work Center", diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json index cf89df89..22144f34 100644 --- a/src/resources/assets/languages/term/zh.json +++ b/src/resources/assets/languages/term/zh.json @@ -182,7 +182,10 @@ "directoryname": "目录名称", "noaddcidirectory": "未添加模型目录，", "currentcatalogcitenodeletedescrition": "当前目录节点已被引用，请解除引用后删除", - "autoexec": "自动化操作" + "autoexec": "自动化操作", + "asyncpolicy": "同步策略", + "globaleditmodetip": "全局模式，不给属性代表删除", + "partialeditmodetip": "局部模式，不给属性则不改" }, "process": { "workordercenter": "工单中心", 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 b9df2cf2..40a65047 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: [], //遍历对象，选择表格组件 + editModeTypeList: [ + { + 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, + editModeType: this.ciData.editModeType || '', createPolicy: 'single', batchDataSource: {}, relEntityData: {}, @@ -467,6 +491,7 @@ export default { ciName: ci.name, ciLabel: ci.label, ciIcon: ci.icon, + editModeType: '', createPolicy: 'single', batchDataSource: {}, action: 'append', @@ -667,6 +692,7 @@ export default { ciId: item.ciId, ciLabel: item.ciLabel, ciName: item.ciName, + editModeType: item.editModeType, createPolicy: item.createPolicy, batchDataSource: item.batchDataSource || {}, mappingList: [] @@ -930,6 +956,12 @@ export default { } }); return treeList; + }, + changeEditModeType(val) { + let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1]; + if (ciEntity) { + this.$set(ciEntity, 'editModeType', val); + } } }, filter: {}, -- Gitee From e84920c6247809b1c8341735fe3b3ee97b6736c8 Mon Sep 17 00:00:00 2001 From: dengbf Date: Fri, 29 Dec 2023 10:55:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nodesetting/cmdbpolicy/cmdbsync-dialog.vue | 18 +++++++++--------- 1 file changed, 9 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 40a65047..18d20d53 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 @@ -40,10 +40,10 @@
@@ -259,7 +259,7 @@ export default { ], currentFormItemList: [], //当前表单组件（当配置项数量为多数据且遍历对象为子表单添加关系时，当前关系模型可选的表单组件为子表单内组件） tableList: [], //遍历对象，选择表格组件 - editModeTypeList: [ + editModeList: [ { text: this.$t('page.global'), value: 'global', @@ -369,7 +369,7 @@ export default { ciName: ci.name, ciLabel: ci.label, ciIcon: ci.icon, - editModeType: this.ciData.editModeType || '', + editMode: this.ciData.editMode || '', createPolicy: 'single', batchDataSource: {}, relEntityData: {}, @@ -491,7 +491,7 @@ export default { ciName: ci.name, ciLabel: ci.label, ciIcon: ci.icon, - editModeType: '', + editMode: '', createPolicy: 'single', batchDataSource: {}, action: 'append', @@ -692,7 +692,7 @@ export default { ciId: item.ciId, ciLabel: item.ciLabel, ciName: item.ciName, - editModeType: item.editModeType, + editMode: item.editMode, createPolicy: item.createPolicy, batchDataSource: item.batchDataSource || {}, mappingList: [] @@ -957,10 +957,10 @@ export default { }); return treeList; }, - changeEditModeType(val) { + changeEditMode(val) { let ciEntity = this.ciEntityQueue[this.ciEntityQueue.length - 1]; if (ciEntity) { - this.$set(ciEntity, 'editModeType', val); + this.$set(ciEntity, 'editMode', val); } } }, -- Gitee