perf: 优化全局提示

resources/assets/js/components/NetworkException.vue

@@ -1,11 +1,11 @@
 <template>
     <div class="common-network-exception">
         <template v-if="type==='alert'">
-            <Alert v-if="show" type="error" show-icon closable>{{$L('网络连接失败，请检查网络设置。')}}</Alert>
+            <Alert v-if="show" type="error" show-icon closable @on-close="onClose">{{$L('网络连接失败，请检查网络设置。')}}</Alert>
         </template>
         <template v-else-if="type==='modal'">
             <Modal
-                v-model="show"
+                :value="show"
                 :width="416"
                 :closable="false"
                 :mask-closable="false"
@@ -18,7 +18,8 @@
                         <div>{{ajaxNetworkException}}</div>
                     </div>
                     <div class="ivu-modal-confirm-footer">
-                        <Button type="primary" @click="show = false">{{$L('确定')}}</Button>
+                        <Button type="text" @click="onClose">{{$L('关闭提示')}}</Button>
+                        <Button type="primary" :loading="loadIng" @click="onCheck">{{$L('重试')}}</Button>
                     </div>
                 </div>
             </Modal>
@@ -39,32 +40,30 @@ export default {
     },
     data() {
         return {
-            show: false,
+            timer: null,
-            timeShow: null,
+            checkIng: false,
-            timeCheck: null,
+            loadIng: false
         }
     },
 
     beforeDestroy() {
-        this.clearTimer()
+        this.onClose()
     },
 
     computed: {
         ...mapState(['ajaxNetworkException']),
+
+        show() {
+            return !!this.ajaxNetworkException
+        }
     },
 
     watch: {
-        ajaxNetworkException: {
+        show(v) {
-            handler(v) {
+            this.timer && clearInterval(this.timer)
-                this.clearTimer()
+            if (v) {
-                if (v) {
+                this.timer = setInterval(this.checkNetwork, 3000)
-                    this.checkNetwork();
+            }
-                    this.timeShow = setTimeout(_ => {
-                        this.show = true;
-                    }, 5000)
-                }
-            },
-            immediate: true
         }
     },
 
@@ -74,26 +73,60 @@ export default {
             return this.$isSoftware && (apiHome == "" || apiHome == "public")
         },
 
-        checkNetwork() {
+        /**
-            this.timeCheck && clearTimeout(this.timeCheck);
+         * 调用网络
-            this.timeCheck = setTimeout(() => {
+         * @returns {Promise<void>}
-                if (!this.ajaxNetworkException) {
+         */
-                    return; // 已经恢复
+        async callNetwork() {
-                }
+            if (this.isNotServer()) {
-                if (this.isNotServer()) {
+                this.onClose()
-                    return; // 没有配置服务器地址
+                return;
-                }
+            }
-                this.$store.dispatch("call", {
+            await this.$store.dispatch("call", {
-                    url: "system/setting",
+                url: "system/setting",
-                }).finally(() => {
+            })
-                    this.checkNetwork();
+            this.onClose()
-                });
-            }, 3000);
         },
 
-        clearTimer() {
+        /**
-            this.timeShow && clearTimeout(this.timeShow)
+         * 检查网络（自动）
-            this.show = false
+         * @returns {Promise<void>}
+         */
+        async checkNetwork() {
+            if (this.checkIng) {
+                return
+            }
+            this.checkIng = true
+            try {
+                await this.callNetwork()
+            } catch (e) {
+                //
+            }
+            this.checkIng = false
+        },
+
+        /**
+         * 检查网络（重试）
+         * @returns {Promise<void>}
+         */
+        async onCheck() {
+            if (this.loadIng) {
+                return
+            }
+            this.loadIng = true
+            try {
+                await this.callNetwork()
+            } catch (e) {
+                $A.messageError("网络连接失败")
+            }
+            this.loadIng = false
+        },
+
+        /**
+         * 关闭提示
+         */
+        onClose() {
+            this.$store.state.ajaxNetworkException = null
         }
     }
 }

resources/assets/js/pages/manage/setting/index.vue

@@ -211,22 +211,29 @@ export default {
             };
         },
 
-        onVersion() {
+        async onVersion() {
-            const array = []
+            const array = [
-            this.getServerVersion().then(version => {
+                `${this.$L('服务器')}: ${$A.getDomain($A.mainUrl())}`
-                array.push(`${this.$L('服务器')}: ${$A.getDomain($A.mainUrl())}`)
+            ]
+            await this.$store.dispatch("showSpinner", 600)
+            try {
+                const version = await this.getServerVersion()
                 array.push(`${this.$L('服务器版本')}: v${version}`)
-                array.push(`${this.$L('客户端版本')}: v${this.version}`)
+            } catch (e) {
-                $A.modalInfo({
+                array.push(`${this.$L('服务器版本')}: ` + this.$L('获取失败'))
-                    language: false,
+            }
-                    title: this.$L('版本信息'),
+            await this.$store.dispatch("hiddenSpinner")
-                    content: array.join('<br/>')
+            array.push(`${this.$L('客户端版本')}: v${this.version}`)
-                })
+            //
+            $A.modalInfo({
+                language: false,
+                title: this.$L('版本信息'),
+                content: array.join('<br/>')
             })
         },
 
         getServerVersion() {
-            return new Promise(resolve => {
+            return new Promise((resolve, reject) => {
                 if (/^\d+\.\d+\.\d+$/.test(this.systemConfig.server_version)) {
                     resolve(this.systemConfig.server_version)
                     return;
@@ -235,7 +242,7 @@ export default {
                     if (status === 200) {
                         resolve(data.version)
                     }
-                }).catch(_ => { })
+                }).catch(reject)
             })
         }
     }

resources/assets/js/store/actions.js

@@ -249,8 +249,6 @@ export default {
 
             // 请求成功
             params.success = async (result, status, xhr) => {
-                state.ajaxNetworkException = null
-
                 // 数据校验
                 if (!$A.isJson(result)) {
                     console.log(result, status, xhr)