From 29ae358db0083c819571a02c36c5d7e06bd7c08b Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Thu, 4 May 2023 13:49:38 +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=E6=B2=A1=E6=9C=89=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E6=8F=8F=E8=BF=B0=E7=9A=84=E5=B7=AE=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1025935 --user=陈建星 【测试跟踪】github#24059，测试跟踪>>功能测试用例>>版本对比：一个用例的两个版本，并且不同版本的操作步骤有差异，但是在对比中，看不到这块的差异 https://www.tapd.cn/55049933/s/1368276 --- .../components/case/diff/CaseDiffViewer.vue | 84 ++++++++++++++----- .../case/components/case/diff/version_diff.js | 57 +++++++++---- 2 files changed, 104 insertions(+), 37 deletions(-) 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 de4391a78b..79d3716140 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 @@ -69,48 +69,82 @@ - +
-
-
- {{ - contentDiffData.stepModel === "TEXT" - ? $t("test_track.case.text_describe") - : $t("test_track.case.step_describe") - }} -
-
+
{{ $t("ui.step_type") }}
-
- -
-
-
- {{ $t("test_track.case.expected_results") }} -
+
+ +
+
{{ $t("test_track.case.step_info") }}
+
+
+ +
+
{{ $t("test_track.case.step_describe") }}
+
+
+
+ +
+
+
+ +
+ +
+
{{ $t("test_track.case.text_describe") }}
+
+
+
+ +
+
+
+ + +
+
+
+ {{ $t("test_track.case.expected_results") }} +
+
+
+
+ +
+
+
+
+
@@ -388,6 +422,12 @@ export default { } return this.nextBtn; }, + isStep() { + return this.isSameStepType && this.contentDiffData.targetStepModel === 'STEP'; + }, + isSameStepType() { + return this.contentDiffData.originStepModel === this.contentDiffData.targetStepModel; + } }, methods: { /** diff --git a/test-track/frontend/src/business/case/components/case/diff/version_diff.js b/test-track/frontend/src/business/case/components/case/diff/version_diff.js index 1f6d2a888f..f1bd0c851a 100644 --- a/test-track/frontend/src/business/case/components/case/diff/version_diff.js +++ b/test-track/frontend/src/business/case/components/case/diff/version_diff.js @@ -1,3 +1,4 @@ +import i18n from "@/i18n"; /** * 存储版本信息的数据结构 */ @@ -133,15 +134,8 @@ export default class DefaultDiffExecutor extends AbstractVersionDiffExecutor { }, ]; - // // 自定义信息处理 - // this.customDiffData = DiffUtil.diffCustomData( - // this.origin.customFieldForm, - // this.target.customFieldForm - // ); - // 详细信息对比 //名称对比 - this.contentDiffData.stepModel = "TEXT"; this.contentDiffData.caseName = [ { diffArr: DiffUtil.diffText(this.origin.name, this.target.name), @@ -156,7 +150,45 @@ export default class DefaultDiffExecutor extends AbstractVersionDiffExecutor { ), }, ]; - //文本描述 + + let originStepModel = this.origin.stepModel === 'STEP' ? i18n.t('test_track.case.step_describe') : i18n.t('test_track.case.text_describe'); + let targetStepModel = this.target.stepModel === 'STEP' ? i18n.t('test_track.case.step_describe') : i18n.t('test_track.case.text_describe'); + this.contentDiffData.originStepModel = this.origin.stepModel; + this.contentDiffData.targetStepModel = this.target.stepModel; + this.contentDiffData.stepModel = [ + { + diffArr: DiffUtil.diffText(originStepModel, targetStepModel), + }, + ]; + + // 步骤描述不一致 + if (this.origin.stepModel !== this.target.stepModel) { + if (this.origin.stepModel === 'STEP') { + this.contentDiffData.diffStep = [ + { + diffArr: DiffUtil.diffText(this.origin.steps, this.target.stepDescription + '\n' + this.target.expectedResult), + }, + ]; + } else { + this.contentDiffData.diffStep = [ + { + diffArr: DiffUtil.diffText(this.origin.stepDescription + '\n' + this.origin.expectedResult, this.target.steps), + }, + ]; + } + } + + // 步骤描述 + this.contentDiffData.steps = [ + { + diffArr: DiffUtil.diffText( + this.origin.steps, + this.target.steps + ), + }, + ]; + + // 文本描述 this.contentDiffData.stepDescription = [ { diffArr: DiffUtil.diffText( @@ -165,7 +197,7 @@ export default class DefaultDiffExecutor extends AbstractVersionDiffExecutor { ), }, ]; - //预期结果 + // 预期结果 this.contentDiffData.expectedResult = [ { diffArr: DiffUtil.diffText( @@ -174,6 +206,7 @@ export default class DefaultDiffExecutor extends AbstractVersionDiffExecutor { ), }, ]; + //备注 this.contentDiffData.remark = [ { @@ -183,12 +216,6 @@ export default class DefaultDiffExecutor extends AbstractVersionDiffExecutor { ), }, ]; - - // {"name":"open——2614e2dd-bcf9-4bb1-88ec-9737940ad7fc——1673837163926——screenshot.png","size":"0 B","updateTime":1675700468279,"progress":100,"status":"error","creator":"Administrator","type":"PNG","isLocal":true} - // this.attachmentDiffData.attachment = DiffUtil.diffAttachment( - // this.origin, - // this.target - // ); } diffAttachment(origin, target) {