diff --git a/package.json b/package.json index 5b20012..dacb85f 100644 --- a/package.json +++ b/package.json @@ -29,9 +29,10 @@ "jshint": "^2.11.1", "less-loader": "^6.1.0", "lib-flexible": "^0.3.2", + "monaco-editor": "^0.23.0", "monaco-editor-vue": "^1.0.10", - "monaco-editor-webpack-plugin": "^1.9.0", - "monaco-languages": "^1.10.0", + "monaco-editor-webpack-plugin": "^3.0.1", + "monaco-languages": "^2.3.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", diff --git a/src/components/FancyTree/index.vue b/src/components/FancyTree/index.vue index 68b9f91..1c21946 100644 --- a/src/components/FancyTree/index.vue +++ b/src/components/FancyTree/index.vue @@ -325,10 +325,12 @@ return doc }) if(reLoad){ - this.tree.reload(this.convert(data)) - if(activeNodeData){ - this.$emit('treeNodeClick', activeNodeData) - } + this.$nextTick(() => { + this.tree.reload(this.convert(data)) + if(activeNodeData){ + this.$emit('treeNodeClick', activeNodeData) + } + }) }else{ this.initTree(this.convert(data)) } diff --git a/src/components/preview/SimTextPreview.vue b/src/components/preview/SimTextPreview.vue index 32277ad..997ce7a 100644 --- a/src/components/preview/SimTextPreview.vue +++ b/src/components/preview/SimTextPreview.vue @@ -554,7 +554,6 @@ if(this.$store.state.user.token && this.$store.state.user.userId === fileUserId){ this.options.readOnly = false } - console.log(this.options.readOnly, this.moblie) if(this.options.readOnly || this.moblie){ this.$nextTick(()=> { this.editorWidth += this.contentsWidth