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

Merge branch 'master' of https://github.com/metersphere/server

This commit is contained in:
chenjianxing 2020-08-25 15:44:26 +08:00
parent 52049d61d4 75ae9f6ce4
commit b055fac758
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
View File

@ -228,7 +228,7 @@
width="400" width="400"
trigger="hover" trigger="hover"
> >
<ckeditor :editor="editor" disabled <ckeditor :editor="editor" disabled :config="readConfig"
v-model="scope.row.description"/> v-model="scope.row.description"/>
<el-button slot="reference" type="text">{{$t('test_track.issue.preview')}}</el-button> <el-button slot="reference" type="text">{{$t('test_track.issue.preview')}}</el-button>
</el-popover> </el-popover>
@ -312,6 +312,7 @@
// 'increaseIndent','decreaseIndent' // 'increaseIndent','decreaseIndent'
toolbar: ['heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'insertTable', '|', 'undo', 'redo'], toolbar: ['heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'insertTable', '|', 'undo', 'redo'],
}, },
readConfig: {toolbar: []},
test: {}, test: {},
activeTab: 'detail', activeTab: 'detail',
isFailure: true, isFailure: true,

6
frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
View File

@ -121,7 +121,7 @@
width="400" width="400"
trigger="hover" trigger="hover"
> >
<ckeditor :editor="editor" disabled <ckeditor :editor="editor" disabled :config="editorConfig"
v-model="scope.row.description"/> v-model="scope.row.description"/>
<el-button slot="reference" type="text">{{$t('test_track.issue.preview')}}</el-button> <el-button slot="reference" type="text">{{$t('test_track.issue.preview')}}</el-button>
</el-popover> </el-popover>
@ -313,6 +313,10 @@
] ]
}, },
editor: ClassicEditor, editor: ClassicEditor,
editorConfig: {
// 'increaseIndent','decreaseIndent'
toolbar: [],
},
} }
}, },
props: { props: {