同步全局loading

ruoyi-ui/src/lang/bo/dataModel.js

@@ -18,7 +18,8 @@ export default {
     msgDelOk: "སུབ་ཟིན།",
     msgModOk: "བཟོ་བཅོས་ཟིན།",
     msgAddOk: "གསར་སྣོན་ཟིན།",
-    ruleLen100: "ཡིག་ཆ་100ལས་མི་ཆོག"
+    ruleLen100: "ཡིག་ཆ་100ལས་མི་ཆོག",
+    syncLoading: "གཞི་གྲངས་མཉམ་སྒྲིག་བཞིན... སྒུག་རོགས།"
   },
   status: {
     dash: "—"

ruoyi-ui/src/lang/bo/livestockFinance.js

@@ -18,7 +18,8 @@ export default {
     unitStep: "གོམ།",
     unitHead: "ཨ།",
     yes: "ཡིན།",
-    no: "མིན།"
+    no: "མིན།",
+    syncLoading: "གཞི་གྲངས་མཉམ་སྒྲིག་བཞིན... སྒུག་རོགས།"
   },
   yakAsset: {
     queryYakNo: "འབྲོང་ཨང་།",

ruoyi-ui/src/lang/zh/dataModel.js

@@ -18,7 +18,8 @@ export default {
     msgDelOk: "删除成功",
     msgModOk: "修改成功",
     msgAddOk: "新增成功",
-    ruleLen100: "长度不能超过 100 个字符"
+    ruleLen100: "长度不能超过 100 个字符",
+    syncLoading: "正在同步数据，请稍候..."
   },
   status: {
     dash: "—"

ruoyi-ui/src/lang/zh/livestockFinance.js

@@ -18,7 +18,8 @@ export default {
     unitStep: "步",
     unitHead: "头",
     yes: "是",
-    no: "否"
+    no: "否",
+    syncLoading: "正在同步数据，请稍候..."
   },
   yakAsset: {
     queryYakNo: "牦牛编号",

ruoyi-ui/src/mixins/dataModelLocaleMixin.js

@@ -24,6 +24,22 @@ export default {
         return this.$t("dataModel.yakDiseaseWarning.warningType9")
       }
       return this.$t("dataModel.status.dash")
+    },
+    /** 第三方数据同步，带全局 loading */
+    runSyncWithLoading(syncFn) {
+      if (this.syncing) {
+        return Promise.reject(new Error("syncing"))
+      }
+      let modalLoading = false
+      this.syncing = true
+      this.$modal.loading(this.dmCommon("syncLoading"))
+      modalLoading = true
+      return syncFn().finally(() => {
+        this.syncing = false
+        if (modalLoading) {
+          this.$modal.closeLoading()
+        }
+      })
     }
   }
 }

ruoyi-ui/src/mixins/livestockFinanceLocaleMixin.js

@@ -12,6 +12,22 @@ export default {
     },
     lfCommon(key) {
       return this.$t(`livestockFinance.common.${key}`)
+    },
+    /** 第三方数据同步，带全局 loading */
+    runSyncWithLoading(syncFn) {
+      if (this.syncing) {
+        return Promise.reject(new Error("syncing"))
+      }
+      let modalLoading = false
+      this.syncing = true
+      this.$modal.loading(this.lfCommon("syncLoading"))
+      modalLoading = true
+      return syncFn().finally(() => {
+        this.syncing = false
+        if (modalLoading) {
+          this.$modal.closeLoading()
+        }
+      })
     }
   }
 }

ruoyi-ui/src/views/dataModel/pasture/index.vue

@@ -292,11 +292,7 @@ export default {
       })
     },
     handleSync() {
-      if (this.syncing) {
-        return
-      }
-      this.syncing = true
-      syncPasture()
+      this.runSyncWithLoading(() => syncPasture())
         .then((res) => {
           const data = res.data || {}
           this.$modal.msgSuccess(
@@ -314,9 +310,7 @@ export default {
           }
           this.getList()
         })
-        .finally(() => {
-          this.syncing = false
-        })
+        .catch(() => {})
     }
   }
 }

ruoyi-ui/src/views/dataModel/yakDiseaseWarning/index.vue

@@ -239,11 +239,7 @@ export default {
       this.assetDrawerOpen = true
     },
     handleSync() {
-      if (this.syncing) {
-        return
-      }
-      this.syncing = true
-      syncYakDiseaseWarning()
+      this.runSyncWithLoading(() => syncYakDiseaseWarning())
         .then((res) => {
           const data = res.data || {}
           this.$modal.msgSuccess(
@@ -258,9 +254,7 @@ export default {
           }
           this.getList()
         })
-        .finally(() => {
-          this.syncing = false
-        })
+        .catch(() => {})
     }
   }
 }

ruoyi-ui/src/views/livestockFinance/yakAsset/index.vue

@@ -171,11 +171,7 @@ export default {
       this.detailOpen = true
     },
     handleSync() {
-      if (this.syncing) {
-        return
-      }
-      this.syncing = true
-      syncYakAsset()
+      this.runSyncWithLoading(() => syncYakAsset())
         .then((res) => {
           const data = res.data || {}
           const msg = this.lfT("syncSummary", {
@@ -189,9 +185,7 @@ export default {
           }
           this.getList()
         })
-        .finally(() => {
-          this.syncing = false
-        })
+        .catch(() => {})
     }
   }
 }