fix content save bug

TooBug · TooBug · commit 2c2d92d64284 · 2019-09-22T12:59:15.000+08:00
diff --git a/lib/controller/main.ts b/lib/controller/main.ts
@@ -9,6 +9,7 @@ interface User {
 };
 
 interface State {
+    noteState: 'LOADING' | 'OPEN',
     currentNoteId: string,
     editorContent: string,
 };
@@ -30,6 +31,7 @@ export default class WebClientController{
             categories: {}
         };
         this._state = {
+            noteState: 'LOADING',
             currentNoteId: '',
             editorContent: '',
         };
@@ -62,6 +64,10 @@ export default class WebClientController{
 
         // 切换笔记
         app.$on('note.switchActive', async (data: any) => {
+            this._state.noteState = 'LOADING';
+            this._view.setData('editor', {
+                content: ''
+            });
             const note = (await this._model.Note.find(data.id)).data.data;
             this._view.setData('editor', {
                 content: note.content
@@ -71,16 +77,17 @@ export default class WebClientController{
 
         // 笔记内容发生变化
         app.$on('editor.change', async (data: any) => {
-            // console.log('currentNoteId', this._state.currentNoteId);
-            // console.log('content', data.content);
-            // todo: 第一次变更不需要保存
-            // todo: 内容与id必须得对应，要不然会串
-            if(!this._state.currentNoteId) return;
-            if(!data.content) return;
+            console.log('editor.change', this._state.currentNoteId, data.content, this._state.noteState);
+            if(this._state.noteState === 'LOADING'){
+                if(this._state.currentNoteId && data.content){
+                    this._state.noteState = 'OPEN';
+                }
+                return;
+            }
+            // if(!data.content) return;
             await this._model.Note.update(this._state.currentNoteId, {
                 content: data.content
             });
-            // console.log('content change saved.');
         });
     }
 
diff --git a/lib/template/standard.html b/lib/template/standard.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scale=no">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>TooNote</title>
     <style>
         *{
diff --git a/lib/view/components/Main.vue b/lib/view/components/Main.vue
@@ -34,10 +34,15 @@ export default createComponent({
         const editor = reactive(getData('editor'));
         const userInfo = reactive(getData('userInfo'));
 
+        let lastContent = editor.data.content;
+
         watch(() => {
-            ctx.root.$webClient.$emit('editor.change', {
-                content: editor.data.content
-            });
+            if(lastContent !== editor.data.content && typeof editor.data.content !== 'undefined'){
+                ctx.root.$webClient.$emit('editor.change', {
+                    content: editor.data.content
+                });
+                lastContent = editor.data.content;
+            }
         });
 
         return {
