From 77f63fd49fa9aec5caa908b620458b2075d61681 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Tue, 25 Apr 2023 11:51:17 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=AF=B9=E6=AF=94=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1025780 --user=陈建星 【测试跟踪】-测试计划-测试用例-进入编辑，新建版本-版本对比错误 https://www.tapd.cn/55049933/s/1366298 --- .../business/case/components/TestCaseEdit.vue | 13 +++-- .../case/diff/CaseDiffSideViewer.vue | 14 ++--- .../components/case/diff/CaseDiffViewer.vue | 54 ++++++------------- 3 files changed, 33 insertions(+), 48 deletions(-) diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue index 5bd43eb441..0b7652119e 100644 --- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue +++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue @@ -315,7 +315,7 @@ - + @@ -1490,11 +1490,16 @@ export default { this.currentVersionName = versionName; }, compareBranchWithVersionId(originId, targetId){ - // 打开对比 - this.$refs.caseDiffViewerRef.open(originId, targetId, this.currentTestCaseInfo.id) + let originVersion = this.$refs.versionHistory.findVersionById(originId); + let targetVersion = this.$refs.versionHistory.findVersionById(targetId); + this.compareBranchWithVersionInfo(originVersion, targetVersion, this.currentTestCaseInfo.id); + }, + compareBranchWithVersionInfo(originVersion, targetVersion){ + // 打开对比 + this.$refs.caseDiffViewerRef.open(originVersion, targetVersion, this.currentTestCaseInfo.id) }, compareBranch(t1, t2) { - this.compareBranchWithVersionId(t1.id, t2.id); + this.compareBranchWithVersionInfo(t1, t2); }, compare(row) { testCaseGetByVersionId(row.id, this.currentTestCaseInfo.refId).then( diff --git a/test-track/frontend/src/business/case/components/case/diff/CaseDiffSideViewer.vue b/test-track/frontend/src/business/case/components/case/diff/CaseDiffSideViewer.vue index 5b196359ac..68d390c9bd 100644 --- a/test-track/frontend/src/business/case/components/case/diff/CaseDiffSideViewer.vue +++ b/test-track/frontend/src/business/case/components/case/diff/CaseDiffSideViewer.vue @@ -17,8 +17,8 @@ @@ -34,8 +34,8 @@ export default { visible: false, isFullScreen: false, // props 数据 - versionLeftId: "", - versionRightId: "", + leftVersion: {}, + rightVersion: {}, caseId: "", }; }, @@ -63,9 +63,9 @@ export default { }, }, methods: { - open(versionLeftId, versionRightId, caseId) { - this.versionLeftId = versionLeftId; - this.versionRightId = versionRightId; + open(leftVersion, rightVersion, caseId) { + this.leftVersion = leftVersion; + this.rightVersion = rightVersion; this.caseId = caseId; this.visible = true; }, diff --git a/test-track/frontend/src/business/case/components/case/diff/CaseDiffViewer.vue b/test-track/frontend/src/business/case/components/case/diff/CaseDiffViewer.vue index c0b9806ed9..de4391a78b 100644 --- a/test-track/frontend/src/business/case/components/case/diff/CaseDiffViewer.vue +++ b/test-track/frontend/src/business/case/components/case/diff/CaseDiffViewer.vue @@ -24,7 +24,7 @@
-
{{ item.createUserName }}
+
{{ item.createName }}
{{$t('permission.project_custom_code.create')}}
@@ -304,13 +304,17 @@ export default { CaseDiffIssueRelate, }, props: { - versionLeftId: { - type: String, - default: "", + leftVersion: { + type: Object, + default() { + return {} + }, }, - versionRightId: { - type: String, - default: "", + rightVersion: { + type: Object, + default() { + return {} + }, }, caseId: { type: String, @@ -325,8 +329,6 @@ export default { standardWith: 184, prevBtn: true, nextBtn: true, - //手动切换版本id - appointVersionRightId: "", /** * 正文 */ @@ -344,8 +346,6 @@ export default { cacheVersionsMap: new Map(), // 版本名称与版本id的对应关系 cacheVersionsNameMap: new Map(), - // 当前case 可用的版本id - caseVersionIds: new Set(), // 版本列表 versionOptions: [], versionList: [], @@ -439,9 +439,6 @@ export default { async refresh() { await this.fetchCaseVersions(); await this.fetchAllCaseVersion(); - // 构造版本列表 根据顺序 - // 这里构建的是全部的版本, 用来快速切换, - // this.formatVersionList(); this.formatCompareVersion(); this.checkoutVersionCase(); this.calculate(); @@ -474,20 +471,6 @@ export default { this.tagDiffData = this.defaultExecutor.tagDiffData || {}; this.baseInfoDiffData = this.defaultExecutor.baseInfoDiffData || {}; }, - formatVersionList() { - let map = new Map(); - this.caseVersionIds.forEach((v) => { - map.set(v, v); - }); - - // 新版本在右边 - for (let i = this.versionOptions.length - 1; i >= 0; i--) { - let v = this.versionOptions[i]; - if (map.get(v.id)) { - this.versionList.push(v); - } - } - }, async fetchAllCaseVersion() { //首先获取所有版本，再去构造版本展示的数组 let res = await getProjectVersions(getCurrentProjectID()); @@ -499,7 +482,6 @@ export default { data.forEach((e) => { this.cacheVersionsMap.set(e.versionId, e); this.cacheVersionsNameMap.set(e.versionName, e.versionId); - this.caseVersionIds.add(e.versionId); }); }, @@ -521,17 +503,15 @@ export default { }, formatCompareVersion() { // 只添加比对的版本 - let leftVersion = this.versionOptions.filter(version => version.id === this.versionLeftId); - let rightVersion = this.versionOptions.filter(version => version.id === this.versionRightId); - this.versionList.push(leftVersion[0]); - this.versionList.push(rightVersion[0]); + this.versionList.push(this.leftVersion); + this.versionList.push(this.rightVersion); }, checkoutVersionCase() { - if (this.versionLeftId) { - this.originCase = this.cacheVersionsMap.get(this.versionLeftId); + if (this.leftVersion) { + this.originCase = this.cacheVersionsMap.get(this.leftVersion.id); } - if (this.versionRightId) { - this.targetCase = this.cacheVersionsMap.get(this.versionRightId); + if (this.rightVersion) { + this.targetCase = this.cacheVersionsMap.get(this.rightVersion.id); } }, async diffAttachment() {