zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 3057489cc6 into 33a93a12b4

This commit is contained in:
likwotsing 2020-12-05 03:55:40 -08:00 committed by GitHub
parent 33a93a12b4 3057489cc6
commit eb6186b164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -15,6 +15,7 @@
"test:ci": "npm run lint && npm run test:unit"
},
"dependencies": {
"@toast-ui/editor": "^2.2.0",
"axios": "0.18.1",
"clipboard": "2.0.4",
"codemirror": "5.45.0",
@ -34,7 +35,6 @@
"screenfull": "4.2.0",
"script-loader": "0.7.2",
"sortablejs": "1.8.4",
"tui-editor": "1.3.3",
"vue": "2.6.10",
"vue-count-to": "1.0.13",
"vue-router": "3.0.2",

19
src/components/MarkdownEditor/index.vue
View File

@ -4,11 +4,10 @@
<script>
// deps for editor
import 'codemirror/lib/codemirror.css' // codemirror
import 'tui-editor/dist/tui-editor.css' // editor ui
import 'tui-editor/dist/tui-editor-contents.css' // editor content
import 'codemirror/lib/codemirror.css' // Editor's Dependency Style
import '@toast-ui/editor/dist/toastui-editor.css' // Editor's Style
import Editor from 'tui-editor'
import Editor from '@toast-ui/editor'
import defaultOptions from './default-options'
export default {
@ -62,8 +61,8 @@ export default {
},
watch: {
value(newValue, preValue) {
if (newValue !== preValue && newValue !== this.editor.getValue()) {
this.editor.setValue(newValue)
if (newValue !== preValue && newValue !== this.editor.getMarkdown()) {
this.editor.setMarkdown(newValue)
}
},
language(val) {
@ -90,10 +89,10 @@ export default {
...this.editorOptions
})
if (this.value) {
this.editor.setValue(this.value)
this.editor.setMarkdown(this.value)
}
this.editor.on('change', () => {
this.$emit('input', this.editor.getValue())
this.$emit('input', this.editor.getMarkdown())
})
},
destroyEditor() {
@ -102,10 +101,10 @@ export default {
this.editor.remove()
},
setValue(value) {
this.editor.setValue(value)
this.editor.setMarkdown(value)
},
getValue() {
return this.editor.getValue()
return this.editor.getMarkdown()
},
setHtml(value) {
this.editor.setHtml(value)