From 5fe79c4bad63c84143bc7e20a99a186aa6f98f72 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 11 Dec 2021 00:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                            |  2 +-
 .../pages/manage/components/FileContent.vue   | 38 ++++++++++++++-----
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9a3fe107..c132bb4c 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -96,7 +96,7 @@ services:
 
   fileview:
     container_name: "dootask-fileview-${APP_ID}"
-    image: "kuaifan/fileview:4.1.0"
+    image: "kuaifan/fileview:4.1.0-SNAPSHOT"
     environment:
       TZ: "Asia/Shanghai"
       KK_CONTEXT_PATH: "/fileview"
diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue
index b542f5ca..bda5b9d9 100644
--- a/resources/assets/js/pages/manage/components/FileContent.vue
+++ b/resources/assets/js/pages/manage/components/FileContent.vue
@@ -14,7 +14,7 @@
                         </div>
                         <span slot="reference">[{{$L('未保存')}}*]</span>
                     </EPopover>
-                    {{formatName(file.name, file.type)}}
+                    {{formatName(file)}}
                 </div>
                 <div class="header-user">
                     <ul>
@@ -62,7 +62,7 @@
                 <OnlyOffice v-else-if="['word', 'excel', 'ppt'].includes(file.type)" v-model="contentDetail"/>
             </div>
         </template>
-        <div v-if="loadContent > 0" class="content-load"><Loading/></div>
+        <div v-if="loadContent > 0 || previewLoad" class="content-load"><Loading/></div>
     </div>
 </template>
 
@@ -106,10 +106,19 @@ export default {
             contentDetail: null,
             contentBak: {},
 
-            editUser: []
+            editUser: [],
+
+            loadPreview: true,
         }
     },
 
+    mounted() {
+        window.addEventListener('message', this.handleMessage)
+    },
+    beforeDestroy() {
+        window.removeEventListener('message', this.handleMessage)
+    },
+
     watch: {
         file: {
             handler(info) {
@@ -174,6 +183,10 @@ export default {
             return this.contentDetail && this.contentDetail.preview === true;
         },
 
+        previewLoad() {
+            return this.isPreview && this.loadPreview === true;
+        },
+
         previewUrl() {
             if (this.isPreview) {
                 return this.$store.state.method.apiUrl("../fileview/onlinePreview?url=" + encodeURIComponent(this.contentDetail.url))
@@ -184,6 +197,15 @@ export default {
     },
 
     methods: {
+        handleMessage (event) {
+            const data = event.data;
+            switch (data.act) {
+                case 'ready':
+                    this.loadPreview = false;
+                    break
+            }
+        },
+
         getContent() {
             if (!this.fileId) {
                 this.contentDetail = {};
@@ -287,13 +309,9 @@ export default {
             this.unsaveTip = false;
         },
 
-        formatName(name, type) {
-            if (type == 'word') {
-                name += ".docx";
-            } else if (type == 'excel') {
-                name += ".xlsx";
-            } else if (type == 'ppt') {
-                name += ".pptx";
+        formatName({name, ext}) {
+            if (ext != '') {
+                name += "." + ext;
             }
             return name;
         },