@ccs-ui/rc-pro 1.1.0 → 1.1.1-rc10

package/es/auth/auth-button.js

@@ -1,12 +1,20 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["auth", "text", "confirm", "onClick"];
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { Button } from 'antd';
-import React, { useRef } from 'react';
+import { useRef } from 'react';
 import { ModalConfirm } from '.';
 import { CCS, useCcsPage } from "../";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 /**
  * 带权限的按钮组件、继承Ant Button所有属性
  * @param CcsAuthButtonProps
@@ -22,14 +30,14 @@ export default (function (_ref) {
     onAuth = _ref2.onAuth;
   var IsAuthButton = CCS.GlobalConfig.IsAuthButton;
   var modalRef = useRef(null);
-  var button = /*#__PURE__*/React.createElement(Button, _extends({}, restProps, {
+  var button = /*#__PURE__*/_jsxs(Button, _objectSpread(_objectSpread({}, restProps), {}, {
     onClick: function onClick(e) {
       if (!_onClick) return;
       if (confirm) {
         var _modalRef$current;
         (_modalRef$current = modalRef.current) === null || _modalRef$current === void 0 ? void 0 : _modalRef$current.confirm({
           title: '操作确认',
-          icon: /*#__PURE__*/React.createElement(ExclamationCircleOutlined, null),
+          icon: /*#__PURE__*/_jsx(ExclamationCircleOutlined, {}),
           centered: true,
           content: confirm,
           okText: '确认',
@@ -41,19 +49,24 @@ export default (function (_ref) {
         return;
       }
       _onClick(e);
-    }
-  }), text, restProps.children);
+    },
+    children: [text, restProps.children]
+  }));
 
   // 不控制权限或没有传auth
   if (!IsAuthButton || !auth) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, button, !!confirm ? /*#__PURE__*/React.createElement(ModalConfirm, {
-      modalRef: modalRef
-    }) : null);
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [button, !!confirm ? /*#__PURE__*/_jsx(ModalConfirm, {
+        modalRef: modalRef
+      }) : null]
+    });
   }
 
   // 当前菜单下查找按钮权限
   var hasAuth = onAuth && onAuth(auth);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, hasAuth ? button : /*#__PURE__*/React.createElement(React.Fragment, null), !!confirm ? /*#__PURE__*/React.createElement(ModalConfirm, {
-    modalRef: modalRef
-  }) : null);
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [hasAuth ? button : /*#__PURE__*/_jsx(_Fragment, {}), !!confirm ? /*#__PURE__*/_jsx(ModalConfirm, {
+      modalRef: modalRef
+    }) : null]
+  });
 });

package/es/auth/index.d.ts

@@ -1,11 +1,12 @@
 import { ButtonProps } from 'antd';
