@ccs-ui/rc-pro 1.1.1-rc1 → 1.1.1-rc11

package/es/auth/index.d.ts

@@ -6,6 +6,7 @@ export interface ButtonItem {
     auth?: string;
     type?: ButtonProps['type'];
     disabled?: boolean;
+    hidden?: boolean;
     danger?: boolean;
     icon?: ReactNode;
     confirm?: string;
@@ -28,7 +29,7 @@ export interface CcsAuthGroupProps {
 }
 export interface CcsAuthProps {
     /** 权限标识 */
-    auth: string;
+    auth?: string;
     /** component children */
     children: ReactElement;
 }
@@ -38,14 +39,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); }
@@ -57,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);

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

@@ -5,7 +5,8 @@ interface DialogButtonsProps {
     okAuth?: string;
     loading?: boolean;
     children?: ReactNode;
+    hideCancel?: boolean;
     onOk?: (values?: any) => void;
 }
-export default function CcsDialogButtons({ okText, okAuth, loading, children, cancelText, 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 {};

package/es/dialog/button.js

@@ -9,22 +9,23 @@ import { Button, Form } from 'antd';
 import { useEffect } from 'react';
 import CcsDialog 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";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function CcsDialogButtons(_ref) {
   var okText = _ref.okText,
     okAuth = _ref.okAuth,
     loading = _ref.loading,
     children = _ref.children,
+    hideCancel = _ref.hideCancel,
     cancelText = _ref.cancelText,
     onOk = _ref.onOk;
-  var _CcsDialog$useContext = CcsDialog.useContext(),
-    closeDialog = _CcsDialog$useContext.closeDialog,
-    onHasButtons = _CcsDialog$useContext.onHasButtons,
-    formInitialValues = _CcsDialog$useContext.formInitialValues;
+  var _CcsDialog$useInstanc = CcsDialog.useInstance(),
+    closeDialog = _CcsDialog$useInstanc.closeDialog,
+    onHasModalButtons = _CcsDialog$useInstanc.onHasModalButtons,
+    formInitialValues = _CcsDialog$useInstanc.formInitialValues;
   var form = Form.useFormInstance();
   useEffect(function () {
-    onHasButtons();
+    if (onHasModalButtons) onHasModalButtons();
   }, []);
   var onOkClick = function onOkClick() {
     if (!onOk) return;
@@ -38,19 +39,21 @@ export default function CcsDialogButtons(_ref) {
     }
     onOk();
   };
-  return onOk ? /*#__PURE__*/_jsx(_Fragment, {
+  return onOk || children ? /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsxs("div", {
       className: "ccs-dialog-buttons",
-      children: [/*#__PURE__*/_jsx(Button, {
-        onClick: closeDialog,
-        children: cancelText || '取消'
-      }), /*#__PURE__*/_jsx(CcsAuth.Button, {
-        auth: okAuth || '',
-        type: "primary",
-        loading: loading,
-        onClick: onOkClick,
-        children: okText || '确定'
-      }), children]
+      children: [children, onOk && /*#__PURE__*/_jsxs(_Fragment, {
+        children: [!hideCancel && /*#__PURE__*/_jsx(Button, {
+          onClick: closeDialog,
+          children: cancelText || '取消'
+        }), /*#__PURE__*/_jsx(CcsAuth.Button, {
+          auth: okAuth || '',
+          type: "primary",
+          loading: loading,
+          onClick: onOkClick,
+          children: okText || '确定'
+        })]
+      })]
     })
   }) : null;
 }

package/es/dialog/context.d.ts

@@ -1,11 +1,12 @@
 import { Store } from 'antd/es/form/interface';
 import React from 'react';
-interface ContentContextType<T = Store> {
-    locationKey: string;
+export interface DialogContextType<T = Store> {
+    /** 表单初始值 */
     formInitialValues: T;
-    closeDialog: () => void;
-    onHasButtons: () => void;
+    /** 关闭弹框，可以设置返回值 */
+    closeDialog: (e?: any) => void;
+    onHasModalButtons?: () => void;
 }
-declare const ModalContentContext: React.Context<ContentContextType<any>>;
-declare const useDialogContext: <T = Store>() => ContentContextType<T>;
-export { useDialogContext, ModalContentContext };
+declare const DialogContentContext: React.Context<DialogContextType<any>>;
+declare const useDialogContext: <T = Store>() => DialogContextType<T>;
+export { useDialogContext, DialogContentContext };

package/es/dialog/context.js

@@ -1,10 +1,10 @@
 import React, { useContext } from 'react';
-var ModalContentContext = /*#__PURE__*/React.createContext({});
+var DialogContentContext = /*#__PURE__*/React.createContext({});
 var useDialogContext = function useDialogContext() {
-  var context = useContext(ModalContentContext);
+  var context = useContext(DialogContentContext);
   if (context === undefined) {
-    throw new Error('ModalContentContext not found');
+    throw new Error('DialogContentContext not found');
   }
   return context;
 };
-export { useDialogContext, ModalContentContext };
+export { useDialogContext, DialogContentContext };

package/es/dialog/form.d.ts

@@ -3,11 +3,11 @@ import { CSSProperties, ReactNode } from 'react';
 interface PropsType {
     children: ReactNode;
     formProps: FormProps;
-    bodyStyle?: CSSProperties;
+    styles?: CSSProperties;
 }
 /**
  * 添加form实例
  * @returns
  */
-export default function DialogForm({ children, bodyStyle, formProps: { labelCol, wrapperCol, ...restProps }, }: PropsType): import("react/jsx-runtime").JSX.Element;
+export default function DialogForm({ children, styles, formProps: { labelCol, wrapperCol, ...restProps }, }: PropsType): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/dialog/form.js

@@ -21,7 +21,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  */
 export default function DialogForm(_ref) {
   var children = _ref.children,
-    bodyStyle = _ref.bodyStyle,
+    styles = _ref.styles,
     _ref$formProps = _ref.formProps,
     labelCol = _ref$formProps.labelCol,
     wrapperCol = _ref$formProps.wrapperCol,
@@ -36,12 +36,13 @@ export default function DialogForm(_ref) {
     },
     wrapperCol: wrapperCol || {
       span: 14
-    }
+    },
+    preserve: false
   }, restProps), {}, {
     style: _objectSpread(_objectSpread({
       height: '100%',
       overflow: 'auto'
-    }, bodyStyle), restProps.style),
+    }, styles), restProps.style),
     children: children
   }));
 }

