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

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;

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

@@ -1,14 +1,10 @@
-import _isArray from "lodash/isArray";
-import React, { useCallback, useState, useRef } from 'react';
-import { Space, Button, Modal } from 'antd';
-import { useScroll, useSize } from 'ahooks';
-import classnames from 'classnames';
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import React, { useCallback, useState, useRef } from "react";
+import { Space, Button, Modal } from "antd";
+import { useScroll, useSize } from "ahooks";
+import classnames from "classnames";
+import isArray from "lodash/isArray";
 import { useConfirmClose } from "../../hooks/useConfirmClose";
-
-/**
- * 弹窗组件
- */
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const ProModal = ({
   form,
   title,
@@ -32,139 +28,112 @@ const ProModal = ({
   destroyOnHidden,
   modalProps
 }) => {
+  var _a;
   const ref = useRef(null);
-  const {
-    top
-  } = useScroll(ref.current?.parentNode) || {};
-  const {
-    height
-  } = useSize(ref) || {};
+  const { top } = useScroll((_a = ref.current) == null ? void 0 : _a.parentNode) || {};
+  const { height } = useSize(ref) || {};
   const noRenderFooter = isView || footer === false || footer === null;
-  const {
-    mask: modalMask,
-    ...restModalProps
-  } = modalProps || {};
+  const { mask: modalMask, ...restModalProps } = modalProps || {};
   const [loading, toggleLoading] = useState(false);
-  const {
-    markInteracted,
-    onConfirm,
-    contextHolder
-  } = useConfirmClose({
+  const { markInteracted, onConfirm, contextHolder } = useConfirmClose({
     open,
     isView,
     isConfirmClose,
     isConfirmCloseModalProps,
     onCancel
   });
-  const _className = classnames(['pro-modal', className, {
-    'pro-modal-scrolling': top > 0,
-    'pro-modal-no-footer': noRenderFooter,
-    'pro-modal-footer-shadow': height >= 450
-  }]);
+  const _className = classnames([
+    "pro-modal",
+    className,
+    {
+      "pro-modal-scrolling": top > 0,
+      "pro-modal-no-footer": noRenderFooter,
+      "pro-modal-footer-shadow": height >= 450
+    }
+  ]);
   const handleFinish = useCallback(async () => {
     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 _a2, _b;
+        const errorElement = (_a2 = ref.current) == null ? void 0 : _a2.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: classnames({
-      'pro-modal-footer': extraLeft,
-      'pro-modal-footer-123': true
-    }),
-    children: [extraLeft, /*#__PURE__*/_jsxs(Space, {
-      children: [/*#__PURE__*/_jsx(Button, {
-        onClick: onCancel,
-        children: cancelText
-      }), /*#__PURE__*/_jsx(Button, {
-        type: "primary",
-        onClick: handleFinish,
-        loading: okLoading ?? loading,
-        disabled: okDisabled ?? loading,
-        children: okText
-      })]
-    })]
-  });
+  const defaultFooter = /* @__PURE__ */ jsxs("div", { className: classnames({ "pro-modal-footer": extraLeft, "pro-modal-footer-123": true }), children: [
+    extraLeft,
+    /* @__PURE__ */ jsxs(Space, { children: [
+      /* @__PURE__ */ jsx(Button, { onClick: onCancel, children: cancelText }),
+      /* @__PURE__ */ jsx(
+        Button,
+        {
+          type: "primary",
+          onClick: handleFinish,
+          loading: okLoading ?? loading,
+          disabled: okDisabled ?? loading,
+          children: okText
+        }
+      )
+    ] })
+  ] });
   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__*/_jsx(Modal, {
-      className: _className,
-      title: title,
-      width: width,
-      open: open,
-      mask: typeof modalMask === 'object' && modalMask !== null ? {
-        closable: maskClosable,
-        ...modalMask
-      } : modalMask ?? {
-        blur: false,
-        closable: maskClosable
-      },
-      onCancel: onConfirm,
-      footer: renderFooter(),
-      okText: okText,
-      cancelText: cancelText,
-      zIndex: zIndex,
-      destroyOnHidden: destroyOnHidden,
-      ...restModalProps,
-      children: /*#__PURE__*/_jsx("div", {
-        ref: ref,
-        onInput: markInteracted,
-        onChange: markInteracted,
-        children: children
-      })
-    })]
-  });
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    contextHolder,
+    /* @__PURE__ */ jsx(
+      Modal,
+      {
+        className: _className,
+        title,
+        width,
+        open,
+        mask: typeof modalMask === "object" && modalMask !== null ? { closable: maskClosable, ...modalMask } : modalMask ?? { blur: false, closable: maskClosable },
+        onCancel: onConfirm,
+        footer: renderFooter(),
+        okText,
+        cancelText,
+        zIndex,
+        destroyOnHidden,
+        ...restModalProps,
+        children: /* @__PURE__ */ jsx("div", { ref, onInput: markInteracted, onChange: markInteracted, children })
+      }
+    )
+  ] });
+};
+var ProModal_default = ProModal;
+export {
+  ProModal_default as default
 };