-import React, { ReactElement, ReactNode } from 'react';
+import { ReactElement, ReactNode } from 'react';
 export interface ButtonItem {
     key: string;
     label: string;
     auth?: string;
     type?: ButtonProps['type'];
     disabled?: boolean;
+    hidden?: boolean;
     danger?: boolean;
     icon?: ReactNode;
     confirm?: string;
@@ -13,7 +14,7 @@ export interface ButtonItem {
 export interface CcsAuthGroupProps {
     /** 按钮尺寸 */
     size?: ButtonProps['size'];
-    /** 默认显示按钮数量 default:3 */
+    /** 默认显示按钮数量 */
     showCount?: number;
     /** 全部显示成link样式 */
     isLink?: boolean;
@@ -28,29 +29,22 @@ export interface CcsAuthGroupProps {
 }
 export interface CcsAuthProps {
     /** 权限标识 */
-    auth: string;
+    auth?: string;
     /** component children */
     children: ReactElement;
 }
 export declare function ModalConfirm({ modalRef }: {
     modalRef: any;
 }): import("react/jsx-runtime").JSX.Element;
-declare function CcsAuth({ auth, children }: CcsAuthProps): React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
+declare function CcsAuth({ auth, children }: CcsAuthProps): ReactElement<any, string | import("react").JSXElementConstructor<any>> | null;
 declare namespace CcsAuth {
     var Group: typeof AuthGroup;
-    var Button: ({ auth, text, confirm, onClick, ...restProps }: Partial<{
-        href: string;
-        target?: React.HTMLAttributeAnchorTarget | undefined;
-        onClick?: React.MouseEventHandler<HTMLAnchorElement> | undefined;
-    } & import("antd/es/button/button").BaseButtonProps & Omit<React.AnchorHTMLAttributes<HTMLButtonElement | HTMLAnchorElement>, "onClick" | "type"> & {
-        htmlType?: "button" | "reset" | "submit" | undefined;
-        onClick?: React.MouseEventHandler<HTMLButtonElement> | undefined;
-    } & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, "onClick" | "type">> & {
+    var Button: ({ auth, text, confirm, onClick, ...restProps }: ButtonProps & {
         auth: string;
         text?: string | undefined;
         confirm?: string | undefined;
     }) => import("react/jsx-runtime").JSX.Element;
-    var Dropdown: ({ auth, menus, children, onClick, ...restProps }: import("./auth-dropdown").CcsAuthDropdownProps) => React.ReactElement<any, string | React.JSXElementConstructor<any>>;
+    var Dropdown: ({ auth, menus, children, onClick, ...restProps }: import("./auth-dropdown").CcsAuthDropdownProps) => ReactElement<any, string | import("react").JSXElementConstructor<any>>;
 }
 declare function AuthGroup({ size, isLink, showCount, moreIcon, moreText, items, onClick, }: CcsAuthGroupProps): import("react/jsx-runtime").JSX.Element | null;
 export default CcsAuth;

package/es/auth/index.js

@@ -1,12 +1,13 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["key", "label"],
   _excluded2 = ["key", "label"];
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -15,10 +16,13 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { EllipsisOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import { Button, Dropdown, Modal, Space } from 'antd';
-import React, { useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 import { CCS, useCcsPage } from '..';
 import AuthButton from "./auth-button";
 import AuthDropdown from "./auth-dropdown";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 export function ModalConfirm(_ref) {
   var modalRef = _ref.modalRef;
   var _Modal$useModal = Modal.useModal(),
@@ -28,7 +32,9 @@ export function ModalConfirm(_ref) {
   useEffect(function () {
     modalRef.current = modal;
   }, []);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, " ", contextHolder);
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [" ", contextHolder]
+  });
 }
 function CcsAuth(_ref2) {
   var auth = _ref2.auth,
@@ -47,23 +53,28 @@ function AuthGroup(_ref4) {
     showCount = _ref4.showCount,
     moreIcon = _ref4.moreIcon,
     moreText = _ref4.moreText,
-    items = _ref4.items,
+    _ref4$items = _ref4.items,
+    items = _ref4$items === void 0 ? [] : _ref4$items,
     onClick = _ref4.onClick;
   var _ref5 = useCcsPage() || {},
     onAuth = _ref5.onAuth;
   var IsAuthButton = CCS.GlobalConfig.IsAuthButton;
   var modalRef = useRef(null);
-  if (!items || items.length === 0) return null;
   var authButtons = [];
+
+  // 过滤隐藏按钮
+  authButtons = items.filter(function (items) {
+    return !items.hidden;
+  });
+
   // 需要判断权限
   if (IsAuthButton && onAuth) {
-    authButtons = items.filter(function (b) {
+    authButtons = authButtons.filter(function (b) {
       if (b.auth) return onAuth(b.auth);
       return true;
     });
-  } else {
-    authButtons = _toConsumableArray(items);
   }
+  if (!items || items.length === 0) return null;
 
   // 当前菜单下查找按钮权限
   var showBtns = authButtons.splice(0, showCount || items.length);
@@ -76,7 +87,7 @@ function AuthGroup(_ref4) {
       var _modalRef$current;
       (_modalRef$current = modalRef.current) === null || _modalRef$current === void 0 ? void 0 : _modalRef$current.confirm({
         title: '操作确认',
-        icon: /*#__PURE__*/React.createElement(ExclamationCircleOutlined, null),
+        icon: /*#__PURE__*/_jsx(ExclamationCircleOutlined, {}),
         centered: true,
         content: item.confirm,
         okText: '确认',
@@ -90,73 +101,84 @@ function AuthGroup(_ref4) {
     onClick(key);
   };
   if (isLink) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, showBtns === null || showBtns === void 0 ? void 0 : showBtns.map(function (_ref6) {
-      var key = _ref6.key,
-        label = _ref6.label,
-        restProps = _objectWithoutProperties(_ref6, _excluded);
-      return /*#__PURE__*/React.createElement(Button, _extends({
-        key: key
-      }, restProps, {
-        size: size,
-        type: "link",
-        onClick: function onClick() {
-          return handleOnClick(key);
-        }
-      }), label);
-    })), authButtons.length > 0 && /*#__PURE__*/React.createElement(Dropdown, {
-      menu: {
-        items: authButtons,
-        onClick: function onClick(e) {
-          return handleOnClick(e.key);
-        }
-      }
-    }, /*#__PURE__*/React.createElement(Button, {
-      type: "link",
-      icon: moreText ? null : moreIcon || /*#__PURE__*/React.createElement(EllipsisOutlined, null),
-      size: "small"
-    }, moreText)), items.find(function (i) {
-      return !!i.confirm;
-    }) ? /*#__PURE__*/React.createElement(ModalConfirm, {
-      modalRef: modalRef
-    }) : null);
-  }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, showBtns === null || showBtns === void 0 ? void 0 : showBtns.map(function (_ref7, index) {
-    var key = _ref7.key,
-      label = _ref7.label,
-      restProps = _objectWithoutProperties(_ref7, _excluded2);
-    // 更多按钮
-    if (index === showBtns.length - 1 && authButtons.length > 0) {
-      return /*#__PURE__*/React.createElement(Space.Compact, {
-        key: key
-      }, /*#__PURE__*/React.createElement(Button, _extends({}, restProps, {
-        size: size,
-        onClick: function onClick() {
-          return handleOnClick(key);
-        }
-      }), label), /*#__PURE__*/React.createElement(Dropdown, {
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx(Space, {
+        children: showBtns === null || showBtns === void 0 ? void 0 : showBtns.map(function (_ref6) {
+          var key = _ref6.key,
+            label = _ref6.label,
+            restProps = _objectWithoutProperties(_ref6, _excluded);
+          return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, restProps), {}, {
+            size: size,
+            type: "link",
+            onClick: function onClick() {
+              return handleOnClick(key);
+            },
+            children: label
+          }), key);
+        })
+      }), authButtons.length > 0 && /*#__PURE__*/_jsx(Dropdown, {
         menu: {
           items: authButtons,
           onClick: function onClick(e) {
             return handleOnClick(e.key);
           }
+        },
+        children: /*#__PURE__*/_jsx(Button, {
+          type: "link",
+          icon: moreText ? null : moreIcon || /*#__PURE__*/_jsx(EllipsisOutlined, {}),
+          size: "small",
+          children: moreText
+        })
+      }), items.find(function (i) {
+        return !!i.confirm;
+      }) ? /*#__PURE__*/_jsx(ModalConfirm, {
+        modalRef: modalRef
+      }) : null]
+    });
+  }
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Space, {
+      children: showBtns === null || showBtns === void 0 ? void 0 : showBtns.map(function (_ref7, index) {
+        var key = _ref7.key,
+          label = _ref7.label,
+          restProps = _objectWithoutProperties(_ref7, _excluded2);
+        // 更多按钮
+        if (index === showBtns.length - 1 && authButtons.length > 0) {
+          return /*#__PURE__*/_jsxs(Space.Compact, {
+            children: [/*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, restProps), {}, {
+              size: size,
+              onClick: function onClick() {
+                return handleOnClick(key);
+              },
+              children: label
+            })), /*#__PURE__*/_jsx(Dropdown, {
+              menu: {
+                items: authButtons,
+                onClick: function onClick(e) {
+                  return handleOnClick(e.key);
+                }
+              },
+              children: /*#__PURE__*/_jsx(Button, {
+                icon: moreText ? null : moreIcon || /*#__PURE__*/_jsx(EllipsisOutlined, {}),
+                children: moreText
+              })
+            })]
+          }, key);
         }
-      }, /*#__PURE__*/React.createElement(Button, {
-        icon: moreText ? null : moreIcon || /*#__PURE__*/React.createElement(EllipsisOutlined, null)
-      }, moreText)));
-    }
-    return /*#__PURE__*/React.createElement(Button, _extends({
-      key: key
-    }, restProps, {
-      size: size,
-      onClick: function onClick() {
-        return handleOnClick(key);
-      }
-    }), label);
-  })), items.find(function (i) {
-    return !!i.confirm;
-  }) ? /*#__PURE__*/React.createElement(ModalConfirm, {
-    modalRef: modalRef
-  }) : null);
+        return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, restProps), {}, {
+          size: size,
+          onClick: function onClick() {
+            return handleOnClick(key);
+          },
+          children: label
+        }), key);
+      })
+    }), items.find(function (i) {
+      return !!i.confirm;
+    }) ? /*#__PURE__*/_jsx(ModalConfirm, {
+      modalRef: modalRef
+    }) : null]
+  });
 }
 CcsAuth.Group = AuthGroup;
 CcsAuth.Button = AuthButton;