package/es/dialog/{dialog.d.ts → hook.d.ts}

@@ -23,12 +23,20 @@ export type CcsDialogModalProps = ModalFuncProps & {
     form?: FormProps;
     /** 关闭后销毁组件，默认true */
     destroyOnClose?: boolean;
+    /** 通过closeDialog方法关闭dialog */
+    afterCloseByOk?: (e: any) => void;
+    /** 通过点击关闭按钮或取消按钮关闭 */
+    afterCloseByCancel?: (e: any) => void;
 };
-export type CcsDialogDrawerProps = DrawerProps & {
+export type CcsDialogDrawerProps = Omit<DrawerProps, 'extra'> & {
     /** antd form */
     form?: FormProps;
     /** 抽屉内容 */
     content?: ReactNode;
+    /** 通过closeDialog方法关闭dialog */
+    afterCloseByOk?: (e: any) => void;
+    /** 通过点击关闭按钮或取消按钮关闭 */
+    afterCloseByCancel?: (e: any) => void;
 };
 export type ModalDialog = (...args: Parameters<ModalFunc>) => ReturnType<ModalFunc>;
 export type DrawerDialog = (...args: Parameters<ModalFunc>) => ReturnType<DrawerFunc>;

package/es/dialog/index.d.ts

@@ -1,11 +1,11 @@
 import CcsDialogButtons from './button';
 import { useDialogContext } from './context';
-import useCcsDialog from './dialog';
+import useCcsDialog from './hook';
 import './index.less';
-interface ModalInterface {
+interface DialogInterface {
     Buttons: typeof CcsDialogButtons;
     useDialog: typeof useCcsDialog;
-    useContext: typeof useDialogContext;
+    useInstance: typeof useDialogContext;
 }
-declare const CcsDialog: ModalInterface;
+declare const CcsDialog: DialogInterface;
 export default CcsDialog;

package/es/dialog/index.js

@@ -1,9 +1,9 @@
 import CcsDialogButtons from "./button";
 import { useDialogContext } from "./context";
-import useCcsDialog from "./dialog";
+import useCcsDialog from "./hook";
 import "./index.less";
 var CcsDialog = {};
 CcsDialog.Buttons = CcsDialogButtons;
 CcsDialog.useDialog = useCcsDialog;
-CcsDialog.useContext = useDialogContext;
+CcsDialog.useInstance = useDialogContext;
 export default CcsDialog;

package/es/dialog/index.less

@@ -1,28 +1,25 @@
-.ccs-dialog {
-  &-buttons {
-    position: absolute;
-    bottom: 0;
-    right: 0;
-    z-index: 1;
+.ccs-dialog-buttons {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  z-index: 1;
 
-    .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
-      margin-bottom: 0;
-      margin-left: 8px;
-    }
+  .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
+    margin-bottom: 0;
+    margin-left: 8px;
   }
 }
 
 .ccs-dialog-drawer {
   .ccs-dialog-buttons {
-    height: 80px;
-    line-height: 79px;
-    background-color: #fff;
-    border-top: 1px solid rgba(5, 5, 5, 6%);
-    width: 100%;
-    text-align: center;
+    right: 16px;
+    top: 0;
+    bottom: auto;
+    height: 57px;
+    line-height: 56px;
   }
 
   .ant-drawer-header {
-    padding: 10px;
+    padding: 16px;
   }
 }

package/es/index.d.ts

@@ -1,5 +1,5 @@
 import { MenuProps } from 'antd';
-import { ConfigProviderProps } from 'antd/lib/config-provider';
+type ReactText = 'string' | 'number';
 interface MenuTreeNodeData {
     buttonUrlId: number;
     createTime: string;
@@ -40,8 +40,8 @@ interface CcsUserDetailType {
 export interface CcsGlobalConfigType {
     /** app名称 */
     AppName: string;
-    /** 主题色 */
-    BrandPrimary: string;
+    /** 主题 */
+    AppTheme: 'default' | 'dark';
     /** 菜单展开宽度 */
     MenuExpandWidth: number;
     /** 菜单收起宽度 */
@@ -50,8 +50,6 @@ export interface CcsGlobalConfigType {
     IsTabsPage: boolean;
     /** 启用按钮权限 */
     IsAuthButton: boolean;
-    /** ant 主题 */
-    theme: ConfigProviderProps['theme'];
     /** 菜单类型，现在支持垂直、水平、和内嵌模式三种 */
     MenuExpandMode: MenuProps['mode'];
     /** 菜单始终收起状态？ */
@@ -135,7 +133,6 @@ export { default as CcsColorPicker } from './color-picker';
 export { default as CcsConfigProvider } from './config';
 export { default as CcsDatePicker } from './date-picker';
 export { default as CcsDialog } from './dialog';
-export { default as CcsDrawer } from './drawer';
 export { default as CcsFullScreenButton } from './full-screen';
 export { default as useCcsGlobal } from './hooks/use-global';
 export { default as useCcsOnceEvent } from './hooks/use-once-event';
@@ -145,7 +142,6 @@ export { default as useCcsWindow } from './hooks/use-window';
 export { default as CcsIntervalButton } from './interval-button';
 export { default as CcsKeepAliveTabs } from './keep-alive-tabs';
 export { default as CcsLoading } from './loading';
-export { default as CcsModal } from './modal';
 export { default as CcsProGrid } from './pro-grid';
 export { default as CcsProTable } from './pro-table';
 export { default as CcsProTabs } from './pro-tabs';
@@ -158,4 +154,4 @@ export { default as CcsUpload } from './upload';
 export { default as CcsUtils } from './utils';
 export { default as CcsVirtualList } from './virtual-list';
 export { default as CcsWaterMark } from './water-mark';
-export type { PageType, HttpResult, RecordType, MenuTreeNode, PageQueryType, TableDataType, ListQueryType, HttpListResult, HttpPageResult, MenuTreeNodeData, CcsUserDetailType, RouteHistoryType, };
+export type { PageType, ReactText, HttpResult, RecordType, MenuTreeNode, PageQueryType, TableDataType, ListQueryType, HttpListResult, HttpPageResult, MenuTreeNodeData, CcsUserDetailType, RouteHistoryType, };

package/es/index.js

@@ -7,7 +7,6 @@ export { default as CcsColorPicker } from "./color-picker";
 export { default as CcsConfigProvider } from "./config";
 export { default as CcsDatePicker } from "./date-picker";
 export { default as CcsDialog } from "./dialog";
-export { default as CcsDrawer } from "./drawer";
 export { default as CcsFullScreenButton } from "./full-screen";
 export { default as useCcsGlobal } from "./hooks/use-global";
 export { default as useCcsOnceEvent } from "./hooks/use-once-event";
@@ -17,7 +16,6 @@ export { default as useCcsWindow } from "./hooks/use-window";
 export { default as CcsIntervalButton } from "./interval-button";
 export { default as CcsKeepAliveTabs } from "./keep-alive-tabs";
 export { default as CcsLoading } from "./loading";
-export { default as CcsModal } from "./modal";
 export { default as CcsProGrid } from "./pro-grid";
 export { default as CcsProTable } from "./pro-table";
 export { default as CcsProTabs } from "./pro-tabs";

package/es/keep-alive-tabs/index.d.ts

@@ -1,4 +1,4 @@
-import { MenuTreeNode } from '../types';
+import { MenuTreeNode } from '../';
 import './index.less';
 interface PropsType {
     maxLen?: number;

package/es/keep-alive-tabs/index.js

@@ -14,7 +14,7 @@ import { Button, Dropdown, Empty, Tabs } from 'antd';
 import classnames from 'classnames';
 import _debounce from 'lodash/debounce';
 import ResizeObserver from 'rc-resize-observer';
-import React, { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
 import { CCS, CcsUtils } from "../";

package/es/keep-alive-tabs/index.less

@@ -1,11 +1,11 @@
 .ccs-keep-alive {
   flex: 1 1 auto;
-  background: #f0f2f5;
+  // background: #f0f2f5;
   display: flex;
   flex-direction: column;
 
   &-tabs {
-    background: rgb(240 242 245);
+    // background: rgb(240 242 245);
 
     & > .ant-tabs-nav {
       margin: 0;