@zat-design/sisyphus-react 4.5.9 → 4.5.10-beta.2

package/es/ProDownload/index.js

@@ -1,12 +1,18 @@
-import _isBoolean from "lodash/isBoolean";
-import _isFunction from "lodash/isFunction";
-import { useSetState } from 'ahooks';
-import { Button } from 'antd';
-import classNames from 'classnames';
+import { jsx } from "react/jsx-runtime";
+import { useSetState } from "ahooks";
+import { Button } from "antd";
+import classNames from "classnames";
+import isBoolean from "lodash/isBoolean";
+import isFunction from "lodash/isFunction";
 import { BlobMakeFile, DownloadRequest } from "./utils";
 import { useProConfig } from "../ProConfigProvider";
-import { jsx as _jsx } from "react/jsx-runtime";
-const ProDownload = props => {
+const normalizeError = (error) => {
+  if (error !== null && typeof error === "object") {
+    return error;
+  }
+  return new Error(error == null ? "Download request failed" : String(error));
+};
+const ProDownload = (props) => {
   const {
     source,
     action,
@@ -22,44 +28,37 @@ const ProDownload = props => {
     onError,
     ...defaultProps
   } = props;
-  const [{
-    loading
-  }, setState] = useSetState({
+  const [{ loading }, setState] = useSetState({
     loading: false
   });
-  const {
-    headers,
-    onError: onErrorConfig
-  } = useProConfig('ProDownload') || {};
-  defaultProps.headers = {
-    ...headers,
-    ...defaultProps.headers
-  };
+  const { headers, onError: onErrorConfig } = useProConfig("ProDownload") || {};
+  const reportError = onError || onErrorConfig;
+  defaultProps.headers = { ...headers, ...defaultProps.headers };
   const handDownload = async (_params = params) => {
-    if (source === 'url') {
-      try {
-        fetch(url || action).then(response => {
-          if (response.status > 400) {
-            return Promise.reject(new Error(`Service exception: ${response.status}`));
-          }
-          return response.blob();
-        }).then(res => {
-          const blob = new Blob([res]);
-          BlobMakeFile({
-            blob,
-            fileName
-          });
-        });
-      } catch (error) {
-        Promise.reject(error);
-      }
+    if (source === "url") {
+      fetch(url || action).then((response) => {
+        if (response.status > 400) {
+          return Promise.reject(new Error(`Service exception: ${response.status}`));
+        }
+        return response.blob();
+      }).then((res) => {
+        const blob = new Blob([res]);
+        BlobMakeFile({ blob, fileName });
+      }).catch((error) => {
+        reportError == null ? void 0 : reportError(normalizeError(error));
+      });
       return;
     }
-    setState({
-      loading: true
-    });
+    setState({ loading: true });
+    let errorReported = false;
+    const requestOnError = (error) => {
+      if (errorReported) {
+        return;
+      }
+      errorReported = true;
+      reportError == null ? void 0 : reportError(normalizeError(error));
+    };
     try {
-      // 发起请求
       await DownloadRequest({
         url: url || action,
         method,
@@ -68,43 +67,49 @@ const ProDownload = props => {
         transformResponse,
         fileName,
         onFinish,
-        onError: onError || onErrorConfig
+        onError: requestOnError
       });
+    } catch (error) {
+      requestOnError(error);
     } finally {
-      setState({
-        loading: false
-      });
+      setState({ loading: false });
     }
   };
   const cls = classNames(className, {
-    'pro-download': true
+    "pro-download": true
   });
-  return /*#__PURE__*/_jsx(Button, {
-    className: cls,
-    onClick: async () => {
-      let resolvedParams = params;
-      try {
-        if (_isBoolean(beforeDownload) && !beforeDownload) {
-          return false;
-        }
-        if (beforeDownload) {
-          const res = await Promise.resolve(beforeDownload());
-          if (res === false) {
-            return;
+  return /* @__PURE__ */ jsx(
+    Button,
+    {
+      className: cls,
+      onClick: async () => {
+        let resolvedParams = params;
+        try {
+          if (isBoolean(beforeDownload) && !beforeDownload) {
+            return false;
           }
+          if (beforeDownload) {
+            const res = await Promise.resolve(beforeDownload());
+            if (res === false) {
+              return;
+            }
+          }
+          if (source !== "url" && isFunction(params)) {
+            resolvedParams = await Promise.resolve(params());
+          }
+        } catch {
+          return false;
         }
-        if (source !== 'url' && _isFunction(params)) {
-          resolvedParams = await Promise.resolve(params());
-        }
-      } catch {
-        return false;
-      }
-      return handDownload(resolvedParams);
-    },
-    ...defaultProps,
-    loading: loading,
-    children: children
-  });
+        return handDownload(resolvedParams);
+      },
+      ...defaultProps,
+      loading,
+      children
+    }
+  );
 };
 ProDownload.downLoadRequest = DownloadRequest;
-export default ProDownload;
+var ProDownload_default = ProDownload;
+export {
+  ProDownload_default as default
+};

package/es/ProDownload/propsType.js

@@ -1 +0,0 @@
-export {};

package/es/ProDownload/utils.d.ts

@@ -3,7 +3,7 @@ export interface PropsWithMakeFilePropsType {
     fileName: string;
     url?: string;
 }
-export interface IDownloadRequestPropsType {
+export interface IDownloadRequestPropsType<TResult = Response> {
     /**
      * @description       下载请求的地址
      * @default           (必选)
@@ -21,12 +21,12 @@ export interface IDownloadRequestPropsType {
     params?: any;
     headers?: any;
     /** 格式化数据 */
-    transformResponse?: (data: any) => any;
+    transformResponse?: (data: any) => TResult | Promise<TResult>;
     /**
      * @description       service 执行完成时触发
      * @default           -
      */
-    onFinish?: (response: object, params: object) => void;
+    onFinish?: (response: Awaited<TResult>, params: object) => void;
     /**
      * @description       下载保存的文件名
      * @default           (必选)
@@ -47,7 +47,6 @@ export interface IDownloadRequestPropsType {
  * @constructor
  */
 export declare function BlobMakeFile({ blob, fileName, url }: PropsWithMakeFilePropsType): void;
-export type DownloadRequestProps = (props: IDownloadRequestPropsType) => Promise<Response>;
 type convertBase64ToBlobType = (base64: string, fileType?: string, slice?: number) => Blob;
 export declare const convertBase64ToBlob: convertBase64ToBlobType;
 /**
@@ -56,5 +55,11 @@ export declare const convertBase64ToBlob: convertBase64ToBlobType;
  * @returns string
  */
 export declare function getFilenameFromContentDisposition(contentDisposition: any): string;
-export declare const DownloadRequest: DownloadRequestProps;
+export declare function DownloadRequest<TResult>(props: IDownloadRequestPropsType<TResult> & {
+    transformResponse: (data: any) => TResult | Promise<TResult>;
+}): Promise<Awaited<TResult>>;
+export declare function DownloadRequest(props: IDownloadRequestPropsType<Response> & {
+    transformResponse?: undefined;
+}): Promise<Response>;
+export type DownloadRequestProps = typeof DownloadRequest;
 export {};

package/es/ProDownload/utils.js

@@ -1,168 +1,136 @@
-import _get from "lodash/get";
-import _isFunction from "lodash/isFunction";
-/* eslint-disable no-empty */
-/* eslint-disable prefer-promise-reject-errors */
-import { message } from 'antd';
+import { message } from "antd";
+import isFunction from "lodash/isFunction";
+import get from "lodash/get";
 import locale from "../locale";
-const stringify = data => {
-  let result = '';
+const stringify = (data) => {
+  let result = "";
   if (data && Object.keys(data).length) {
-    Object.entries(data).forEach(item => {
+    Object.entries(data).forEach((item) => {
       result += `&${item[0]}=${item[1]}`;
     });
   }
-  return result ? result.substr(1) : '';
+  return result ? result.substr(1) : "";
 };
-/**
- * 下载Blob
- *
- * @param response
- * @param fileName
- * @param extendName
- * @constructor
- */
-export function BlobMakeFile({
-  blob,
-  fileName,
-  url
-}) {
+function BlobMakeFile({ blob, fileName, url }) {
   let blobUrl = url;
   if (blob) {
     blobUrl = window.URL.createObjectURL(blob);
   }
   const doc = document;
-  const ele = doc.createElement('a');
+  const ele = doc.createElement("a");
   doc.body.appendChild(ele);
-  ele.style.display = 'none';
-  ele.setAttribute('target', '');
+  ele.style.display = "none";
+  ele.setAttribute("target", "");
   ele.href = blobUrl;
   ele.download = `${fileName}`;
   ele.click();
   doc.body.removeChild(ele);
 }
-
-// base64转Blob
-
-export const convertBase64ToBlob = (base64, fileType, slice = 1024) => {
-  return new Blob(atob(base64).match(new RegExp(`([\\s\\S]{${slice}})|([\\s\\S]{1,${slice}})`, 'g'))?.map(item => {
-    return new Uint8Array(item.split('').map((s, i) => {
-      return item.charCodeAt(i);
-    }));
-  }), {
-    type: fileType
-  });
+const convertBase64ToBlob = (base64, fileType, slice = 1024) => {
+  var _a;
+  return new Blob(
+    (_a = atob(base64).match(new RegExp(`([\\s\\S]{${slice}})|([\\s\\S]{1,${slice}})`, "g"))) == null ? void 0 : _a.map((item) => {
+      return new Uint8Array(
+        item.split("").map((s, i) => {
+          return item.charCodeAt(i);
+        })
+      );
+    }),
+    { type: fileType }
+  );
 };
-
-/**
- * 从Content-Disposition获取filename
- * @param contentDisposition string
- * @returns string
- */
-export function getFilenameFromContentDisposition(contentDisposition) {
+function getFilenameFromContentDisposition(contentDisposition) {
   const pattern = /filename=([^;]+)/i;
   const matches = pattern.exec(contentDisposition);
   if (matches && matches[1]) {
-    // remove double quotes if filename is quoted
-    // 解码
     const decodeFilename = decodeURIComponent(matches[1]);
-    return decodeFilename.replace(/^"?(.+?)"?$/, '$1');
+    return decodeFilename.replace(/^"?(.+?)"?$/, "$1");
   }
   return null;
 }
-
-// 发起请求获取下载文件
-export const DownloadRequest = async ({
+async function DownloadRequest({
   url,
-  method = 'post',
+  method = "post",
   params,
   headers,
   transformResponse,
   fileName,
   onFinish,
   onError
-}) => {
+}) {
   const config = {
     method,
-    credentials: 'include',
+    credentials: "include",
     headers: {
-      'Content-Type': 'application/json',
-      accept: 'application/json;charset=UTF-8'
+      "Content-Type": "application/json",
+      accept: "application/json;charset=UTF-8"
     },
     body: null
   };
-  // method = post and params, add it to the fetch request
-  if (method === 'post' && params) {
+  if (method === "post" && params) {
     config.body = JSON.stringify(params);
   }
-  // 处理get请求入参
-  if (method === 'get' && params) {
-    url = `${url}${url.indexOf('?') !== -1 ? '&' : '?'}${stringify(params)}`;
+  if (method === "get" && params) {
+    url = `${url}${url.indexOf("?") !== -1 ? "&" : "?"}${stringify(params)}`;
   }
-  // if custom headers need to be set for the specific request
-  if (headers && typeof headers === 'object' && Object.keys(headers).length > 0) {
+  if (headers && typeof headers === "object" && Object.keys(headers).length > 0) {
     config.headers = {
       ...config.headers,
       ...headers
     };
   }
   const response = await fetch(url, config);
-  const {
-    res,
-    responseData
-  } = await (async () => {
+  const { res, responseData } = await (async () => {
     try {
-      const data = await response.clone().json();
-      if (!data) {
+      const data2 = await response.clone().json();
+      if (!data2) {
         message.error(`${locale.ProDownload.errorMessage}`);
         return Promise.reject(`${locale.ProDownload.errorMessage}`);
       }
-      // 接口定制化存在status处理
-      if (data?.status > 200 || data?.code === 401) {
-        const errorMsg = data?.message || data?.msg;
+      if ((data2 == null ? void 0 : data2.status) > 200 || (data2 == null ? void 0 : data2.code) === 401) {
+        const errorMsg = (data2 == null ? void 0 : data2.message) || (data2 == null ? void 0 : data2.msg);
         errorMsg && message.error(errorMsg);
-        onError && onError(data);
+        onError && onError(data2);
         return Promise.reject(errorMsg);
       }
-      if (_isFunction(transformResponse)) {
-        return Promise.resolve(transformResponse(data)).then(transformedData => ({
+      if (isFunction(transformResponse)) {
+        return Promise.resolve(transformResponse(data2)).then((transformedData) => ({
           res: transformedData,
-          responseData: data
+          responseData: data2
         }));
       }
-      return Promise.resolve({
-        res: response,
-        responseData: data
-      });
+      return Promise.resolve({ res: response, responseData: data2 });
     } catch (error) {
       if (response.ok) {
-        return Promise.resolve({
-          res: response,
-          responseData: null
-        });
+        return Promise.resolve({ res: response, responseData: null });
       }
     }
     return Promise.reject(`${locale.ProDownload.errorMessage}`);
   })();
   let fileBlob;
   let data = null;
-  let contentFileName = '';
-  if (_isFunction(transformResponse)) {
+  let contentFileName = "";
+  if (isFunction(transformResponse)) {
     data = res;
   } else {
-    // 优先获取Content-Disposition中filename
-    contentFileName = getFilenameFromContentDisposition(response.headers.get('Content-Disposition'));
-    data = _get(responseData, 'data');
+    contentFileName = getFilenameFromContentDisposition(
+      response.headers.get("Content-Disposition")
+    );
+    data = get(responseData, "data");
   }
   if (data) {
     fileBlob = convertBase64ToBlob(data);
   } else {
     fileBlob = await response.blob();
   }
-  // 完成回调
-  onFinish?.(_isFunction(transformResponse) ? res : response, params);
-  BlobMakeFile({
-    blob: fileBlob,
-    fileName: fileName || contentFileName
-  });
-  return Promise.resolve(_isFunction(transformResponse) ? res : response);
-};
+  const result = isFunction(transformResponse) ? res : response;
+  onFinish == null ? void 0 : onFinish(result, params);
+  BlobMakeFile({ blob: fileBlob, fileName: fileName || contentFileName });
+  return result;
+}
+export {
+  BlobMakeFile,
+  DownloadRequest,
+  convertBase64ToBlob,
+  getFilenameFromContentDisposition
+};