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

package/es/ProDownload/index.js

@@ -1,18 +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 normalizeError = error => {
-  if (error !== null && typeof error === 'object') {
+const normalizeError = (error) => {
+  if (error !== null && typeof error === "object") {
     return error;
   }
-  return new Error(error == null ? 'Download request failed' : String(error));
+  return new Error(error == null ? "Download request failed" : String(error));
 };
-const ProDownload = props => {
+const ProDownload = (props) => {
   const {
     source,
     action,
@@ -28,51 +28,37 @@ const ProDownload = props => {
     onError,
     ...defaultProps
   } = props;
-  const [{
-    loading
-  }, setState] = useSetState({
+  const [{ loading }, setState] = useSetState({
     loading: false
   });
-  const {
-    headers,
-    onError: onErrorConfig
-  } = useProConfig('ProDownload') || {};
+  const { headers, onError: onErrorConfig } = useProConfig("ProDownload") || {};
   const reportError = onError || onErrorConfig;
-  defaultProps.headers = {
-    ...headers,
-    ...defaultProps.headers
-  };
+  defaultProps.headers = { ...headers, ...defaultProps.headers };
   const handDownload = async (_params = params) => {
-    if (source === 'url') {
-      fetch(url || action).then(response => {
+    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 => {
+      }).then((res) => {
         const blob = new Blob([res]);
-        BlobMakeFile({
-          blob,
-          fileName
-        });
-      }).catch(error => {
-        reportError?.(normalizeError(error));
+        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 => {
+    const requestOnError = (error) => {
       if (errorReported) {
         return;
       }
       errorReported = true;
-      reportError?.(normalizeError(error));
+      reportError == null ? void 0 : reportError(normalizeError(error));
     };
     try {
-      // 发起请求
       await DownloadRequest({
         url: url || action,
         method,
@@ -86,40 +72,44 @@ const ProDownload = props => {
     } 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.js

@@ -1,80 +1,56 @@
-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 async function DownloadRequest({
+async function DownloadRequest({
   url,
-  method = 'post',
+  method = "post",
   params,
   headers,
   transformResponse,
@@ -84,87 +60,77 @@ export async function DownloadRequest({
 }) {
   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();
   }
-  // 完成回调
-  const result = _isFunction(transformResponse) ? res : response;
-  onFinish?.(result, params);
-  BlobMakeFile({
-    blob: fileBlob,
-    fileName: fileName || contentFileName
-  });
+  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
+};

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -1,17 +1,13 @@
-import _omit from "lodash/omit";
-import _isArray from "lodash/isArray";
-import { Button, Drawer } from 'antd';
-import React, { useCallback, useState, useRef } from 'react';
-import { useScroll } from 'ahooks';
-import classNames from 'classnames';
-import { ReactSVG } from 'react-svg';
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { Button, Drawer } from "antd";
+import React, { useCallback, useState, useRef } from "react";
+import { useScroll } from "ahooks";
+import classNames from "classnames";
+import isArray from "lodash/isArray";
+import omit from "lodash/omit";
+import { ReactSVG } from "react-svg";
 import closeSvg from "../../../assets/close.svg";
 import { useConfirmClose } from "../../hooks/useConfirmClose";
-
-/**
- * 抽屉组件
- */
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const ProDrawer = ({
   form,
   title,
@@ -35,22 +31,12 @@ const ProDrawer = ({
   drawerProps
 }) => {
   const ref = useRef(null);
-  const {
-    top
-  } = useScroll(ref) || {};
+  const { top } = useScroll(ref) || {};
   const [loading, toggleLoading] = useState(false);
   const noRenderFooter = isView || footer === false || footer === null;
-  const {
-    mask: drawerMask,
-    ...restDrawerProps
-  } = drawerProps || {};
-  // 抽屉宽度统一走 size（antd v6 width 已废弃）；数字优先，自定义 width 兜底
-  const drawerSize = restDrawerProps?.size ?? width;
-  const {
-    markInteracted,
-    onConfirm,
-    contextHolder
-  } = useConfirmClose({
+  const { mask: drawerMask, ...restDrawerProps } = drawerProps || {};
+  const drawerSize = (restDrawerProps == null ? void 0 : restDrawerProps.size) ?? width;
+  const { markInteracted, onConfirm, contextHolder } = useConfirmClose({
     open,
     isView,
     isConfirmClose,
@@ -61,115 +47,99 @@ const ProDrawer = ({
     try {
       if (open) {
         const values = await form.validateFields();
-        // 当传入okLoading时不走下面的默认loading逻辑
-        if (okLoading !== undefined) {
-          if (onOk && (await onOk(values, form)) === true) {
+        if (okLoading !== void 0) {
+          if (onOk && await onOk(values, form) === true) {
             onCancel && onCancel();
           }
           return true;
         }
         toggleLoading(true);
-        if (onOk && (await onOk(values, form)) === true) {
+        if (onOk && await onOk(values, form) === true) {
           onCancel && onCancel();
         }
       }
     } catch (error) {
-      /** 使用setTimeout确保DOM已经更新，错误标记已经渲染 */
       setTimeout(() => {
-        const errorElement = ref.current?.querySelector('[class*="form-item-has-error"]');
-        if (errorElement && error?.errorFields?.length) {
-          errorElement.scrollIntoView({
-            behavior: 'smooth',
-            block: 'center'
-          });
+        var _a, _b;
+        const errorElement = (_a = ref.current) == null ? void 0 : _a.querySelector('[class*="form-item-has-error"]');
+        if (errorElement && ((_b = error == null ? void 0 : error.errorFields) == null ? void 0 : _b.length)) {
+          errorElement.scrollIntoView({ behavior: "smooth", block: "center" });
         }
       }, 100);
     } finally {
       toggleLoading(false);
     }
   }, [onOk, onCancel, form]);
-
-  /**
-   * 描述：默认底部操作按钮
-   *
-   */
-  const defaultFooter = /*#__PURE__*/_jsxs("div", {
-    className: "pro-drawer-footer",
-    children: [/*#__PURE__*/_jsx(Button, {
-      type: "primary",
-      onClick: handleFinish,
-      loading: okLoading ?? loading,
-      disabled: okDisabled ?? loading,
-      children: okText
-    }), /*#__PURE__*/_jsx(Button, {
-      onClick: onCancel,
-      children: cancelText
-    })]
-  });
+  const defaultFooter = /* @__PURE__ */ jsxs("div", { className: "pro-drawer-footer", children: [
+    /* @__PURE__ */ jsx(
+      Button,
+      {
+        type: "primary",
+        onClick: handleFinish,
+        loading: okLoading ?? loading,
+        disabled: okDisabled ?? loading,
+        children: okText
+      }
+    ),
+    /* @__PURE__ */ jsx(Button, { onClick: onCancel, children: cancelText })
+  ] });
   const renderFooter = () => {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/React.isValidElement(footer)) {
-      return /*#__PURE__*/_jsx("div", {
-        className: "pro-drawer-footer",
-        children: footer
-      });
+    if (React.isValidElement(footer)) {
+      return /* @__PURE__ */ jsx("div", { className: "pro-drawer-footer", children: footer });
     }
-    if (_isArray(footer) && footer?.length) {
-      return /*#__PURE__*/_jsx("div", {
-        className: "pro-drawer-footer",
-        children: footer.map(item => {
-          if ( /*#__PURE__*/React.isValidElement(item)) {
-            return item;
-          }
-          return false;
-        })
-      });
+    if (isArray(footer) && (footer == null ? void 0 : footer.length)) {
+      return /* @__PURE__ */ jsx("div", { className: "pro-drawer-footer", children: footer.map((item) => {
+        if (React.isValidElement(item)) {
+          return item;
+        }
+        return false;
+      }) });
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [contextHolder, /*#__PURE__*/_jsxs(Drawer, {
-      size: drawerSize,
-      open: open,
-      mask: typeof drawerMask === 'object' ? {
-        closable: maskClosable,
-        ...drawerMask
-      } : drawerMask ?? {
-        blur: false,
-        closable: maskClosable
-      },
-      placement: "right",
-      rootClassName: classNames(className, 'pro-drawer'),
-      closable: false,
-      onClose: onConfirm,
-      zIndex: zIndex,
-      destroyOnHidden: destroyOnHidden,
-      ..._omit(restDrawerProps, 'width', 'size'),
-      children: [/*#__PURE__*/_jsx("div", {
-        className: "pro-drawer-close",
-        onClick: onConfirm,
-        children: /*#__PURE__*/_jsx(ReactSVG, {
-          className: "close-icon",
-          src: closeSvg
-        })
-      }), title ? /*#__PURE__*/_jsx("div", {
-        className: `pro-drawer-title ${top > 0 ? 'pro-drawer-scrolling' : ''}`,
-        children: title
-      }) : null, /*#__PURE__*/_jsx("div", {
-        ref: ref,
-        className: "pro-drawer-content",
-        onInput: markInteracted,
-        onChange: markInteracted,
-        style: {
-          marginTop: title ? 64 : 0,
-          paddingBottom: noRenderFooter ? 0 : 64,
-          height: `calc(100% - ${title ? 64 : 0}px)`
-        },
-        children: children
-      }), renderFooter()]
-    })]
-  });
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    contextHolder,
+    /* @__PURE__ */ jsxs(
+      Drawer,
+      {
+        size: drawerSize,
+        open,
+        mask: typeof drawerMask === "object" ? { closable: maskClosable, ...drawerMask } : drawerMask ?? { blur: false, closable: maskClosable },
+        placement: "right",
+        rootClassName: classNames(className, "pro-drawer"),
+        closable: false,
+        onClose: onConfirm,
+        zIndex,
+        destroyOnHidden,
+        ...omit(restDrawerProps, "width", "size"),
+        children: [
+          /* @__PURE__ */ jsx("div", { className: "pro-drawer-close", onClick: onConfirm, children: /* @__PURE__ */ jsx(ReactSVG, { className: "close-icon", src: closeSvg }) }),
+          title ? /* @__PURE__ */ jsx("div", { className: `pro-drawer-title ${top > 0 ? "pro-drawer-scrolling" : ""}`, children: title }) : null,
+          /* @__PURE__ */ jsx(
+            "div",
+            {
+              ref,
+              className: "pro-drawer-content",
+              onInput: markInteracted,
+              onChange: markInteracted,
+              style: {
+                marginTop: title ? 64 : 0,
+                paddingBottom: noRenderFooter ? 0 : 64,
+                height: `calc(100% - ${title ? 64 : 0}px)`
+              },
+              children
+            }
+          ),
+          renderFooter()
+        ]
+      }
+    )
+  ] });
+};
+var ProDrawer_default = ProDrawer;
+export {
+  ProDrawer_default as default
 };
-export default ProDrawer;