From b64d6db597d332c699f84e4928f6d3e5551851f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 16:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/plugins/download.js |  131 +++++++++++++++++++++++++++++--------------
 1 files changed, 89 insertions(+), 42 deletions(-)

diff --git a/src/plugins/download.js b/src/plugins/download.js
index 42acd00..c0c1878 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -1,79 +1,126 @@
-import axios from 'axios'
-import {Loading, Message} from 'element-ui'
-import { saveAs } from 'file-saver'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
+import axios from "axios";
+import { Loading, Message } from "element-ui";
+import { saveAs } from "file-saver";
+import { getToken } from "@/utils/auth";
+import errorCode from "@/utils/errorCode";
 import { blobValidate } from "@/utils/ruoyi";
 
-const baseURL = process.env.VUE_APP_BASE_API
+const baseURL = process.env.VUE_APP_BASE_API;
 let downloadLoadingInstance;
 
 export default {
   name(name, isDelete = true) {
-    var url = baseURL + "/common/download?fileName=" + encodeURIComponent(name) + "&delete=" + isDelete
+    var url =
+      baseURL +
+      "/common/download?fileName=" +
+      encodeURIComponent(name) +
+      "&delete=" +
+      isDelete;
     axios({
-      method: 'get',
+      method: "get",
       url: url,
-      responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      responseType: "blob",
+      headers: { Authorization: "Bearer " + getToken() },
     }).then((res) => {
       const isBlob = blobValidate(res.data);
       if (isBlob) {
-        const blob = new Blob([res.data])
-        this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
+        const blob = new Blob([res.data]);
+        this.saveAs(blob, decodeURIComponent(res.headers["download-filename"]));
       } else {
         this.printErrMsg(res.data);
       }
-    })
+    });
   },
   resource(resource) {
-    var url = baseURL + "/common/download/resource?resource=" + encodeURIComponent(resource);
+    var url =
+      baseURL +
+      "/common/download/resource?resource=" +
+      encodeURIComponent(resource);
     axios({
-      method: 'get',
+      method: "get",
       url: url,
-      responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      responseType: "blob",
+      headers: { Authorization: "Bearer " + getToken() },
     }).then((res) => {
       const isBlob = blobValidate(res.data);
       if (isBlob) {
-        const blob = new Blob([res.data])
-        this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
+        const blob = new Blob([res.data]);
+        this.saveAs(blob, decodeURIComponent(res.headers["download-filename"]));
       } else {
         this.printErrMsg(res.data);
       }
-    })
+    });
   },
   zip(url, name) {
-    var url = baseURL + url
-    downloadLoadingInstance = Loading.service({ text: "姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+    var url = baseURL + url;
+    downloadLoadingInstance = Loading.service({
+      text: "姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��",
+      spinner: "el-icon-loading",
+      background: "rgba(0, 0, 0, 0.7)",
+    });
     axios({
-      method: 'get',
+      method: "get",
       url: url,
-      responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
-    }).then((res) => {
-      const isBlob = blobValidate(res.data);
-      if (isBlob) {
-        const blob = new Blob([res.data], { type: 'application/zip' })
-        this.saveAs(blob, name)
-      } else {
-        this.printErrMsg(res.data);
-      }
-      downloadLoadingInstance.close();
-    }).catch((r) => {
-      console.error(r)
-      Message.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠＄悊鍛橈紒')
-      downloadLoadingInstance.close();
+      responseType: "blob",
+      headers: { Authorization: "Bearer " + getToken() },
     })
+      .then((res) => {
+        const isBlob = blobValidate(res.data);
+        if (isBlob) {
+          const blob = new Blob([res.data], { type: "application/zip" });
+          this.saveAs(blob, name);
+        } else {
+          this.printErrMsg(res.data);
+        }
+        downloadLoadingInstance.close();
+      })
+      .catch((r) => {
+        console.error(r);
+        Message.error("涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠＄悊鍛橈紒");
+        downloadLoadingInstance.close();
+      });
   },
   saveAs(text, name, opts) {
-    saveAs(text, name, opts);
+    if (typeof text === "string") {
+      // 璺緞涓嬭浇
+      saveAs(text, name, opts);
+      Message.success("鏁版嵁瀵煎嚭鎴愬姛");
+    } else {
+      // 娴佷笅杞�
+      blobToText(text)
+        .then((result) => {
+          Message.error(result.msg);
+        })
+        .catch(() => {
+          saveAs(text, name, opts);
+          Message.success("鏁版嵁瀵煎嚭鎴愬姛");
+        });
+    }
   },
   async printErrMsg(data) {
     const resText = await data.text();
     const rspObj = JSON.parse(resText);
-    const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+    const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
     Message.error(errMsg);
-  }
-}
+  },
+};
 
+// 灏哹lob杞垚鏂囨湰
+function blobToText(blob) {
+  return new Promise((resolve, reject) => {
+    const fileReader = new FileReader();
+    fileReader.readAsText(blob);
+    fileReader.onload = function () {
+      try {
+        const result = JSON.parse(this.result);
+        if (result && result["code"] !== 200) {
+          resolve(result);
+        } else {
+          reject();
+        }
+      } catch (e) {
+        reject();
+      }
+    };
+  });
+}

--
Gitblit v1.9.3