diff --git a/test-track/frontend/package.json b/test-track/frontend/package.json index 93f814b403..d8bde932f5 100644 --- a/test-track/frontend/package.json +++ b/test-track/frontend/package.json @@ -59,7 +59,7 @@ "vue-float-action-button": "^0.6.6", "vue-i18n": "^8.15.3", "vue-jsonpath-picker": "^1.1.5", - "vue-minder-editor-plus": "1.1.2", + "vue-minder-editor-plus": "1.1.7", "vue-papa-parse": "^2.0.0", "vue-router": "^3.1.3", "vue-virtual-scroll-list": "^2.3.3", diff --git a/test-track/frontend/src/business/common/minder/TestPlanMinder.vue b/test-track/frontend/src/business/common/minder/TestPlanMinder.vue index dedcac3c84..d7a701e5e9 100644 --- a/test-track/frontend/src/business/common/minder/TestPlanMinder.vue +++ b/test-track/frontend/src/business/common/minder/TestPlanMinder.vue @@ -9,7 +9,7 @@ :tag-enable="true" :disabled="disableMinder" :select-node="selectNode" - :distinct-tags="[...tags, this.$t('test_track.plan.plan_status_prepare')]" + :distinct-tags="distinctTags" :ignore-num="true" @afterMount="handleAfterMount" @save="save" @@ -37,8 +37,17 @@ import {setPriorityView} from "vue-minder-editor-plus/src/script/tool/utils"; import { - handleExpandToLevel, listenBeforeExecCommand, listenNodeSelected, loadSelectNodes, - tagBatch, getSelectedNodeData, handleIssueAdd, handleIssueBatch, listenDblclick, handleMinderIssueDelete + handleExpandToLevel, + listenBeforeExecCommand, + listenNodeSelected, + loadSelectNodes, + tagBatch, + getSelectedNodeData, + handleIssueAdd, + handleIssueBatch, + listenDblclick, + handleMinderIssueDelete, + saveTagBeforeBatchTag, clearOtherTagAfterBatchTag } from "@/business/common/minder/minderUtils"; import {getPlanCasesForMinder} from "@/api/testCase"; import IssueRelateList from "@/business/case/components/IssueRelateList"; @@ -92,6 +101,9 @@ export default { } else { return false } + }, + distinctTags() { + return [...this.tags, this.$t('test_track.plan.plan_status_prepare')]; } }, mounted() { @@ -127,8 +139,14 @@ export default { if (handleMinderIssueDelete(even.commandName, true)) return; // 删除缺陷不算有编辑脑图信息 if (even.commandName.toLocaleLowerCase() === 'resource') { - // 设置完标签后,优先级显示有问题,重新设置下 - setTimeout(() => setPriorityView(true, 'P'), 100); + saveTagBeforeBatchTag(); + + // afterExecCommand 没有效果,这里只能 setTimeout 执行 + setTimeout(() => { + clearOtherTagAfterBatchTag(this.tags, this.distinctTags); + // 设置完标签后,优先级显示有问题,重新设置下 + setPriorityView(true, 'P'); + }, 100); this.setIsChange(true); } }); @@ -144,7 +162,7 @@ export default { } }); - tagBatch([...this.tags, this.$t('test_track.plan.plan_status_prepare')], { + tagBatch(this.distinctTags, { param: this.getParam(), getCaseFuc: getPlanCasesForMinder, setParamCallback: this.setParamCallback diff --git a/test-track/frontend/src/business/common/minder/TestReviewMinder.vue b/test-track/frontend/src/business/common/minder/TestReviewMinder.vue index af58ffd479..4e2bab3769 100644 --- a/test-track/frontend/src/business/common/minder/TestReviewMinder.vue +++ b/test-track/frontend/src/business/common/minder/TestReviewMinder.vue @@ -18,10 +18,11 @@