diff --git a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
index 15115a9d0b..cebdfcd4bb 100644
--- a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
+++ b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
@@ -6,13 +6,21 @@
-
+
-
+
@@ -44,7 +52,13 @@ export default {
default() {
return false;
}
- }
+ },
+ defaultOpen: {
+ type: String,
+ default() {
+ return 'preview';
+ }
+ },
},
computed: {
customFieldRowNums() {
diff --git a/frontend/src/business/components/common/components/form/CustomFiledFormRow.vue b/frontend/src/business/components/common/components/form/CustomFiledFormRow.vue
index bcf7e71d84..bd8454de21 100644
--- a/frontend/src/business/components/common/components/form/CustomFiledFormRow.vue
+++ b/frontend/src/business/components/common/components/form/CustomFiledFormRow.vue
@@ -6,7 +6,13 @@
-
+
@@ -42,7 +48,13 @@ export default {
default() {
return false;
}
- }
+ },
+ defaultOpen: {
+ type: String,
+ default() {
+ return 'preview';
+ }
+ },
},
computed: {
customFieldRowNums() {
diff --git a/frontend/src/business/components/project/template/CustomFiledComponent.vue b/frontend/src/business/components/project/template/CustomFiledComponent.vue
index cd4c9a8d0f..f7553f4287 100644
--- a/frontend/src/business/components/project/template/CustomFiledComponent.vue
+++ b/frontend/src/business/components/project/template/CustomFiledComponent.vue
@@ -99,6 +99,7 @@
-
+
@@ -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]
+ }
}
diff --git a/frontend/src/business/components/track/case/components/MsMarkDownText.vue b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
index 4a3e3b54b3..9e1ae167e7 100644
--- a/frontend/src/business/components/track/case/components/MsMarkDownText.vue
+++ b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
@@ -1,5 +1,5 @@
- {
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';
+ }
});
}
}
diff --git a/frontend/src/business/components/track/case/components/TestCaseBaseInfo.vue b/frontend/src/business/components/track/case/components/TestCaseBaseInfo.vue
index 7759dfa1e6..7b6b755c07 100644
--- a/frontend/src/business/components/track/case/components/TestCaseBaseInfo.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseBaseInfo.vue
@@ -50,6 +50,7 @@
class="case-form">
@@ -112,6 +113,7 @@ export default {
customFieldForm: Object,
customFieldRules: Object,
testCaseTemplate: Object,
+ defaultOpen: String
},
computed: {
isCustomNum() {
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 7af2a1a33c..da7876991e 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -16,6 +16,7 @@
:custom-field-form="customFieldForm"
:custom-field-rules="customFieldRules"
:test-case-template="testCaseTemplate"
+ :default-open="richTextDefaultOpen"
ref="testCaseBaseInfo"
/>
@@ -70,17 +71,34 @@
-
+
-
-
+
-
+
+
+
@@ -91,6 +109,7 @@
@openComment="openComment"
:is-click-attachment-tab.sync="isClickAttachmentTab"
:version-enable="versionEnable"
+ :default-open="richTextDefaultOpen"
ref="otherInfo"/>
@@ -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) {
diff --git a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
index c8f66b75ea..6f778a68f2 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
@@ -2,7 +2,12 @@
-
+
@@ -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: {},
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index 06817ea859..99e0b97fea 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -29,7 +29,11 @@
-
+
@@ -45,7 +49,12 @@
-
+
@@ -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;
diff --git a/frontend/src/business/components/track/review/commom/ReviewComment.vue b/frontend/src/business/components/track/review/commom/ReviewComment.vue
index 80b7a6f329..feed2cc3c9 100644
--- a/frontend/src/business/components/track/review/commom/ReviewComment.vue
+++ b/frontend/src/business/components/track/review/commom/ReviewComment.vue
@@ -17,7 +17,13 @@