@ccs-ui/rc-pro 1.1.1-rc9 → 1.1.2

package/es/dialog/HookDrawer.js

@@ -12,7 +12,9 @@ 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 { forwardRef, useImperativeHandle, useRef, useState } from 'react';
+import { DialogSelfButton } from "./HookModal";
+import { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -31,6 +33,9 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     innerConfig = _useState2[0],
     setInnerConfig = _useState2[1];
+  var buttonRef = useRef(null);
+  var footerRef = useRef(null);
+  var formRef = useRef(null);
   var afterClose = function afterClose() {
     hookAfterClose();
   };
@@ -81,6 +86,9 @@ var HookDrawer = function HookDrawer(_ref, ref) {
       padding: 0
     };
   }
+  styles.mask = _objectSpread({
+    background: 'rgba(0, 0, 0, 0.1)'
+  }, styles.mask);
   return /*#__PURE__*/_jsx(Drawer, _objectSpread(_objectSpread({
     afterOpenChange: function afterOpenChange(open) {
       if (!open) afterClose();
@@ -88,24 +96,32 @@ var HookDrawer = function HookDrawer(_ref, ref) {
   }, innerConfig), {}, {
     onClose: close,
     className: classNames('ccs-dialog-drawer', innerConfig.className),
-    maskStyle: _objectSpread({
-      background: 'rgba(0, 0, 0, 0.1)'
-    }, innerConfig.maskStyle),
     styles: styles,
     rootStyle: _objectSpread(_objectSpread({}, !isCrInProp ? {
       position: 'absolute'
     } : {}), innerConfig.rootStyle),
-    contentWrapperStyle: _objectSpread(_objectSpread({}, !isCrInProp ? {
-      boxShadow: 'none'
-    } : {}), innerConfig.contentWrapperStyle),
     getContainer: isCrInProp ? innerConfig.getContainer : onGetContainer,
-    extra: null,
+    extra: innerConfig.request ? /*#__PURE__*/_jsx(DialogSelfButton, {
+      request: innerConfig.request,
+      onCancel: close,
+      formRef: formRef,
+      onRequestBefore: innerConfig.onRequestBefore
+    }) : /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: buttonRef
+    }),
+    footer: /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: footerRef
+    }),
     children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
+        buttonRef: buttonRef,
+        buttonType: 'drawer',
         closeDialog: close,
+        drawerFooterRef: footerRef,
         formInitialValues: ((_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues) || {}
       },
       children: config.form ? /*#__PURE__*/_jsx(DialogForm, {
+        ref: formRef,
         formProps: config.form,
         styles: _objectSpread({
           padding: 24

package/es/dialog/HookModal.d.ts

@@ -1,5 +1,9 @@
 /// <reference types="react" />
+import { DialogFormRef } from './form';
 import { CcsDialogModal, CcsDialogModalProps } from './hook';
+export declare const DialogSelfButton: ({ formRef, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "request" | "onCancel" | "onRequestBefore"> & {
+    formRef: React.RefObject<DialogFormRef>;
+}) => import("react/jsx-runtime").JSX.Element;
 export interface HookModalProps {
     afterClose: () => void;
     config: CcsDialogModalProps;

package/es/dialog/HookModal.js

@@ -10,13 +10,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-import { Modal } from 'antd';
+import { Button, Modal } from 'antd';
 import classNames from 'classnames';
 import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import Draggable from 'react-draggable';
+import { CcsDialog, CcsUtils } from '..';
+import { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var DragModal = function DragModal(_ref) {
   var modal = _ref.modal,
     dragState = _ref.dragState,
@@ -54,11 +58,56 @@ var DragModal = function DragModal(_ref) {
     })
   });
 };
-var HookModal = function HookModal(_ref2, ref) {
+export var DialogSelfButton = function DialogSelfButton(_ref2) {
+  var formRef = _ref2.formRef,
+    request = _ref2.request,
+    onCancel = _ref2.onCancel,
+    onRequestBefore = _ref2.onRequestBefore;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var onOk = function onOk() {
+    var _formRef$current;
+    if (!((_formRef$current = formRef.current) !== null && _formRef$current !== void 0 && _formRef$current.formInstance)) {
+      CcsUtils.showWarning(false, "\u672A\u5B9A\u4E49form");
+      return;
+    }
+    formRef.current.formInstance.validateFields().then(function (values) {
+      setLoading(true);
+      var params = onRequestBefore ? onRequestBefore(values) : values;
+      request(params).then(function (d) {
+        setLoading(false);
+        if (d !== null && d !== void 0 && d.success && onCancel) {
+          onCancel(params);
+        }
+        CcsDialog.easyMessage(d);
+      }).catch(function (err) {
+        setLoading(false);
+        console.log('e', err);
+      });
+    });
+
+    // request
+  };
+
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Button, {
+      onClick: onCancel,
+      children: "\u53D6\u6D88"
+    }), /*#__PURE__*/_jsx(Button, {
+      type: "primary",
+      onClick: onOk,
+      loading: loading,
+      children: "\u786E\u5B9A"
+    })]
+  });
+};
+var HookModal = function HookModal(_ref3, ref) {
   var _config$form;
-  var hookAfterClose = _ref2.afterClose,
-    config = _ref2.config;
-  var _useState = useState(function () {
+  var hookAfterClose = _ref3.afterClose,
+    config = _ref3.config;
+  var _useState3 = useState(function () {
       if (config.open === undefined) {
         return _objectSpread(_objectSpread({}, config), {}, {
           open: true
@@ -66,10 +115,10 @@ var HookModal = function HookModal(_ref2, ref) {
       }
       return config;
     }),
-    _useState2 = _slicedToArray(_useState, 2),
-    innerConfig = _useState2[0],
-    setInnerConfig = _useState2[1];
-  var _useState3 = useState({
+    _useState4 = _slicedToArray(_useState3, 2),
+    innerConfig = _useState4[0],
+    setInnerConfig = _useState4[1];
+  var _useState5 = useState({
       disabled: true,
       bounds: {
         left: 0,
@@ -78,13 +127,11 @@ var HookModal = function HookModal(_ref2, ref) {
         right: 0
       }
     }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    dragState = _useState4[0],
-    setDragState = _useState4[1];
-  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    hasButtons = _useState6[0],
-    setHasButtons = _useState6[1];
+    dragState = _useState6[0],
+    setDragState = _useState6[1];
+  var buttonRef = useRef(null);
+  var formRef = useRef(null);
   var afterClose = function afterClose() {
     var _innerConfig$afterClo;
     if (config.destroyOnClose !== false) hookAfterClose();
@@ -124,19 +171,36 @@ 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), {}, {
-    styles: styles,
+    styles: _objectSpread({
+      footer: !innerConfig.request ? {
+        padding: 0
+      } : undefined
+    }, styles),
     className: classNames('ccs-dialog-modal', innerConfig.className),
-    footer: null,
-    title: config.isDrag ? /*#__PURE__*/_jsx("div", {
+    footer: innerConfig.request ? /*#__PURE__*/_jsx("div", {
+      style: {
+        padding: '8px 16px'
+      },
+      children: /*#__PURE__*/_jsx(DialogSelfButton, {
+        request: innerConfig.request,
+        onCancel: close,
+        formRef: formRef,
+        onRequestBefore: innerConfig.onRequestBefore
+      })
+    }) : /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: buttonRef
+    }),
+    onOk: function onOk() {
+      // 传入request，onOk触发请求
+      if (innerConfig.request) {
+        console.log(111);
+      }
+    },
+    title: /*#__PURE__*/_jsx("div", {
       style: {
         width: '100%',
         cursor: 'move'
@@ -158,23 +222,23 @@ var HookModal = function HookModal(_ref2, ref) {
         });
       },
       children: config.title
-    }) : config.title,
-    modalRender: config.isDrag ? function (modal) {
+    }),
+    modalRender: function modalRender(modal) {
       return /*#__PURE__*/_jsx(DragModal, {
         modal: modal,
         dragState: dragState,
         onDragState: setDragState
       });
-    } : undefined,
+    },
     children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
+        buttonRef: buttonRef,
+        buttonType: 'modal',
         closeDialog: close,
-        onHasModalButtons: function onHasModalButtons() {
-          return setHasButtons(true);
-        },
         formInitialValues: ((_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues) || {}
       },
       children: config.form ? /*#__PURE__*/_jsx(DialogForm, {
+        ref: formRef,
         formProps: config.form,
         children: config.content
       }) : config.content

package/es/dialog/button.d.ts

@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 interface DialogButtonsProps {
     okText?: string;
     cancelText?: string;
@@ -8,5 +8,9 @@ interface DialogButtonsProps {
     hideCancel?: boolean;
     onOk?: (values?: any) => void;
 }
-export default function CcsDialogButtons({ okText, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps): import("react/jsx-runtime").JSX.Element | null;
+export type DialogButtonRef = {
+    onSetButtons: (e: React.ReactElement) => void;
+};
+export declare const DialogButtonHolder: React.MemoExoticComponent<React.ForwardRefExoticComponent<React.RefAttributes<DialogButtonRef>>>;
+export default function CcsDialogButtons({ okText, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps): null;
 export {};

package/es/dialog/button.js

@@ -4,13 +4,35 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-import { CcsAuth } from "./..";
+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); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { CcsAuth, CcsUtils } from "./..";
 import { Button, Form } from 'antd';
-import { useEffect } from 'react';
+import React, { useEffect, useImperativeHandle, useState } from 'react';
 import CcsDialog from '.';
-import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+export var DialogButtonHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (_props, ref) {
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    buttons = _useState2[0],
+    setButtons = _useState2[1];
+  useImperativeHandle(ref, function () {
+    return {
+      onSetButtons: function onSetButtons(e) {
+        return setButtons(e);
+      }
+    };
+  });
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: buttons
+  });
+}));
 export default function CcsDialogButtons(_ref) {
   var okText = _ref.okText,
     okAuth = _ref.okAuth,
@@ -21,12 +43,10 @@ export default function CcsDialogButtons(_ref) {
     onOk = _ref.onOk;
   var _CcsDialog$useInstanc = CcsDialog.useInstance(),
     closeDialog = _CcsDialog$useInstanc.closeDialog,
-    onHasModalButtons = _CcsDialog$useInstanc.onHasModalButtons,
-    formInitialValues = _CcsDialog$useInstanc.formInitialValues;
+    buttonRef = _CcsDialog$useInstanc.buttonRef,
+    formInitialValues = _CcsDialog$useInstanc.formInitialValues,
+    buttonType = _CcsDialog$useInstanc.buttonType;
   var form = Form.useFormInstance();
-  useEffect(function () {
-    if (onHasModalButtons) onHasModalButtons();
-  }, []);
   var onOkClick = function onOkClick() {
     if (!onOk) return;
 
@@ -39,9 +59,10 @@ export default function CcsDialogButtons(_ref) {
     }
     onOk();
   };
-  return onOk || children ? /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/_jsxs("div", {
-      className: "ccs-dialog-buttons",
+  useEffect(function () {
+    var _buttonRef$current;
+    if (!onOk && !children) return;
+    var btns = /*#__PURE__*/_jsxs(_Fragment, {
       children: [children, onOk && /*#__PURE__*/_jsxs(_Fragment, {
         children: [!hideCancel && /*#__PURE__*/_jsx(Button, {
           onClick: closeDialog,
@@ -54,6 +75,17 @@ export default function CcsDialogButtons(_ref) {
           children: okText || '确定'
         })]
       })]
-    })
-  }) : null;
+    });
+    if (buttonType === 'modal') {
+      btns = /*#__PURE__*/_jsx("div", {
+        style: {
+          padding: '8px 16px'
+        },
+        children: btns
+      });
+    }
+    CcsUtils.showWarning(!!buttonRef.current, "\u68C0\u6D4B\u5230".concat(buttonType === 'modal' ? 'openModal' : 'openDrawer', "\u4F20\u5165request\u53C2\u6570\uFF0CCcsDialog.Buttons\u5C06\u4E0D\u80FD\u751F\u6548\u3002"));
+    (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.onSetButtons(btns);
+  });
+  return null;
 }

package/es/dialog/context.d.ts

@@ -1,11 +1,17 @@
 import { Store } from 'antd/es/form/interface';
-import React from 'react';
+import React, { RefObject } from 'react';
+import { DialogButtonRef } from './button';
 export interface DialogContextType<T = Store> {
+    /** 按钮类型 */
+    buttonType: 'modal' | 'drawer';
     /** 表单初始值 */
     formInitialValues: T;
+    /** 按钮 ref */
+    buttonRef: RefObject<DialogButtonRef>;
+    /** drawer footer ref */
+    drawerFooterRef?: RefObject<DialogButtonRef>;
     /** 关闭弹框，可以设置返回值 */
     closeDialog: (e?: any) => void;
-    onHasModalButtons?: () => void;
 }
 declare const DialogContentContext: React.Context<DialogContextType<any>>;
 declare const useDialogContext: <T = Store>() => DialogContextType<T>;

package/es/dialog/drawer-footer.d.ts

@@ -0,0 +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 CcsDrawerFooter({ okText, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps): null;
+export {};

package/es/dialog/drawer-footer.js

@@ -0,0 +1,62 @@
+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 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); }
+import { CcsAuth } from "./..";
+import { Button, Form } from 'antd';
+import { useEffect } from 'react';
+import CcsDialog from '.';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export default function CcsDrawerFooter(_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$useInstanc = CcsDialog.useInstance(),
+    closeDialog = _CcsDialog$useInstanc.closeDialog,
+    drawerFooterRef = _CcsDialog$useInstanc.drawerFooterRef,
+    formInitialValues = _CcsDialog$useInstanc.formInitialValues;
+  var form = Form.useFormInstance();
+  var onOkClick = function onOkClick() {
+    if (!onOk) return;
+
+    // form返回表单值和所有初始值
+    if (form) {
+      form.validateFields().then(function (values) {
+        onOk(_objectSpread(_objectSpread({}, formInitialValues), values));
+      });
+      return;
+    }
+    onOk();
+  };
+  useEffect(function () {
+    var _drawerFooterRef$curr;
+    if (!onOk && !children) return;
+    var btns = /*#__PURE__*/_jsxs("div", {
+      style: {
+        padding: '8px 16px'
+      },
+      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 || '确定'
+        })]
+      })]
+    });
+    drawerFooterRef === null || drawerFooterRef === void 0 ? void 0 : (_drawerFooterRef$curr = drawerFooterRef.current) === null || _drawerFooterRef$curr === void 0 ? void 0 : _drawerFooterRef$curr.onSetButtons(btns);
+  });
+  return null;
+}

package/es/dialog/form.d.ts

@@ -1,13 +1,16 @@
-import { FormProps } from 'antd';
-import { CSSProperties, ReactNode } from 'react';
+import { FormInstance, FormProps } from 'antd';
+import React, { CSSProperties, ReactNode } from 'react';
 interface PropsType {
     children: ReactNode;
     formProps: FormProps;
     styles?: CSSProperties;
 }
+export interface DialogFormRef {
+    formInstance: FormInstance;
+}
 /**
  * 添加form实例
  * @returns
  */
-export default function DialogForm({ children, styles, formProps: { labelCol, wrapperCol, ...restProps }, }: PropsType): import("react/jsx-runtime").JSX.Element;
-export {};
+declare const DialogForm: React.ForwardRefExoticComponent<PropsType & React.RefAttributes<DialogFormRef>>;
+export default DialogForm;

package/es/dialog/form.js

@@ -14,12 +14,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 { Form } from 'antd';
+import React, { useImperativeHandle } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * 添加form实例
  * @returns
  */
-export default function DialogForm(_ref) {
+var DialogForm = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var children = _ref.children,
     styles = _ref.styles,
     _ref$formProps = _ref.formProps,
@@ -29,6 +30,11 @@ export default function DialogForm(_ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  useImperativeHandle(ref, function () {
+    return {
+      formInstance: form
+    };
+  });
   return /*#__PURE__*/_jsx(Form, _objectSpread(_objectSpread({
     form: form,
     labelCol: labelCol || {
@@ -45,4 +51,5 @@ export default function DialogForm(_ref) {
     }, styles), restProps.style),
     children: children
   }));
-}
+});
+export default DialogForm;

package/es/dialog/hook.d.ts

@@ -1,5 +1,6 @@
 import { DrawerProps, FormProps, ModalFuncProps } from 'antd';
 import React, { ReactNode } from 'react';
+import CCS from '..';
 export interface CcsDialogModal {
     destroy: () => void;
     update: (config: ModalFuncProps) => void;
@@ -17,10 +18,12 @@ type DrawerFunc = (props: DrawerProps) => {
     update: (configUpdate: DrawerProps) => void;
 };
 export type CcsDialogModalProps = ModalFuncProps & {
-    /** 可拖拽 */
-    isDrag?: boolean;
     /** antd form */
     form?: FormProps;
+    /** 表单接口请求 */
+    request?: (values: any) => Promise<CCS.HttpResult>;
+    /** request执行前参数处理 */
+    onRequestBefore?: (values: any) => any;
     /** 关闭后销毁组件，默认true */
     destroyOnClose?: boolean;
     /** 通过closeDialog方法关闭dialog */
@@ -33,6 +36,10 @@ export type CcsDialogDrawerProps = Omit<DrawerProps, 'extra'> & {
     form?: FormProps;
     /** 抽屉内容 */
     content?: ReactNode;
+    /** 表单接口请求 */
+    request?: (values: any) => Promise<CCS.HttpResult>;
+    /** request执行前参数处理 */
+    onRequestBefore?: (values: any) => any;
     /** 通过closeDialog方法关闭dialog */
     afterCloseByOk?: (e: any) => void;
     /** 通过点击关闭按钮或取消按钮关闭 */

package/es/dialog/hook.js

@@ -10,6 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /* eslint-disable @typescript-eslint/ban-types */
 
+import _debounce from 'lodash/debounce';
 import React from 'react';
 import HookDrawer from "./HookDrawer";
 import HookModal from "./HookModal";
@@ -145,14 +146,25 @@ export default function useCcsDialog() {
     };
     return instance;
   }, []);
+
+  //  const resizeFn = _debounce((width: number) => {
+  //    if (tabRef.current) tabRef.current.style.maxWidth = `${width}px`;
+  //  }, 200);
+
   var fns = React.useMemo(function () {
     return {
-      openModal: function openModal(props) {
+      openModal: _debounce(function (props) {
         return getModalFunc(props);
-      },
-      openDrawer: function openDrawer(props) {
+      }, 500, {
+        leading: true,
+        trailing: false
+      }),
+      openDrawer: _debounce(function (props) {
         return getDrawerFunc(props);
-      }
+      }, 500, {
+        leading: true,
+        trailing: false
+      })
     };
   }, []);
   // return [fns, <ElementsHolder key="modal-holder" ref={holderRef} />] as const;

package/es/dialog/index.d.ts

@@ -1,11 +1,18 @@
+import ThemeDialog from '../theme-dialog';
 import CcsDialogButtons from './button';
 import { useDialogContext } from './context';
+import CcsDrawerFooter from './drawer-footer';
 import useCcsDialog from './hook';
 import './index.less';
 interface DialogInterface {
-    Buttons: typeof CcsDialogButtons;
+    /** 获取openModal,openDrawer方法 */
     useDialog: typeof useCcsDialog;
+    /** dialog 实例 */
     useInstance: typeof useDialogContext;
+    /** dialog 按钮 */
+    Buttons: typeof CcsDialogButtons;
+    /** drawer footer */
+    DrawerFooter: typeof CcsDrawerFooter;
 }
-declare const CcsDialog: DialogInterface;
+declare const CcsDialog: typeof ThemeDialog & DialogInterface;
 export default CcsDialog;

package/es/dialog/index.js

@@ -1,9 +1,12 @@
+import ThemeDialog from "../theme-dialog";
 import CcsDialogButtons from "./button";
 import { useDialogContext } from "./context";
+import CcsDrawerFooter from "./drawer-footer";
 import useCcsDialog from "./hook";
 import "./index.less";
-var CcsDialog = {};
+var CcsDialog = ThemeDialog;
 CcsDialog.Buttons = CcsDialogButtons;
 CcsDialog.useDialog = useCcsDialog;
 CcsDialog.useInstance = useDialogContext;
+CcsDialog.DrawerFooter = CcsDrawerFooter;
 export default CcsDialog;