-export default ProModal;

package/es/ProDrawerForm/components/index.js

@@ -1,2 +1,6 @@
-export { default as ProDrawer } from "./ProDrawer";
-export { default as ProModal } from "./ProModal";
+import { default as default2 } from "./ProDrawer";
+import { default as default3 } from "./ProModal";
+export {
+  default2 as ProDrawer,
+  default3 as ProModal
+};

package/es/ProDrawerForm/hooks/useConfirmClose.js

@@ -1,18 +1,8 @@
-import { useCallback, useEffect, useRef } from 'react';
-import { Modal } from 'antd';
+import { useCallback, useEffect, useRef } from "react";
+import { Modal } from "antd";
 import { shouldConfirmClose } from "../utils";
 import locale from "../../locale";
-/**
- * 关闭抽屉/弹窗时的二次确认逻辑
- *
- * - markInteracted：绑定到内容容器的 input / change 事件，标记用户真实交互过。
- *   setFieldsValue 等程序回填不会派发用户输入事件，因此异步回填不会误触发二次确认。
- * - onConfirm：组件自带关闭入口（右上角 × / 遮罩）的关闭处理。未交互、查看模式或
- *   未开启二次确认时直接关闭；否则弹出二次确认。底部取消按钮不走此逻辑。
- * - contextHolder：Modal.useModal 的上下文占位，需渲染进组件，使二次确认弹框能继承
- *   ConfigProvider 的主题 / 国际化（替代静态 Modal.confirm，消除上下文告警）。
- */
-export const useConfirmClose = ({
+const useConfirmClose = ({
   open,
   isView,
   isConfirmClose,
@@ -20,11 +10,8 @@ export const useConfirmClose = ({
   onCancel
 }) => {
   const [modal, contextHolder] = Modal.useModal();
-  // 记录用户是否真实交互过表单内容（区别于 setFieldsValue 等程序回填）
   const userInteractedRef = useRef(false);
   const confirmingRef = useRef(false);
-
-  // open 变化时重置用户交互标记
   useEffect(() => {
     userInteractedRef.current = false;
   }, [open]);
@@ -32,29 +19,24 @@ export const useConfirmClose = ({
     userInteractedRef.current = true;
   }, []);
   const onConfirm = useCallback(() => {
-    // 用户真实交互过才弹二次确认；查看模式、未开启确认、或仅程序回填均直接关闭
-    if (!shouldConfirmClose({
-      isView,
-      isConfirmClose,
-      userInteracted: userInteractedRef.current
-    })) {
-      onCancel?.();
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    if (!shouldConfirmClose({ isView, isConfirmClose, userInteracted: userInteractedRef.current })) {
+      onCancel == null ? void 0 : onCancel();
       return;
     }
-    if (confirmingRef.current) return;
+    if (confirmingRef.current)
+      return;
     confirmingRef.current = true;
     modal.confirm({
-      className: 'width430',
-      title: locale?.ProDrawerForm?.isSureClose,
-      okText: locale?.ProDrawerForm?.confirm,
-      cancelText: locale?.ProDrawerForm?.cancel,
-      content: locale?.ProDrawerForm?.secondTipsWhenSave,
-      mask: {
-        blur: false
-      },
+      className: "width430",
+      title: (_b = (_a = locale) == null ? void 0 : _a.ProDrawerForm) == null ? void 0 : _b.isSureClose,
+      okText: (_d = (_c = locale) == null ? void 0 : _c.ProDrawerForm) == null ? void 0 : _d.confirm,
+      cancelText: (_f = (_e = locale) == null ? void 0 : _e.ProDrawerForm) == null ? void 0 : _f.cancel,
+      content: (_h = (_g = locale) == null ? void 0 : _g.ProDrawerForm) == null ? void 0 : _h.secondTipsWhenSave,
+      mask: { blur: false },
       onOk: () => {
         confirmingRef.current = false;
-        onCancel?.();
+        onCancel == null ? void 0 : onCancel();
       },
       onCancel: () => {
         confirmingRef.current = false;
@@ -62,9 +44,8 @@ export const useConfirmClose = ({
       ...isConfirmCloseModalProps
     });
   }, [isView, isConfirmClose, isConfirmCloseModalProps, onCancel, modal]);
-  return {
-    markInteracted,
-    onConfirm,
-    contextHolder
-  };
-};
+  return { markInteracted, onConfirm, contextHolder };
+};
+export {
+  useConfirmClose
+};