test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(测试跟踪): 创建用例和缺陷的时候富文本框默认为编辑模式 

--bug=1013698 --user=陈建星 【测试跟踪】富文本框默认改成编辑状态 https://www.tapd.cn/55049933/s/1175991
This commit is contained in:
chenjianxing 2022-06-08 15:46:54 +08:00 committed by f2c-ci-robot[bot]
parent 458a300534
commit 8a6257a350
10 changed files with 140 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
View File

@ -6,13 +6,21 @@
<el-col :span="8" v-if="item.type !== 'richText'">
<el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
:label-width="formLabelWidth">
<custom-filed-component :data="item" :form="form" prop="defaultValue" :disabled="isPublic"/>
<custom-filed-component
prop="defaultValue"
:data="item"
:form="form"
:default-open="defaultOpen"
:disabled="isPublic"/>
</el-form-item>
</el-col>
<div v-else>
<el-col :span="24">
<el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
:label-width="formLabelWidth">
<el-form-item
:label="item.system ? $t(systemNameMap[item.name]) : item.name"
:prop="item.name"
:default-open="defaultOpen"
:label-width="formLabelWidth">
<custom-filed-component :data="item" :form="form" prop="defaultValue"/>
</el-form-item>
</el-col>
@ -44,7 +52,13 @@ export default {
default() {
return false;
}
}
},
defaultOpen: {
type: String,
default() {
return 'preview';
}
},
},
computed: {
customFieldRowNums() {

16
frontend/src/business/components/common/components/form/CustomFiledFormRow.vue
View File

@ -6,7 +6,13 @@
<el-col :span="24">
<el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
:label-width="formLabelWidth">
<custom-filed-component :data="item" :form="form" prop="defaultValue" :disabled="(item.type !== 'richText' && isPublic) || disabled"/>
<custom-filed-component
:data="item"
:form="form"
prop="defaultValue"
:disabled="(item.type !== 'richText' && isPublic) || disabled"
:default-open="defaultOpen"
/>
</el-form-item>
</el-col>
</span>
@ -42,7 +48,13 @@ export default {
default() {
return false;
}
}
},
defaultOpen: {
type: String,
default() {
return 'preview';
}
},
},
computed: {
customFieldRowNums() {

4
frontend/src/business/components/project/template/CustomFiledComponent.vue
View File

@ -99,6 +99,7 @@
<ms-mark-down-text v-else-if="data.type === 'richText'"
:prop="prop"
@change="handleChange"
:default-open="defaultOpen"
:data="data" :disabled="disabled"/>
<el-input class="custom-with"
@ -124,7 +125,8 @@ export default {
'data',
'prop',
'form',
'disabled'
'disabled',
'defaultOpen'
],
data() {
return {

16
frontend/src/business/components/track/case/components/FormRichTextItem.vue
View File

@ -1,6 +1,6 @@
<template>
<el-form-item :disable="true" :label="title" :prop="prop" :label-width="labelWidth">
<ms-mark-down-text :prop="prop" :data="data" :disabled="disabled"/>
<ms-mark-down-text :prop="prop" :data="data" :disabled="disabled" :default-open="defaultOpen"/>
</el-form-item>
</template>
@ -9,7 +9,19 @@ import MsMarkDownText from "@/business/components/track/case/components/MsMarkDo
export default {
name: "FormRichTextItem",
components: {MsMarkDownText},
props: ['data', 'title', 'prop', 'disabled', 'labelWidth']
props: {
data: Object,
prop: String,
disabled: Boolean,
title: String,
defaultOpen: {
type: String,
default() {
return 'preview';
}
},
labelWidth: [String, Number]
}
}
</script>

37
frontend/src/business/components/track/case/components/MsMarkDownText.vue
View File

@ -1,5 +1,5 @@
<template>
<mavon-editor :id="id" :editable="!disabled" @imgAdd="imgAdd" :default-open="defaultOpen"
<mavon-editor :id="id" :editable="!disabled" @imgAdd="imgAdd" :default-open="defaultOpenValue"
:xss-options="xssOptions" :style="{'min-height': customMinHeight + 'px'}"
@change="$emit('change')"
:subfield="false" :toolbars="toolbars" :language="language" :toolbarsFlag="!disabled"
@ -18,6 +18,12 @@ export default {
data: Object,
prop: String,
disabled: Boolean,
defaultOpen: {
type: String,
default() {
return 'preview';
}
},
autoReview: {
type: Boolean,
default() {
@ -110,7 +116,7 @@ export default {
},
stripIgnoreTagBody: true
},
defaultOpen: 'preview'
defaultOpenValue: 'preview'
}
},
@ -134,28 +140,41 @@ export default {
}
}
},
watch: {
defaultOpen() {
if (this.defaultOpen) {
this.defaultOpenValue = this.defaultOpen;
}
}
},
mounted() {
if (!this.disabled) {
// 点击编辑，失去焦点展示
let el = document.getElementById(this.id);
if (!this.autoReview) {
this.defaultOpen = null;
this.defaultOpenValue = null;
}
if (this.defaultOpen) {
this.defaultOpenValue = this.defaultOpen;
}
if (el) {
el.addEventListener('click', () => {
let imagePreview = el.getElementsByClassName('v-note-img-wrapper');
if (imagePreview.length > 0) { // 图片预览的时候不切换到编辑模式
if (this.autoReview)
this.defaultOpen = 'preview';
if (this.autoReview) {
this.defaultOpenValue = 'preview';
}
} else {
if (this.autoReview)
this.defaultOpen = null;
if (this.autoReview) {
this.defaultOpenValue = null;
}
}
});
let input = el.getElementsByClassName('auto-textarea-input');
input[0].addEventListener('blur', () => {
if (this.autoReview)
this.defaultOpen = 'preview';
if (this.autoReview) {
this.defaultOpenValue = 'preview';
}
});
}
}

2
frontend/src/business/components/track/case/components/TestCaseBaseInfo.vue
View File

@ -50,6 +50,7 @@
class="case-form">
<custom-filed-form-row :form="customFieldForm"
:disabled="readOnly"
:default-open="defaultOpen"
:issue-template="testCaseTemplate"/>
</el-form>
@ -112,6 +113,7 @@ export default {
customFieldForm: Object,
customFieldRules: Object,
testCaseTemplate: Object,
defaultOpen: String
},
computed: {
isCustomNum() {

38
frontend/src/business/components/track/case/components/TestCaseEdit.vue
View File

@ -16,6 +16,7 @@
:custom-field-form="customFieldForm"
:custom-field-rules="customFieldRules"
:test-case-template="testCaseTemplate"
:default-open="richTextDefaultOpen"
ref="testCaseBaseInfo"
/>
</ms-aside-container>
@ -70,17 +71,34 @@
</div>
<ms-form-divider :title="$t('test_track.case.step_info')"/>
<form-rich-text-item :disabled="readOnly" :label-width="formLabelWidth"
:title="$t('test_track.case.prerequisite')" :data="form" prop="prerequisite"/>
<form-rich-text-item :disabled="readOnly"
:label-width="formLabelWidth"
:title="$t('test_track.case.prerequisite')"
:data="form"
:default-open="richTextDefaultOpen"
prop="prerequisite"/>
<step-change-item :label-width="formLabelWidth" :form="form"/>
<form-rich-text-item :disabled="readOnly" :label-width="formLabelWidth" v-if="form.stepModel === 'TEXT'"
:title="$t('test_track.case.step_desc')" :data="form" prop="stepDescription"/>
<form-rich-text-item :disabled="readOnly" :label-width="formLabelWidth" v-if="form.stepModel === 'TEXT'"
:title="$t('test_track.case.expected_results')" :data="form" prop="expectedResult"/>
<form-rich-text-item v-if="form.stepModel === 'TEXT'"
prop="stepDescription"
:disabled="readOnly"
:label-width="formLabelWidth"
:title="$t('test_track.case.step_desc')"
:data="form"
:default-open="richTextDefaultOpen"/>
<test-case-step-item :label-width="formLabelWidth" v-if="form.stepModel === 'STEP' || !form.stepModel"
:form="form" :read-only="readOnly"/>
<form-rich-text-item v-if="form.stepModel === 'TEXT'"
prop="expectedResult"
:disabled="readOnly"
:label-width="formLabelWidth"
:title="$t('test_track.case.expected_results')"
:data="form"
:default-open="richTextDefaultOpen"/>
<test-case-step-item v-if="form.stepModel === 'STEP' || !form.stepModel"
:label-width="formLabelWidth"
:form="form"
:read-only="readOnly"/>
<ms-form-divider :title="$t('test_track.case.other_info')"/>
@ -91,6 +109,7 @@
@openComment="openComment"
:is-click-attachment-tab.sync="isClickAttachmentTab"
:version-enable="versionEnable"
:default-open="richTextDefaultOpen"
ref="otherInfo"/>
<test-case-comment :case-id="form.id"
@getComments="getComments" ref="testCaseComment"/>
@ -315,6 +334,9 @@ export default {
isCustomNum() {
return this.$store.state.currentProjectIsCustomNum;
},
richTextDefaultOpen() {
return this.type === 'edit' ? 'preview' : 'edit';
},
readOnly() {
const {rowClickHasPermission} = this.currentTestCaseInfo;
if (rowClickHasPermission !== undefined) {

12
frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
View File

@ -2,7 +2,12 @@
<el-tabs class="other-info-tabs" v-loading="result.loading" v-model="tabActiveName">
<el-tab-pane :label="$t('commons.remark')" name="remark">
<el-row>
<form-rich-text-item class="remark-item" :disabled="readOnly" :data="form" prop="remark"/>
<form-rich-text-item
class="remark-item"
:disabled="readOnly"
:data="form"
:default-open="defaultOpen"
prop="remark"/>
</el-row>
</el-tab-pane>
<el-tab-pane :label="$t('test_track.case.relate_test')" name="relateTest">
@ -134,7 +139,10 @@ export default {
ReviewCommentItem,
FormRichTextItem, TestCaseIssueRelate, TestCaseAttachment, MsRichText, TestCaseRichText
},
props: ['form', 'labelWidth', 'caseId', 'readOnly', 'projectId', 'isTestPlan', 'planId', 'versionEnable', 'isCopy', 'isTestPlanEdit', 'type', 'comments', 'isClickAttachmentTab'],
props: ['form', 'labelWidth', 'caseId', 'readOnly', 'projectId', 'isTestPlan', 'planId', 'versionEnable', 'isCopy', 'isTestPlanEdit',
'type', 'comments', 'isClickAttachmentTab',
'defaultOpen'
],
data() {
return {
result: {},

17
frontend/src/business/components/track/issue/IssueEditDetail.vue
View File

@ -29,7 +29,11 @@
<!-- 自定义字段 -->
<el-form :model="customFieldForm" :rules="customFieldRules" ref="customFieldForm" class="case-form">
<custom-filed-form-item :form="customFieldForm" :form-label-width="formLabelWidth" :issue-template="issueTemplate"/>
<custom-filed-form-item
:form="customFieldForm"
:default-open="richTextDefaultOpen"
:form-label-width="formLabelWidth"
:issue-template="issueTemplate"/>
</el-form>
<el-row v-if="jiraTransitions">
@ -45,7 +49,12 @@
</el-col>
</el-row>
<form-rich-text-item v-if="!enableThirdPartTemplate" :title="$t('custom_field.issue_content')" :data="form" prop="description"/>
<form-rich-text-item
v-if="!enableThirdPartTemplate"
:title="$t('custom_field.issue_content')"
:data="form"
:default-open="richTextDefaultOpen"
prop="description"/>
<el-row v-if="!enableThirdPartTemplate" class="custom-field-row">
<el-col :span="8" v-if="hasTapdId">
@ -231,7 +240,8 @@ export default {
subfield: false, // 单双栏模式
preview: false, // 预览
},
comments: []
comments: [],
richTextDefaultOpen: 'preview'
};
},
props: {
@ -278,6 +288,7 @@ export default {
open(data, type) {
this.result.loading = true;
this.type = type;
this.richTextDefaultOpen = this.type === 'edit' ? 'preview' : 'edit';
this.$nextTick(() => {
getIssuePartTemplateWithProject((template, project) => {
this.currentProject = project;

8
frontend/src/business/components/track/review/commom/ReviewComment.vue
View File

@ -17,7 +17,13 @@
<div>
<div class="editors_div_style">
<div id="editorsDiv">
<ms-mark-down-text prop="description" :data="form" :toolbars="toolbars" ref="md" custom-min-height="220"/>
<ms-mark-down-text
default-open="edit"
prop="description"
custom-min-height="220"
:data="form"
:toolbars="toolbars"
ref="md"/>
</div>
</div>