XmlFormatEditor

src/components/XmlFormatEditor.vue

@@ -19,7 +19,6 @@ export default {
     };
   },
   watch: {
-<<<<<<< HEAD
     model: function (newVal, oldVal) {
       this.updateValue();
     },
@@ -41,24 +40,6 @@ export default {
           this.$refs.editor.quill.enable(enabled);
         }
       });
-=======
-    model: {
-      handler: function (newVal, oldVal) {
-        let rows = this.model["rows"] || [];
-        let enabled = false;
-        if (this.$refs.editor.quill) {
-          enabled = this.$refs.editor.quill.isEnabled();
-          this.$refs.editor.quill.enable(false);
-        }
-        this.value = this.show(rows);
-        this.$nextTick(() => {
-          if (this.$refs.editor.quill) {
-            this.$refs.editor.quill.enable(enabled);
-          }
-        });
-      },
-      immediate: true
->>>>>>> d40f2617f923aea5c856138450c663c2d8a2e631
     },
     // 修改文本后的失去焦点事件
     blurEvent(quill) {