fix(测试跟踪): 公共用例库自定义字段责任人查看有误

--bug=1024436 --user=宋昌昌 【测试跟踪】公共用例库-查看,责任人为空 https://www.tapd.cn/55049933/s/1350590
This commit is contained in:
song-cc-rock 2023-03-15 16:50:56 +08:00 committed by fit2-zhao
parent 4452165505
commit f6daf41896
4 changed files with 45 additions and 18 deletions

View File

@ -152,7 +152,7 @@
<script> <script>
import MsTableColumn from "../table/MsTableColumn"; import MsTableColumn from "../table/MsTableColumn";
import MsInputTag from "../MsInputTag"; import MsInputTag from "../MsInputTag";
import {getProjectMemberOption} from "../../api/user"; import {getProjectMemberById, getProjectMemberOption} from "../../api/user";
import MsMarkDownText from "metersphere-frontend/src/components/MsMarkDownText"; import MsMarkDownText from "metersphere-frontend/src/components/MsMarkDownText";
export default { export default {
@ -164,7 +164,8 @@ export default {
'form', 'form',
'disabled', 'disabled',
'defaultOpen', 'defaultOpen',
'isTemplateEdit' 'isTemplateEdit',
'projectId'
], ],
data() { data() {
return { return {
@ -199,6 +200,14 @@ export default {
if (['member', 'multipleMember'].indexOf(this.data.type) < 0) { if (['member', 'multipleMember'].indexOf(this.data.type) < 0) {
return; return;
} }
if (this.projectId) {
getProjectMemberById(this.projectId).then((r) => {
this.memberOptions = r.data;
if (this.data.name === '责任人' && this.data.system && this.isTemplateEdit) {
this.memberOptions.unshift({id: 'CURRENT_USER', name: '创建人', email: ''});
}
})
} else {
getProjectMemberOption() getProjectMemberOption()
.then((r) => { .then((r) => {
this.memberOptions = r.data; this.memberOptions = r.data;
@ -206,6 +215,7 @@ export default {
this.memberOptions.unshift({id: 'CURRENT_USER', name: '创建人', email: ''}); this.memberOptions.unshift({id: 'CURRENT_USER', name: '创建人', email: ''});
} }
}); });
}
}, },
watch: { watch: {
form() { form() {

View File

@ -171,7 +171,8 @@ export default {
contentClickEvent: { contentClickEvent: {
type: Boolean, type: Boolean,
default: true, default: true,
} },
projectId: String
}, },
computed: { computed: {
edit() { edit() {
@ -218,6 +219,19 @@ export default {
}, },
methods: { methods: {
getMemberOptions() { getMemberOptions() {
if (this.projectId) {
getProjectMemberById(this.projectId).then((r) => {
let tempMemberOptions = r.data || [];
let tempArr = [];
tempMemberOptions.forEach((e) => {
tempArr.push({
value: e.id,
text: e.name,
});
});
this.memberOptions = tempArr;
});
} else {
getProjectMemberOption().then((r) => { getProjectMemberOption().then((r) => {
let tempMemberOptions = r.data || []; let tempMemberOptions = r.data || [];
let tempArr = []; let tempArr = [];
@ -229,6 +243,7 @@ export default {
}); });
this.memberOptions = tempArr; this.memberOptions = tempArr;
}); });
}
}, },
getTranslateOption(item) { getTranslateOption(item) {
if (!item) { if (!item) {

View File

@ -148,6 +148,7 @@
:default-open="defaultOpen" :default-open="defaultOpen"
:issue-template="testCaseTemplate" :issue-template="testCaseTemplate"
:editable="editable" :editable="editable"
:project-id="form.projectId"
/> />
</el-form> </el-form>
<el-form ref="baseCaseFrom" :rules="rules" :model="form" class="case-padding"> <el-form ref="baseCaseFrom" :rules="rules" :model="form" class="case-padding">

View File

@ -23,6 +23,7 @@
:content-click-event="!disabled" :content-click-event="!disabled"
:model="form" :model="form"
:rules="rules" :rules="rules"
:project-id="projectId"
> >
<template v-slot:content="{ onClick, hoverEditable }"> <template v-slot:content="{ onClick, hoverEditable }">
<div :class="hoverEditable ? 'selectHover' : ''"> <div :class="hoverEditable ? 'selectHover' : ''">
@ -31,10 +32,9 @@
:data="item" :data="item"
:form="form" :form="form"
prop="defaultValue" prop="defaultValue"
:disabled=" :disabled="(item.type !== 'richText' && isPublic) || disabled"
(item.type !== 'richText' && isPublic) || disabled
"
:default-open="defaultOpen" :default-open="defaultOpen"
:project-id="projectId"
@onClick="onClick" @onClick="onClick"
/> />
</el-form-item> </el-form-item>
@ -87,6 +87,7 @@ export default {
return "preview"; return "preview";
}, },
}, },
projectId: String
}, },
computed: { computed: {
customFieldRowNums() { customFieldRowNums() {