leisure-core 1.0.3 → 1.0.5

package/le-libs/js/hrequestFile.js

@@ -1,62 +1,151 @@
-import axios from "axios";
-import { getToken } from "./tokens";
-
-/**
- *  下载 excel
- * @param {*} url 接口地址
- * @param {*} fileName 下载文件名称
- * @param {*} data 数据
- * @param {*} callback  回调函数
- */
-function downLoadFile(url, fileName, data) {
-  axios({
-    method: "get",
-    url: url,
-    params: data,
-    headers: {
-      Accept: "image/webp,image/apng,image/*,*/*;q=0.8",
-      "Content-type": "application/octet-stream;charset=UTF-8",
-      authentication: getToken(),
-    },
-    responseType: "blob",
-  })
-    .then((response) => {
-      let blob = new Blob([response.data]);
-      let href = window.URL.createObjectURL(blob);
-      let downloadElement = document.createElement("a");
-      try {
-        downloadElement.href = href;
-        downloadElement.download = fileName + ".xlsx";
-        document.body.appendChild(downloadElement);
-        downloadElement.click();
-      } catch (error) {
-        return Promise.reject("下载错误:" + error);
-      } finally {
-        document.body.removeChild(downloadElement);
-        window.URL.revokeObjectURL(href);
-      }
-    })
-    .catch((error) => {
-      return Promise.reject("获取下载数据错误:" + error);
-    });
-}
-
-export function exportExcelByParam(path, name, param) {
-  let url = process.env.VUE_APP_BASE_API + path;
-  downLoadFile(url, name, param);
-}
-
-export function exportMemberExcel(name, params) {
-  let url = process.env.VUE_APP_BASE_API + "/user/exportMember";
-  downLoadFile(url, name, params);
-}
-
-export function exportConsumeExcel(name, params) {
-  let url = process.env.VUE_APP_BASE_API + "/order/export";
-  downLoadFile(url, name, params);
-}
-
-export function exportGoodsExcel(name, params) {
-  let url = process.env.VUE_APP_BASE_API + "/mall-goods/export";
-  downLoadFile(url, name, params);
-}
+import axios from "axios";
+import { Message } from "element-ui";
+import { getToken } from "./tokens";
+
+const POLL_INTERVAL = 3000;
+
+function authHeaders() {
+  return {
+    Accept: "image/webp,image/apng,image/*,*/*;q=0.8",
+    "Content-type": "application/octet-stream;charset=UTF-8",
+    authentication: getToken(),
+  };
+}
+
+/**
+ * 保存 blob 为本地文件
+ */
+function saveBlob(blob, fileName) {
+  let href = window.URL.createObjectURL(blob);
+  let downloadElement = document.createElement("a");
+  try {
+    downloadElement.href = href;
+    downloadElement.download = fileName + ".xlsx";
+    document.body.appendChild(downloadElement);
+    downloadElement.click();
+  } finally {
+    document.body.removeChild(downloadElement);
+    window.URL.revokeObjectURL(href);
+  }
+}
+
+function readBlobText(blob) {
+  return new Promise((resolve, reject) => {
+    let reader = new FileReader();
+    reader.onload = () => resolve(reader.result);
+    reader.onerror = () => reject(reader.error);
+    reader.readAsText(blob);
+  });
+}
+
+/**
+ * 轮询导出任务状态, SUCCESS 后 resolve(taskId), FAILED 后 reject
+ */
+function pollTask(statusUrl, taskId, onProgress) {
+  return new Promise((resolve, reject) => {
+    let timer = setInterval(() => {
+      axios
+        .get(statusUrl, { params: { taskId }, headers: authHeaders() })
+        .then((response) => {
+          let task = response.data;
+          if (onProgress) onProgress(task);
+          if (task.status === "SUCCESS") {
+            clearInterval(timer);
+            resolve(task.taskId);
+          } else if (task.status === "FAILED") {
+            clearInterval(timer);
+            reject(new Error(task.error || "导出失败"));
+          }
+        })
+        .catch((error) => {
+          clearInterval(timer);
+          reject(error);
+        });
+    }, POLL_INTERVAL);
+  });
+}
+
+/**
+ * 异步导出流程: 提交后拿到 taskId -> 轮询进度 -> 下载文件
+ * @param submitUrl 提交接口地址(以 /download/orders 结尾), 用于推导任务接口
+ */
+function handleAsyncTask(submitUrl, blob, fileName, onProgress) {
+  let baseUrl = submitUrl.substring(0, submitUrl.lastIndexOf("/") + 1);
+  return readBlobText(blob)
+    .then((text) => {
+      let info = JSON.parse(text);
+      if (!info.taskId) {
+        throw new Error(info.error || "提交导出任务失败");
+      }
+      if (onProgress) onProgress(info);
+      return pollTask(baseUrl + "task-status", info.taskId, onProgress);
+    })
+    .then((taskId) => {
+      return axios
+        .get(baseUrl + "task-file", {
+          params: { taskId },
+          headers: authHeaders(),
+          responseType: "blob",
+        })
+        .then((response) => {
+          saveBlob(new Blob([response.data]), fileName);
+        });
+    });
+}
+
+/**
+ *  下载 excel
+ * @param {*} url 接口地址
+ * @param {*} fileName 下载文件名称
+ * @param {*} data 数据
+ * @param {*} onProgress 可选, 异步导出进度回调 (task) => void
+ *
+ * 根据响应 Content-Type 自动识别:
+ *   application/json -> 异步任务模式(提交/轮询/下载);
+ *   其他             -> 同步文件流直接下载(旧行为)
+ */
+function downLoadFile(url, fileName, data, onProgress) {
+  return axios({
+    method: "get",
+    url: url,
+    params: data,
+    headers: authHeaders(),
+    responseType: "blob",
+  })
+    .then((response) => {
+      let contentType = response.headers["content-type"] || "";
+      let blob = new Blob([response.data], { type: contentType });
+      if (contentType.indexOf("application/json") >= 0) {
+        return handleAsyncTask(url, blob, fileName, onProgress);
+      }
+      return saveBlob(blob, fileName);
+    })
+    .catch((error) => {
+      let message = "获取下载数据错误";
+      if (error && error.message) {
+        message += ":" + error.message;
+      }
+      Message.error(message);
+      return Promise.reject(error);
+    });
+}
+
+export function exportExcelByParam(path, name, param, onProgress) {
+  let url = process.env.VUE_APP_BASE_API + path;
+  return downLoadFile(url, name, param, onProgress);
+}
+
+export function exportMemberExcel(name, params) {
+  let url = process.env.VUE_APP_BASE_API + "/user/exportMember";
+  return downLoadFile(url, name, params);
+}
+
+export function exportConsumeExcel(name, params) {
+  let url = process.env.VUE_APP_BASE_API + "/order/export";
+  return downLoadFile(url, name, params);
+}
+
+export function exportGoodsExcel(name, params) {
+  let url = process.env.VUE_APP_BASE_API + "/mall-goods/export";
+  return downLoadFile(url, name, params);
+}

package/le-report/src/main.vue

@@ -1622,6 +1622,7 @@ h2 {
 .query-param-area {
   display: -webkit-flex;
   display: flex;
+  flex-wrap: wrap;
 }
 
 .vxe-loading-mask {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leisure-core",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "leisure-core是京心数据基于vue2.x开发的一套后台管理系统桌面端组件库，封装了大量实用的UI控件模板,非常方便开发者快速搭建前端应用",
   "private": false,
   "author": "北方乐逍遥(zcx7878)",