From d0c7ee5e47aba43683dcb3032b7f3def8fd47e44 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 22 Apr 2022 15:55:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=96=87=E4=BB=B6=E9=9C=80=E5=88=B7=E6=96=B0=E7=BD=91?=
 =?UTF-8?q?=E9=A1=B5=E6=89=8D=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/manage/components/FileContent.vue   | 45 ++++++-------------
 resources/assets/js/store/state.js            |  1 -
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue
index 9db48211c..256f6347a 100644
--- a/resources/assets/js/pages/manage/components/FileContent.vue
+++ b/resources/assets/js/pages/manage/components/FileContent.vue
@@ -43,7 +43,7 @@
                         <DropdownItem name="pdf">{{$L('导出PDF文件')}}</DropdownItem>
                     </DropdownMenu>
                 </Dropdown>
-                <Button v-if="!file.only_view" :disabled="equalContent" :loading="loadIng > 0" class="header-button" size="small" type="primary" @click="handleClick('save')">{{$L('保存')}}</Button>
+                <Button v-if="!file.only_view" :disabled="equalContent" :loading="loadSave > 0" class="header-button" size="small" type="primary" @click="handleClick('save')">{{$L('保存')}}</Button>
             </div>
             <div v-if="contentDetail" class="content-body">
                 <template v-if="file.type=='document'">
@@ -92,10 +92,8 @@ export default {
         return {
             ready: false,
 
+            loadSave: 0,
             loadContent: 0,
-            loadIng: 0,
-
-            fileId: 0,
 
             unsaveTip: false,
 
@@ -135,25 +133,12 @@ export default {
     },
 
     watch: {
-        file: {
-            handler(info) {
-                if (this.fileId != info.id) {
-                    this.fileId = info.id;
-                    this.contentDetail = null;
-                    this.getContent();
-                }
-            },
-            immediate: true,
-            deep: true,
-        },
-
         value: {
             handler(val) {
                 if (val) {
                     this.ready = true;
                     this.editUser = [this.userId];
-                } else {
-                    this.fileContent[this.fileId] = this.contentDetail;
+                    this.getContent();
                 }
             },
             immediate: true,
@@ -189,7 +174,11 @@ export default {
     },
 
     computed: {
-        ...mapState(['fileContent', 'wsMsg', 'userId']),
+        ...mapState(['wsMsg', 'userId']),
+
+        fileId() {
+            return this.file.id || 0
+        },
 
         equalContent() {
             return this.contentBak == $A.jsonStringify(this.contentDetail);
@@ -236,22 +225,17 @@ export default {
         },
 
         getContent() {
-            if (!this.fileId) {
+            if (this.fileId === 0) {
                 this.contentDetail = {};
                 this.updateBak();
                 return;
             }
-            if (typeof this.fileContent[this.fileId] !== "undefined") {
-                this.contentDetail = this.fileContent[this.fileId];
-                this.updateBak();
-                return;
-            }
             if (['word', 'excel', 'ppt'].includes(this.file.type)) {
                 this.contentDetail = $A.cloneJSON(this.file);
                 this.updateBak();
                 return;
             }
-            this.loadIng++;
+            this.loadSave++;
             this.loadContent++;
             this.$store.dispatch("call", {
                 url: 'file/content',
@@ -264,7 +248,7 @@ export default {
             }).catch(({msg}) => {
                 $A.modalError(msg);
             }).finally(_ => {
-                this.loadIng--;
+                this.loadSave--;
                 this.loadContent--;
             })
         },
@@ -276,7 +260,7 @@ export default {
         handleClick(act) {
             switch (act) {
                 case "saveBefore":
-                    if (!this.equalContent && this.loadIng == 0) {
+                    if (!this.equalContent && this.loadSave == 0) {
                         this.handleClick('save');
                     } else {
                         $A.messageWarning('没有任何修改！');
@@ -288,7 +272,7 @@ export default {
                         return;
                     }
                     this.updateBak();
-                    this.loadIng++;
+                    this.loadSave++;
                     this.$store.dispatch("call", {
                         url: 'file/content/save',
                         method: 'post',
@@ -306,7 +290,7 @@ export default {
                         $A.modalError(msg);
                         this.getContent();
                     }).finally(_ => {
-                        this.loadIng--;
+                        this.loadSave--;
                     })
                     break;
             }
@@ -321,7 +305,6 @@ export default {
         },
 
         unSaveGive() {
-            delete this.fileContent[this.fileId];
             this.getContent();
             this.unsaveTip = false;
         },
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 4b7c0276e..2bfe385c6 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -63,7 +63,6 @@ const stateData = {
 
     // 文件
     files: [],
-    fileContent: {},
 
     // 项目任务
     projectId: 0,