fix(测试跟踪): 修复功能用例版本对比页面数据显示不全问题

--bug=1023474 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001023474
This commit is contained in:
guoyuqi 2023-02-27 18:41:39 +08:00 committed by xiaomeinvG
parent 3ddb7903ea
commit cbc4ae0f8b
6 changed files with 41 additions and 26 deletions

View File

@ -258,7 +258,7 @@
project_version.name as versionName, project_version.name as versionName,
project_version.id as versionId, project_version.id as versionId,
test_case.last_execute_result, test_case.last_execute_result,
test_case.prerequisite, test_case.steps, remark, test_case.prerequisite, test_case.steps, remark, test_case.expected_result, test_case.step_description,
<if test="request.selectFields != null and request.selectFields.size() > 0"> <if test="request.selectFields != null and request.selectFields.size() > 0">
<foreach collection="request.selectFields" item="field" separator=","> <foreach collection="request.selectFields" item="field" separator=",">
${field} ${field}

View File

@ -405,10 +405,13 @@ export default {
} }
.file-info-row { .file-info-row {
display: flex; display: flex;
font-size: px2rem(12);
line-height: px2rem(20); line-height: px2rem(20);
height: px2rem(20); height: px2rem(20);
color: #8f959e; color: #8f959e;
flex-direction: row;
flex-wrap: nowrap;
align-items: center;
.size { .size {
} }

View File

@ -1,5 +1,5 @@
<!-- <!--
依赖关系 容器 依赖关系 容器
--> -->
<template> <template>
@ -42,7 +42,7 @@
ref="postRelationshipList" ref="postRelationshipList"
></case-relationship-list> ></case-relationship-list>
</div> </div>
<mx-relationship-graph-drawer <mx-relationship-graph-drawer
v-xpack v-xpack
v-permission v-permission
@ -52,13 +52,13 @@
/> />
</div> </div>
</template> </template>
<script> <script>
import MxRelationshipGraphDrawer from "metersphere-frontend/src/components/graph/RelationshipGraphDrawer"; import MxRelationshipGraphDrawer from "metersphere-frontend/src/components/graph/RelationshipGraphDrawer";
import RelationshipList from "@/business/common/RelationshipList"; import RelationshipList from "@/business/common/RelationshipList";
import { getRelationshipGraph } from "@/api/graph"; import { getRelationshipGraph } from "@/api/graph";
import CaseRelationshipList from "./CaseDiffRelationshipList"; import CaseRelationshipList from "./CaseDiffRelationshipList";
export default { export default {
name: "CaseDiffRelationship", name: "CaseDiffRelationship",
components: { components: {
@ -104,8 +104,8 @@
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.left-icon { .left-icon {
width: 4%; width: 4%;
display: inline-block; display: inline-block;
@ -116,7 +116,6 @@
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/business/style/index.scss"; @import "@/business/style/index.scss";
.dependencies-container { .dependencies-container {
overflow: hidden;
.dep-header-wrap { .dep-header-wrap {
margin-top: 24px; margin-top: 24px;
width: 98px; width: 98px;
@ -141,11 +140,11 @@
height: 100%; height: 100%;
} }
} }
.dep-label { .dep-label {
} }
} }
.dep-pre-wrap { .dep-pre-wrap {
max-height: px2rem(269); max-height: px2rem(269);
} }
@ -155,4 +154,4 @@
} }
} }
</style> </style>

View File

@ -133,17 +133,14 @@
<!-- 添加附件 --> <!-- 添加附件 -->
<!-- tip --> <!-- tip -->
<div class="opt-btn"> <div class="opt-btn">
<div class="attachment-preview"> <div class="attachment-preview" v-if="showAttachment">
<case-attachment-viewer <case-attachment-viewer
:tableData="attachmentDiffData" :tableData="attachmentDiffData"
:isCopy="false" :isCopy="false"
:readOnly="true" :readOnly="true"
:is-delete="false" :is-delete="false"
v-if="
attachmentDiffData && attachmentDiffData.lenght > 0
"
></case-attachment-viewer> ></case-attachment-viewer>
<div v-else>{{ $t("case.none") }}</div> <div v-if="!showAttachment">{{ $t("case.none") }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -324,6 +321,7 @@ export default {
contentDiffData: {}, contentDiffData: {},
customDiffData: {}, customDiffData: {},
attachmentDiffData: [], attachmentDiffData: [],
showAttachment: false,
baseInfoDiffData: {}, baseInfoDiffData: {},
tagDiffData: {}, tagDiffData: {},
originCase: {}, originCase: {},
@ -447,11 +445,11 @@ export default {
this.fillCustomValue(); this.fillCustomValue();
this.diffCustomData(); this.diffCustomData();
this.diffAttachment(); await this.diffAttachment();
this.diffTestRelate(); await this.diffTestRelate();
this.diffComments(); await this.diffComments();
this.diffRelationship(); await this.diffRelationship();
this.diffIssues(); await this.diffIssues();
// //
this.initContent(); this.initContent();
}, },
@ -521,6 +519,9 @@ export default {
origin, origin,
target target
); );
if (this.attachmentDiffData && this.attachmentDiffData.length > 0) {
this.showAttachment = true
}
}, },
async fetchTestRelate(id) { async fetchTestRelate(id) {
let res = await getRelateTest(id); let res = await getRelateTest(id);
@ -911,16 +912,21 @@ export default {
.content-body-wrap { .content-body-wrap {
// 1024 padding 24 1px // 1024 padding 24 1px
width: px2rem(1024); width: px2rem(1024);
height: 1044px; height: 100%;
display: flex; display: flex;
.tab-pane-wrap { .tab-pane-wrap {
width: px2rem(896); width: px2rem(896);
height: 100%; height: 100%;
overflow-y: scroll;
border-right: 1px solid rgba(31, 35, 41, 0.15); border-right: 1px solid rgba(31, 35, 41, 0.15);
:deep(.el-tabs__item) { :deep(.el-tabs__item) {
padding-left: px2rem(24); padding-left: px2rem(24);
} }
:deep(.el-tabs__content) {
overflow: auto;
}
} }
.base-info-wrap { .base-info-wrap {
width: px2rem(304); width: px2rem(304);
@ -934,6 +940,7 @@ export default {
.content-conatiner { .content-conatiner {
padding-left: px2rem(24); padding-left: px2rem(24);
padding-right: px2rem(24); padding-right: px2rem(24);
height: calc(100vh - 130px);
} }
} }
.case-content-wrap { .case-content-wrap {

View File

@ -277,6 +277,12 @@ class DiffUtil {
static diffArray(arr1, arr2) { static diffArray(arr1, arr2) {
let resArr = []; let resArr = [];
//矫正参数 //矫正参数
if (typeof arr1 === 'string') {
arr1 = JSON.parse(arr1);
}
if (typeof arr2 === 'string') {
arr2 = JSON.parse(arr2);
}
if (!Array.isArray(arr1)) { if (!Array.isArray(arr1)) {
arr1 = []; arr1 = [];
} }

View File

@ -197,7 +197,7 @@ export default {
return this.versionLeftId && this.versionRightId; return this.versionLeftId && this.versionRightId;
}, },
compareDisable() { compareDisable() {
return this.versionCompareOptions || this.versionCompareOptions.length < 2; return !this.versionCompareOptions || this.versionCompareOptions.length < 2;
} }
}, },
beforeDestroy() { beforeDestroy() {