From a486eefd81f7ca0895930d583f6efdbd4240d116 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 26 Dec 2021 01:00:49 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96office=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/js/components/MDEditor/index.vue   |  4 ++--
 resources/assets/js/components/OnlyOffice.vue | 22 ++++++++++++++++++-
 resources/assets/js/functions/common.js       | 22 ++++++++++++-------
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/resources/assets/js/components/MDEditor/index.vue b/resources/assets/js/components/MDEditor/index.vue
index cfe9ed39..421e99df 100755
--- a/resources/assets/js/components/MDEditor/index.vue
+++ b/resources/assets/js/components/MDEditor/index.vue
@@ -227,8 +227,8 @@
                 }
             },
             htmlOk() {
-                $A.loadScript('js/html2md.js', () => {
-                    if (typeof toMarkdown !== 'function') {
+                $A.loadScript('js/html2md.js', (e) => {
+                    if (e !== null || typeof toMarkdown !== 'function') {
                         $A.modalAlert("组件加载失败！");
                         return;
                     }
diff --git a/resources/assets/js/components/OnlyOffice.vue b/resources/assets/js/components/OnlyOffice.vue
index d7d3d470..8559e3c9 100644
--- a/resources/assets/js/components/OnlyOffice.vue
+++ b/resources/assets/js/components/OnlyOffice.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="component-only-office">
         <div :id="this.id" class="placeholder"></div>
+        <div class="office-loading"><Loading v-if="loadIng > 0"/></div>
     </div>
 </template>
 
@@ -19,6 +20,17 @@
         width: 100%;
         height: 100%;
     }
+    .office-loading {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        z-index: 2;
+    }
 }
 </style>
 <script>
@@ -44,6 +56,8 @@ export default {
 
     data() {
         return {
+            loadIng: 0,
+
             fileName: null,
             fileType: null,
             fileUrl: null,
@@ -83,7 +97,13 @@ export default {
                 if (!url) {
                     return;
                 }
-                $A.loadScript(this.$store.state.method.apiUrl("../office/web-apps/apps/api/documents/api.js"), () => {
+                this.loadIng++;
+                $A.loadScript(this.$store.state.method.apiUrl("../office/web-apps/apps/api/documents/api.js"), (e) => {
+                    this.loadIng--;
+                    if (e !== null) {
+                        $A.modalAlert("组件加载失败！");
+                        return;
+                    }
                     this.loadFile()
                 })
             },
diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js
index 8cfb75e1..57880db4 100755
--- a/resources/assets/js/functions/common.js
+++ b/resources/assets/js/functions/common.js
@@ -923,7 +923,7 @@
                 return;
             }
             if (this.__loadScript[url] === true) {
-                typeof callback === "function" && callback();
+                typeof callback === "function" && callback(null);
                 return;
             }
             let script = document.createElement("script");
@@ -933,13 +933,16 @@
                     if (script.readyState === "loaded" || script.readyState === "complete") {
                         script.onreadystatechange = null;
                         this.__loadScript[url] = true;
-                        typeof callback === "function" && callback();
+                        typeof callback === "function" && callback(null);
                     }
                 };
             } else {
                 script.onload = () => {
                     this.__loadScript[url] = true;
-                    typeof callback === "function" && callback();
+                    typeof callback === "function" && callback(null);
+                };
+                script.onerror = (e) => {
+                    typeof callback === "function" && callback(e);
                 };
             }
             if (this.rightExists(url, '.js')) {
@@ -955,7 +958,7 @@
                 if (++i < urls.length) {
                     this.loadScript(urls[i], recursiveCallback)
                 } else {
-                    typeof callback === "function" && callback();
+                    typeof callback === "function" && callback(null);
                 }
             }
             this.loadScript(urls[0], recursiveCallback);
@@ -974,7 +977,7 @@
                 return;
             }
             if (this.__loadCss[url] === true) {
-                typeof callback === "function" && callback();
+                typeof callback === "function" && callback(null);
                 return;
             }
             let script = document.createElement('link');
@@ -983,16 +986,19 @@
                     if (script.readyState == 'loaded' || script.readyState == 'complete') {
                         script.onreadystatechange = null;
                         this.__loadCss[url] = true;
-                        typeof callback === "function" && callback();
+                        typeof callback === "function" && callback(null);
 
                     }
                 };
             } else {
                 script.onload = () => {
                     this.__loadCss[url] = true;
-                    typeof callback === "function" && callback();
+                    typeof callback === "function" && callback(null);
 
                 };
+                script.onerror = (e) => {
+                    typeof callback === "function" && callback(e);
+                };
             }
             script.rel = 'stylesheet';
             if (this.rightExists(url, '.css')) {
@@ -1008,7 +1014,7 @@
                 if (++i < urls.length) {
                     this.loadCss(urls[i], recursiveCallback)
                 } else {
-                    typeof callback === "function" && callback();
+                    typeof callback === "function" && callback(null);
                 }
             }
             this.loadCss(urls[0], recursiveCallback);