@ccs-ui/rc-pro 1.1.1-rc2 → 1.1.1-rc20

package/es/auth/auth-button.js

@@ -11,7 +11,7 @@ import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { Button } from 'antd';
 import { useRef } from 'react';
 import { ModalConfirm } from '.';
-import { CCS, useCcsPage } from "../";
+import { 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";
@@ -28,7 +28,6 @@ export default (function (_ref) {
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useCcsPage() || {},
     onAuth = _ref2.onAuth;
-  var IsAuthButton = CCS.GlobalConfig.IsAuthButton;
   var modalRef = useRef(null);
   var button = /*#__PURE__*/_jsxs(Button, _objectSpread(_objectSpread({}, restProps), {}, {
     onClick: function onClick(e) {
@@ -54,7 +53,7 @@ export default (function (_ref) {
   }));
 
   // 不控制权限或没有传auth
-  if (!IsAuthButton || !auth) {
+  if (!auth) {
     return /*#__PURE__*/_jsxs(_Fragment, {
       children: [button, !!confirm ? /*#__PURE__*/_jsx(ModalConfirm, {
         modalRef: modalRef

package/es/auth/auth-dropdown.js

@@ -9,7 +9,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 { Dropdown } from 'antd';
 import React, { useMemo } from 'react';
-import { CCS, useCcsPage } from "../";
+import { useCcsPage } from "../";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
@@ -24,7 +24,6 @@ export default (function (_ref) {
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useCcsPage() || {},
     onAuth = _ref2.onAuth;
-  var IsAuthButton = CCS.GlobalConfig.IsAuthButton;
   var items = useMemo(function () {
     function filterTreeArray(menuItems) {
       var mis = menuItems.filter(function (item) {
@@ -46,15 +45,12 @@ export default (function (_ref) {
         return m.children !== null;
       });
     }
-    if (IsAuthButton) {
-      return filterTreeArray(menus);
-    }
-    return menus;
+    return filterTreeArray(menus);
   }, [menus.map(function (m) {
     return m === null || m === void 0 ? void 0 : m.key;
   }).join(',')]);
   var renderChildren = useMemo(function () {
-    if (!auth || !IsAuthButton) {
+    if (!auth) {
       return children;
     }
     var btn = onAuth && onAuth(auth);

package/es/auth/index.d.ts

@@ -1,15 +1,6 @@
 import { ButtonProps } from 'antd';
 import { ReactElement, ReactNode } from 'react';
-export interface ButtonItem {
-    key: string;
-    label: string;
-    auth?: string;
-    type?: ButtonProps['type'];
-    disabled?: boolean;
-    danger?: boolean;
-    icon?: ReactNode;
-    confirm?: string;
-}
+import { CCS } from '..';
 export interface CcsAuthGroupProps {
     /** 按钮尺寸 */
     size?: ButtonProps['size'];
@@ -18,7 +9,7 @@ export interface CcsAuthGroupProps {
     /** 全部显示成link样式 */
     isLink?: boolean;
     /** 按钮数据 */
-    items?: ButtonItem[];
+    items?: CCS.AuthButtonItem[];
     /** 更多icon */
     moreIcon?: ReactNode;
     /** 更多文字 */
@@ -28,7 +19,7 @@ export interface CcsAuthGroupProps {
 }
 export interface CcsAuthProps {
     /** 权限标识 */
-    auth: string;
+    auth?: string;
     /** component children */
     children: ReactElement;
 }
@@ -38,14 +29,7 @@ export declare function ModalConfirm({ modalRef }: {
 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?: import("react").HTMLAttributeAnchorTarget | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLAnchorElement> | undefined;
-    } & import("antd/es/button/button").BaseButtonProps & Omit<import("react").AnchorHTMLAttributes<HTMLAnchorElement | HTMLButtonElement>, "type" | "onClick"> & {
-        htmlType?: "button" | "submit" | "reset" | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLButtonElement> | undefined;
-    } & Omit<import("react").ButtonHTMLAttributes<HTMLButtonElement>, "type" | "onClick">> & {
+    var Button: ({ auth, text, confirm, onClick, ...restProps }: ButtonProps & {
         auth: string;
         text?: string | undefined;
         confirm?: string | undefined;

package/es/auth/index.js

@@ -8,10 +8,6 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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); }
@@ -21,7 +17,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { EllipsisOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import { Button, Dropdown, Modal, Space } from 'antd';
 import { useEffect, useRef } from 'react';
-import { CCS, useCcsPage } from '..';
+import { useCcsPage } from '..';
 import AuthButton from "./auth-button";
 import AuthDropdown from "./auth-dropdown";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -45,8 +41,7 @@ function CcsAuth(_ref2) {
     children = _ref2.children;
   var _ref3 = useCcsPage() || {},
     onAuth = _ref3.onAuth;
-  var IsAuthButton = CCS.GlobalConfig.IsAuthButton;
-  if (IsAuthButton && onAuth && auth) {
+  if (onAuth && auth) {
     return onAuth(auth) ? children : null;
   }
   return children;
@@ -57,23 +52,27 @@ 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) {
+  if (onAuth) {
+    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);

package/es/cascader/index.d.ts

@@ -1,5 +1,5 @@
 import { CascaderProps } from 'antd';
-import { HttpResult, RecordType } from '..';
+import { CCS } from '..';
 type CacheType = {
     /** 缓存key，同一个key将共享数据 */
     cacheKey?: string;
@@ -11,9 +11,9 @@ type CacheType = {
 type ApiCascaderProps = CascaderProps & {
     cache?: CacheType;
     /** 依赖参数 */
-    defaultParams?: RecordType;
+    defaultParams?: CCS.RecordType;
     /** 查询请求 */
-    onQuery?: (params?: any) => Promise<HttpResult<any[]>>;
+    onQuery?: (params?: any) => Promise<CCS.HttpResult<any[]>>;
 };
 /**
  * 基于接口查询的select组件

package/es/cascader/index.js

@@ -13,7 +13,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { useRequest } from 'ahooks';
 import { Cascader } from 'antd';
 import _isArray from 'lodash/isArray';
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * 基于接口查询的select组件

package/es/ccs.d.ts

@@ -1,25 +1,183 @@
-import { ReactNode } from 'react';
-import { CcsGlobalConfigType } from './';
-interface CcsCustomIconType {
-    name: 'TableFilter' | string;
-    node: ReactNode;
-}
-export default class ccs {
-    /** 自定义按钮 */
-    static CustomIcon: CcsCustomIconType[];
-    /** 按钮权限 */
-    static UrlAuth: Record<string, string[]>;
-    /** 全局配置 */
-    static GlobalConfig: CcsGlobalConfigType;
-    /** 添加自定义icon */
-    static setCustomIcon(_icons: CcsCustomIconType[]): void;
-    /** 设置全局配置 */
-    static setGlobalConfig(e: CcsGlobalConfigType): void;
-    /** 添加权限数据 */
-    static setAuthList(e: string, auths: string[]): void;
-    /** 清空权限 */
-    static clearAuthList(): void;
-    /** 系统配置 */
-    static setDefaultConfig(config: any): any;
-}
-export {};
+import { ButtonProps } from 'antd';
+import { Rule } from 'antd/es/form';
+import { ColumnsType } from 'antd/es/table';
+import { MutableRefObject, ReactElement, ReactNode } from 'react';
+interface MenuTreeNodeData {
+    buttonUrlId: number;
+    createTime: string;
+    icon?: string;
+    menuCode: string;
+    menuDesc: string;
+    menuName: string;
+    menuType: number;
+    menuUrl: string;
+    parentMenuCode: string;
+    sortId: number;
+    state: number;
+    updateTime: string;
+    urlName: string;
+    urlPath: string;
+}
+interface MenuParentType {
+    key: string;
+    url: string;
+    name: string;
+}
+interface MenuTreeNode {
+    nodeId: string;
+    nodeName: string;
+    icon: string;
+    leaf: boolean;
+    nodeData: MenuTreeNodeData;
+    children?: MenuTreeNode[];
+    topUrl?: string;
+    parents?: MenuParentType[];
+}
+interface UserDetail {
+    /** 头像 */
+    avatar?: string;
+    /** 用户名 */
+    workerName: string;
+}
+interface TableData<T> {
+    /** loading */
+    loading?: boolean;
+    /** 总条数 */
+    totalNum?: number;
+    /** 单页记录数 */
+    pageSize?: number;
+    /** 页码 */
+    pageNo?: number;
+    /** Array List 数据 */
+    result?: T[];
+}
+interface HttpResult<T = any> {
+    code: string;
+    success: boolean;
+    data: T;
+    msg: string;
+}
+interface PageType<T> {
+    hasNext: boolean;
+    totalNum: number;
+    pageNo: number;
+    pageSize: number;
+    result: T[];
+}
+interface HttpPageResult<T = any> extends Omit<HttpResult<T>, 'data'> {
+    data: PageType<T>;
+}
+interface HttpListResult<T = any> extends Omit<HttpResult<T>, 'data'> {
+    data: T[];
+}
+interface OrderProp {
+    ascending: boolean;
+    prop: string;
+}
+interface QueryLimit {
+    fetchSize: number;
+    startIndex: number;
+}
+interface PageQuery<T = any> {
+    /** 查询的开始行数和取多少行，从0开始 */
+    limit?: QueryLimit;
+    /** 排序字段,一般前端不传，由后端指定 */
+    orderProps?: OrderProp[];
+    /** 页码 */
+    pageNo?: number;
+    /** 页长 */
+    pageSize?: number;
+    /** 查询条件 */
+    query: T;
+}
+interface ListQuery<T = any> {
+    /** 查询的开始行数和取多少行，从0开始 */
+    limit?: QueryLimit;
+    /** 排序字段,一般前端不传，由后端指定 */
+    orderProps?: OrderProp[];
+    /** 查询条件 */
+    query: T;
+}
+type RecordType = Record<string, any>;
+interface RouteHistory {
+    menuName: string;
+    pathName: string;
+    time: Date;
+}
+interface TableDataType<T> {
+    /** loading */
+    loading?: boolean;
+    /** 总条数 */
+    totalNum?: number;
+    /** 单页记录数 */
+    pageSize?: number;
+    /** 页码 */
+    pageNo?: number;
+    /** Array List 数据 */
+    result?: T[];
+}
+interface TableInstance<T = any> {
+    /** 获取form表单数据 */
+    formValues: Record<string, any>;
+    /** 获取当前表单数据 */
+    data: TableDataType<T>;
+    /** 查询数据，根据条件，从第一页开始显示 */
+    onSearch: () => void;
+    /** 刷新数据、根据条件，当前页 */
+    onReload: () => void;
+    /** 异步树、局部刷新方法 */
+    onPartialReload: (id: React.Key) => void;
+    /** 重置数据，清空选择 */
+    onReset: () => void;
+    /** 改变data 数据 */
+    onChangeData: React.Dispatch<React.SetStateAction<TableDataType<T>>>;
+}
+interface AuthButtonItem {
+    key: string;
+    label: string;
+    auth?: string;
+    type?: ButtonProps['type'];
+    disabled?: boolean;
+    hidden?: boolean;
+    danger?: boolean;
+    icon?: ReactNode;
+    confirm?: string;
+}
+interface TriggerChildrenProps<T = any> {
+    /** 选中值 */
+    value?: T;
+    /** 选择框loading状态 */
+    onLoading?: (loading: boolean) => void;
+    /** 关闭弹框 */
+    onVisible?: (visible: boolean) => void;
+    /** 选中值改变事件 */
+    onChange?: ({}: T) => void;
+    /** 选择框显示名称 */
+    onChangeLabel?: (text: string | undefined) => void;
+}
+type ShowDependType = {
+    name: string;
+    value: any;
+};
+type TableFormItem = {
+    /** label 标题 */
+    label?: string;
+    /** form name */
+    name: string;
+    /** form item element */
+    value: ReactElement;
+    /** 主条件 */
+    isMain?: boolean;
+    /** 数据依赖、依赖项对应的name数组 */
+    depends?: string[];
+    /** 显示依赖 */
+    showDepends?: ShowDependType[];
+    /** 必填规则 */
+    rules?: Rule[];
+    /** 格式化值 */
+    onFormat?: (e: any) => any;
+};
+type TableFormItems = TableFormItem[];
+type TableInstanceRef<T = any> = MutableRefObject<TableInstance<T> | undefined> | React.RefObject<TableInstance<T>>;
+type TableColumns<T = any> = ColumnsType<T>;
+export type { PageType, RecordType, MenuTreeNode, PageQuery, ListQuery, HttpResult, HttpListResult, HttpPageResult, AuthButtonItem, MenuTreeNodeData, UserDetail, RouteHistory, TableData, TableFormItems, TableColumns, TableInstance, TableInstanceRef, TriggerChildrenProps, };

package/es/ccs.js

@@ -1,79 +1 @@
-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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-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); }
-var defaultConfig = {
-  theme: {
-    token: {
-      colorPrimary: '#1677ff',
-      borderRadius: 3
-    },
-    hashed: true
-  },
-  classPrefix: 'ccs'
-};
-var ccs = /*#__PURE__*/function () {
-  function ccs() {
-    _classCallCheck(this, ccs);
-  }
-  _createClass(ccs, null, [{
-    key: "setCustomIcon",
-    value: /** 添加自定义icon */
-    function setCustomIcon(_icons) {
-      console.log('_icons', _icons);
-
-      // this.icons = this.icons.concat(icons);
-      // icons.forEach((icon) => {
-      //   if (['TableFilter', 'TableReset', 'TableColumn'].includes(icon.name)) {
-      //     this.proTableIcon[icon.name] = icon.node;
-      //   } else {
-      //     this.icons.push(icon);
-      //   }
-      // });
-    }
-
-    /** 设置全局配置 */
-  }, {
-    key: "setGlobalConfig",
-    value: function setGlobalConfig(e) {
-      this.GlobalConfig = e;
-    }
-
-    /** 添加权限数据 */
-  }, {
-    key: "setAuthList",
-    value: function setAuthList(e, auths) {
-      this.UrlAuth[e] = auths;
-    }
-
-    /** 清空权限 */
-  }, {
-    key: "clearAuthList",
-    value: function clearAuthList() {
-      this.UrlAuth = {};
-    }
-
-    /** 系统配置 */
-  }, {
-    key: "setDefaultConfig",
-    value: function setDefaultConfig(config) {
-      Object.keys(defaultConfig).forEach(function (key) {
-        if (config[key] === undefined) {
-          config[key] = defaultConfig[key];
-        }
-      });
-      return config;
-    }
-  }]);
-  return ccs;
-}();
-/** 自定义按钮 */
-_defineProperty(ccs, "CustomIcon", []);
-/** 按钮权限 */
-_defineProperty(ccs, "UrlAuth", {});
-/** 全局配置 */
-_defineProperty(ccs, "GlobalConfig", {});
-export { ccs as default };
+export {};

package/es/context/index.d.ts

@@ -2,7 +2,7 @@ import { TabPaneProps } from 'antd';
 import { Store } from 'antd/es/form/interface';
 import { Location } from 'history';
 import React from 'react';
-import { CcsUserDetailType, RecordType } from '..';
+import { CCS } from '..';
 type CcsTabsChangeProps = {
     /** 当前激活tab面板的key */
     activeKey?: string;
@@ -11,7 +11,7 @@ type CcsTabsChangeProps = {
     /** 禁用tab keys */
     disableKeys?: string[];
     /** tab间传递的参数 */
-    options?: RecordType;
+    options?: CCS.RecordType;
 };
 export type CcsTabProps = Omit<TabPaneProps, 'tab'> & {
     key: string;
@@ -21,7 +21,7 @@ interface CcsTabsContextType {
     /** 当前激活tab面板的key */
     activeKey: string;
     /** tab间传递的参数 */
-    options: RecordType;
+    options: CCS.RecordType;
     /** 添加tab */
     onAddTabs: (tab: CcsTabProps | CcsTabProps[]) => void;
     /** 移除tab */
@@ -42,7 +42,7 @@ type PageContextType = {
     onAuth: (code: string) => boolean;
 };
 interface GlobalContextPropsType {
-    userDetail: CcsUserDetailType;
+    userDetail: CCS.UserDetail;
     children: React.ReactElement;
 }
 type GlobalContextType = Omit<GlobalContextPropsType, 'children'>;

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

@@ -12,12 +12,13 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 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 { forwardRef, useImperativeHandle, useRef, useState } from 'react';
+import { DialogButtonHolder } from "./button";
+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 +32,33 @@ 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 buttonRef = useRef(null);
+  var footerRef = useRef(null);
   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 +78,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
+    };
+  }
+  styles.mask = _objectSpread({
+    background: 'rgba(0, 0, 0, 0.1)'
+  }, styles.mask);
   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 +102,24 @@ var HookDrawer = function HookDrawer(_ref, ref) {
       boxShadow: 'none'
     } : {}), innerConfig.contentWrapperStyle),
     getContainer: isCrInProp ? innerConfig.getContainer : onGetContainer,
-    children: /*#__PURE__*/_jsx(ModalContentContext.Provider, {
+    extra: /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: buttonRef
+    }),
+    footer: /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: footerRef
+    }),
+    children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
+        buttonRef: buttonRef,
         closeDialog: close,
-        onHasButtons: function onHasButtons() {
-          return setHasButtons(true);
-        },
+        drawerFooterRef: footerRef,
         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;