Merge pull request #114 from det101/master

demonray · web-flow · commit 9f9798459752 · 2020-06-10T14:33:12.000+08:00
fix editor version bug
diff --git a/web/package.json b/web/package.json
@@ -35,7 +35,7 @@
         "md5": "^2.2.1",
         "mitt": "^1.1.3",
         "moment": "^2.22.2",
-        "monaco-editor": "^0.15.1",
+        "monaco-editor": "^0.20.0",
         "pinyin": "^2.9.0",
         "qs": "^6.9.1",
         "reconnecting-websocket": "^4.1.10",
diff --git a/web/src/js/component/editor/editor.vue b/web/src/js/component/editor/editor.vue
@@ -91,7 +91,7 @@ export default {
         if (newValue == this.getValue()) {
           return;
         }
-        let readOnly = this.editor.getConfiguration().readOnly;
+        let readOnly = this.editor.getRawOptions().readOnly;
         if (readOnly) {
           // editor.setValue 和 model.setValue 都会丢失撤销栈
           this.editor.setValue(newValue);

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ export default {`
`91`	`91`	`if (newValue == this.getValue()) {`
`92`	`92`	`return;`
`93`	`93`	`}`
`94`		`- let readOnly = this.editor.getConfiguration().readOnly;`
	`94`	`+ let readOnly = this.editor.getRawOptions().readOnly;`
`95`	`95`	`if (readOnly) {`
`96`	`96`	`// editor.setValue 和 model.setValue 都会丢失撤销栈`
`97`	`97`	`this.editor.setValue(newValue);`