package/es/dialog/HookDrawer.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { CcsDialogDrawer, CcsDialogDrawerProps } from './dialog';
+import { CcsDialogDrawer, CcsDialogDrawerProps } from './hook';
 export interface HookDrawerProps {
     afterClose: () => void;
     config: CcsDialogDrawerProps;

package/es/dialog/HookDrawer.js

@@ -13,11 +13,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Drawer } from 'antd';
 import classNames from 'classnames';
 import { forwardRef, useImperativeHandle, useState } from 'react';
-import { ModalContentContext } from "./context";
+import { DialogContentContext } from "./context";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
 var HookDrawer = function HookDrawer(_ref, ref) {
-  var _config$form;
+  var _config$form, _innerConfig$styles;
   var hookAfterClose = _ref.afterClose,
     config = _ref.config;
   var _useState = useState(function () {
@@ -31,19 +31,31 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     innerConfig = _useState2[0],
     setInnerConfig = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    hasButtons = _useState4[0],
-    setHasButtons = _useState4[1];
   var afterClose = function afterClose() {
     hookAfterClose();
   };
-  var close = function close() {
+  var close = function close(e) {
     setInnerConfig(function (c) {
       return _objectSpread(_objectSpread({}, c), {}, {
         open: false
       });
     });
+    if ((e === null || e === void 0 ? void 0 : e.type) === 'click') {
+      // 通过点击关闭按钮或取消按钮关闭
+      if (innerConfig.afterCloseByCancel) {
+        innerConfig.afterCloseByCancel(e);
+      }
+    } else {
+      // 通过调用closeDialog关闭
+      if (innerConfig.afterCloseByOk) {
+        innerConfig.afterCloseByOk(e);
+      }
+    }
+
+    // 入参有onClose
+    if (innerConfig.onClose) {
+      innerConfig.onClose(e);
+    }
   };
   useImperativeHandle(ref, function () {
     return {
@@ -63,21 +75,23 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     return undefined;
   };
   var isCrInProp = ('getContainer' in innerConfig);
+  var styles = innerConfig.styles || {};
+  if (config.form) {
+    styles.body = {
+      padding: 0
+    };
+  }
   return /*#__PURE__*/_jsx(Drawer, _objectSpread(_objectSpread({
-    onClose: close,
     afterOpenChange: function afterOpenChange(open) {
       if (!open) afterClose();
     }
   }, innerConfig), {}, {
+    onClose: close,
     className: classNames('ccs-dialog-drawer', innerConfig.className),
     maskStyle: _objectSpread({
       background: 'rgba(0, 0, 0, 0.1)'
     }, innerConfig.maskStyle),
-    bodyStyle: _objectSpread(_objectSpread({}, hasButtons ? {
-      marginBottom: 80
-    } : {}), config.form ? {
-      padding: 0
-    } : innerConfig.bodyStyle),
+    styles: styles,
     rootStyle: _objectSpread(_objectSpread({}, !isCrInProp ? {
       position: 'absolute'
     } : {}), innerConfig.rootStyle),
@@ -85,19 +99,17 @@ var HookDrawer = function HookDrawer(_ref, ref) {
       boxShadow: 'none'
     } : {}), innerConfig.contentWrapperStyle),
     getContainer: isCrInProp ? innerConfig.getContainer : onGetContainer,
-    children: /*#__PURE__*/_jsx(ModalContentContext.Provider, {
+    extra: null,
+    children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
         closeDialog: close,
-        onHasButtons: function onHasButtons() {
-          return setHasButtons(true);
-        },
         formInitialValues: ((_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues) || {}
       },
       children: config.form ? /*#__PURE__*/_jsx(DialogForm, {
         formProps: config.form,
-        bodyStyle: _objectSpread({
+        styles: _objectSpread({
           padding: 24
-        }, innerConfig.bodyStyle),
+        }, (_innerConfig$styles = innerConfig.styles) === null || _innerConfig$styles === void 0 ? void 0 : _innerConfig$styles.body),
         children: config.content
       }) : config.content
     })

package/es/dialog/HookModal.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { CcsDialogModal, CcsDialogModalProps } from './dialog';
+import { CcsDialogModal, CcsDialogModalProps } from './hook';
 export interface HookModalProps {
     afterClose: () => void;
     config: CcsDialogModalProps;

package/es/dialog/HookModal.js

@@ -1,8 +1,4 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -18,7 +14,7 @@ import { Modal } from 'antd';
 import classNames from 'classnames';
 import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import Draggable from 'react-draggable';
-import { ModalContentContext } from "./context";
+import { DialogContentContext } from "./context";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
 var DragModal = function DragModal(_ref) {
@@ -94,20 +90,27 @@ var HookModal = function HookModal(_ref2, ref) {
     if (config.destroyOnClose !== false) hookAfterClose();
     (_innerConfig$afterClo = innerConfig.afterClose) === null || _innerConfig$afterClo === void 0 ? void 0 : _innerConfig$afterClo.call(innerConfig);
   };
-  var close = function close() {
+  var close = function close(e) {
     setInnerConfig(function (c) {
       return _objectSpread(_objectSpread({}, c), {}, {
         open: false
       });
     });
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    if ((e === null || e === void 0 ? void 0 : e.type) === 'click') {
+      // 通过点击关闭按钮或取消按钮关闭
+      if (innerConfig.afterCloseByCancel) {
+        innerConfig.afterCloseByCancel(e);
+      }
+    } else {
+      // 通过调用closeDialog关闭
+      if (innerConfig.afterCloseByOk) {
+        innerConfig.afterCloseByOk(e);
+      }
     }
-    var triggerCancel = args.some(function (param) {
-      return param && param.triggerCancel;
-    });
-    if (innerConfig.onCancel && triggerCancel) {
-      innerConfig.onCancel.apply(innerConfig, [function () {}].concat(_toConsumableArray(args.slice(1))));
+
+    // 入参有onClose
+    if (innerConfig.onCancel) {
+      innerConfig.onCancel(e);
     }
   };
   useImperativeHandle(ref, function () {
@@ -120,15 +123,17 @@ var HookModal = function HookModal(_ref2, ref) {
       }
     };
   });
+  var styles = innerConfig.styles || {};
+  styles.body = _objectSpread(_objectSpread({
+    position: 'relative'
+  }, styles.body), hasButtons ? {
+    paddingBottom: 44
+  } : {});
   return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
     onCancel: close,
     afterClose: afterClose
   }, innerConfig), {}, {
-    bodyStyle: _objectSpread(_objectSpread({
-      position: 'relative'
-    }, innerConfig.bodyStyle), hasButtons ? {
-      paddingBottom: 44
-    } : {}),
+    styles: styles,
     className: classNames('ccs-dialog-modal', innerConfig.className),
     footer: null,
     title: config.isDrag ? /*#__PURE__*/_jsx("div", {
@@ -161,10 +166,10 @@ var HookModal = function HookModal(_ref2, ref) {
         onDragState: setDragState
       });
     } : undefined,
-    children: /*#__PURE__*/_jsx(ModalContentContext.Provider, {
+    children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
         closeDialog: close,
-        onHasButtons: function onHasButtons() {
+        onHasModalButtons: function onHasModalButtons() {
           return setHasButtons(true);
         },
         formInitialValues: ((_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues) || {}

package/es/dialog/button.d.ts

@@ -1,10 +1,12 @@
 import { ReactNode } from 'react';
 interface DialogButtonsProps {
     okText?: string;
+    cancelText?: string;
     okAuth?: string;
     loading?: boolean;
     children?: ReactNode;
+    hideCancel?: boolean;
     onOk?: (values?: any) => void;
 }
-export default function CcsDialogButtons({ okText, okAuth, loading, children, onOk, }: DialogButtonsProps): import("react/jsx-runtime").JSX.Element | null;
+export default function CcsDialogButtons({ okText, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps): import("react/jsx-runtime").JSX.Element | null;
 export {};