zy-react-library 1.0.29 → 1.0.31

package/hooks/useDownloadBlob/index.d.ts

@@ -12,9 +12,10 @@ export interface downloadBlobOptions {
   options?: UseDownloadBlobOptions;
 }
 
-export type DeleteFileFunction = (options: downloadBlobOptions) => Promise<any>;
+export type DownloadBlobFunction = (options: downloadBlobOptions) => Promise<any>;
 
 /**
  * 下载Blob流文件
  */
-export default function useDownloadBlob(): [boolean, DeleteFileFunction];
+export default function useImportFile(returnType: "array"): [boolean, DownloadBlobFunction];
+export default function useImportFile(returnType?: "object"): { loading: boolean; importFile: DownloadBlobFunction };

package/hooks/useDownloadBlob/index.js

@@ -5,7 +5,7 @@ import { useState } from "react";
 /**
  * 下载Blob流文件
  */
-export default function useDownloadBlob() {
+export default function useDownloadBlob(returnType = "object") {
   // loading状态
   const [loading, setLoading] = useState(false);
 
@@ -14,7 +14,10 @@ export default function useDownloadBlob() {
     setLoading(true);
 
     return new Promise((resolve, reject) => {
-      const { name= "", type= "", params= {} } = options
+      if (!url)
+        return reject(new Error("请传入 url"));
+
+      const { name = "", type = "", params = {} } = options;
       const finalUrl = (process.env.app.API_HOST || window.__JJB_ENVIRONMENT__.API_HOST) + url;
       Object.entries(params).forEach(([key, value]) => {
         finalUrl.searchParams.append(key, value);
@@ -58,5 +61,7 @@ export default function useDownloadBlob() {
     });
   };
 
-  return [loading, downloadBlob];
+  if (returnType === "array")
+    return [loading, downloadBlob];
+  return { loading, downloadBlob };
 }

package/hooks/useDownloadFile/index.d.ts

@@ -1,4 +1,14 @@
+export interface DownloadFileOptions {
+  /** 下载文件的URL */
+  url: string;
+  /** 下载文件的自定义文件名 */
+  name?: string;
+}
+
+export type DownloadFileFunction = (options: DownloadFileOptions) => void;
+
 /**
  * 下载文件
  */
-export default function useDownloadFile(url: string, name?: string): void;
+export default function useDownloadFile(returnType: "array"): [boolean, DownloadFileFunction];
+export default function useDownloadFile(returnType?: "object"): { loading: boolean; downloadFile: DownloadFileFunction };

package/hooks/useDownloadFile/index.js

@@ -1,36 +1,62 @@
 import { message, Modal } from "antd";
 import { getFileName, getFileSuffix, getFileUrl } from "../../utils/index.js";
+import { useState } from "react";
 
 /**
  * 下载文件
  */
-export default function useDownloadFile(url, name) {
-  if (!url)
-    throw new Error("没有下载地址");
-  Modal.confirm({ title: "提示", content: "确定要下载此文件吗？", onOk: () => {
-    const fileUrl = getFileUrl();
-    if (name) {
-      if (!getFileSuffix(url))
-        name = name + getFileSuffix(url);
-    }
-    else {
-      name = getFileName(url);
-    }
-    fetch(!url.includes(fileUrl) ? fileUrl + url : url)
-      .then(res => res.blob())
-      .then((blob) => {
-        const a = document.createElement("a");
-        document.body.appendChild(a);
-        a.style.display = "none";
-        const url = window.URL.createObjectURL(blob);
-        a.href = url;
-        a.download = `${name}`;
-        a.click();
-        document.body.removeChild(a);
-        window.URL.revokeObjectURL(url);
-      })
-      .catch(() => {
-        message.error("下载失败");
-      });
-  } });
+export default function useDownloadFile(returnType = "object") {
+  // loading状态
+  const [loading, setLoading] = useState(false);
+
+  // 下载文件
+  const downloadFile = (options) => {
+    setLoading(true);
+
+    const { url, name: fileName } = options;
+    if (!url)
+      throw new Error("请传入 url");
+
+    Modal.confirm({
+      title: "提示",
+      content: "确定要下载此文件吗？",
+      onOk: () => {
+        const fileUrl = getFileUrl();
+        let name = fileName;
+
+        if (name) {
+          if (!getFileSuffix(name) && getFileSuffix(url)) {
+            name = `${name}.${getFileSuffix(url)}`;
+          }
+        }
+        else {
+          name = getFileName(url);
+        }
+
+        fetch(!url.includes(fileUrl) ? fileUrl + url : url)
+          .then(res => res.blob())
+          .then((blob) => {
+            const a = document.createElement("a");
+            document.body.appendChild(a);
+            a.style.display = "none";
+            const urlObject = window.URL.createObjectURL(blob);
+            a.href = urlObject;
+            a.download = `${name}`;
+            a.click();
+            document.body.removeChild(a);
+            window.URL.revokeObjectURL(urlObject);
+          })
+          .catch(() => {
+            message.error("下载失败");
+          })
+          .finally(() => {
+            setLoading(false);
+          });
+      },
+    });
+  };
+
+  if (returnType === "array")
+    return [loading, downloadFile];
+  return { loading, downloadFile };
 }

package/hooks/useImportFile/index.d.ts

@@ -21,4 +21,5 @@ export type ImportFileFunction = (url: string, options: UseImportFileOptions) =>
 /**
  * 导入文件
  */
-export default function useImportFile(): [boolean, ImportFileFunction];
+export default function useImportFile(returnType: "array"): [boolean, ImportFileFunction];
+export default function useImportFile(returnType?: "object"): { loading: boolean; importFile: ImportFileFunction };

package/hooks/useImportFile/index.js

@@ -1,10 +1,10 @@
-import {request} from "@cqsjjb/jjb-common-lib/http";
+import { request } from "@cqsjjb/jjb-common-lib/http";
 import { useState } from "react";
 
 /**
  * 导入文件
  */
-export default function useImportFile() {
+export default function useImportFile(returnType = "object") {
   // loading状态
   const [loading, setLoading] = useState(false);
 
@@ -13,7 +13,10 @@ export default function useImportFile() {
     setLoading(true);
 
     return new Promise((resolve, reject) => {
-      const { files = [], params = {} } = options
+      if (!url)
+        return reject(new Error("请传入 url"));
+
+      const { files = [], params = {} } = options;
       const formData = new FormData();
 
       // 将文件添加到formData中
@@ -40,5 +43,7 @@ export default function useImportFile() {
     });
   };
 
-  return [loading, importFile];
+  if (returnType === "array")
+    return [loading, importFile];
+  return { loading, importFile };
 }

package/hooks/useTable/index.js

@@ -101,6 +101,9 @@ function getQuery(keysStr, valuesStr) {
  * 自定义 useTable，继承 ahooks 的 useAntdTable，根据需求进行扩展
  */
 function useTable(service, options) {
+  if (!service)
+    throw new Error("请传入 service");
+
   // 获取额外参数和转换函数
   const { params: extraParams, transform, ...restOptions } = options || {};
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.29",
+  "version": "1.0.31",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",