@ccs-ui/rc-pro 1.1.6 → 1.1.7

package/es/dialog/HookDrawer.js

@@ -19,7 +19,7 @@ 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, _config$form2, _innerConfig$styles;
+  var _innerConfig$styles;
   var hookAfterClose = _ref.afterClose,
     config = _ref.config;
   var _useState = useState(function () {
@@ -39,6 +39,17 @@ var HookDrawer = function HookDrawer(_ref, ref) {
   var afterClose = function afterClose() {
     hookAfterClose();
   };
+  var auth = innerConfig.auth,
+    form = innerConfig.form,
+    content = innerConfig.content,
+    className = innerConfig.className,
+    rootStyle = innerConfig.rootStyle,
+    getContainer = innerConfig.getContainer,
+    request = innerConfig.request,
+    onAfterOk = innerConfig.onAfterOk,
+    onAfterCancel = innerConfig.onAfterCancel,
+    onClose = innerConfig.onClose,
+    onRequestBefore = innerConfig.onRequestBefore;
   var close = function close(e) {
     setInnerConfig(function (c) {
       return _objectSpread(_objectSpread({}, c), {}, {
@@ -47,19 +58,19 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     });
     if ((e === null || e === void 0 ? void 0 : e.type) === 'click') {
       // 通过点击关闭按钮或取消按钮关闭
-      if (innerConfig.afterCloseByCancel) {
-        innerConfig.afterCloseByCancel(e);
+      if (onAfterCancel) {
+        onAfterCancel(e);
       }
     } else {
       // 通过调用closeDialog关闭
-      if (innerConfig.afterCloseByOk) {
-        innerConfig.afterCloseByOk(e);
+      if (onAfterOk) {
+        onAfterOk(e);
       }
     }
 
     // 入参有onClose
-    if (innerConfig.onClose) {
-      innerConfig.onClose(e);
+    if (onClose) {
+      onClose(e);
     }
   };
   useImperativeHandle(ref, function () {
@@ -81,7 +92,7 @@ var HookDrawer = function HookDrawer(_ref, ref) {
   };
   var isCrInProp = ('getContainer' in innerConfig);
   var styles = innerConfig.styles || {};
-  if (config.form) {
+  if (form) {
     styles.body = {
       padding: 0
     };
@@ -95,19 +106,19 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     }
   }, innerConfig), {}, {
     onClose: close,
-    className: classNames('ccs-dialog-drawer', innerConfig.className),
+    className: classNames('ccs-dialog-drawer', className),
     styles: styles,
     rootStyle: _objectSpread(_objectSpread({}, !isCrInProp ? {
       position: 'absolute'
-    } : {}), innerConfig.rootStyle),
-    getContainer: isCrInProp ? innerConfig.getContainer : onGetContainer,
-    extra: config.request ? /*#__PURE__*/_jsx(DialogSelfButton, {
-      request: config.request,
+    } : {}), rootStyle),
+    getContainer: isCrInProp ? getContainer : onGetContainer,
+    extra: request ? /*#__PURE__*/_jsx(DialogSelfButton, {
+      request: request,
       onCancel: close,
       formRef: formRef,
-      onRequestBefore: config.onRequestBefore,
-      auth: config.auth,
-      formInitialValues: (_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues
+      onRequestBefore: onRequestBefore,
+      auth: auth,
+      formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
     }) : /*#__PURE__*/_jsx(DialogButtonHolder, {
       ref: buttonRef
     }),
@@ -121,16 +132,16 @@ var HookDrawer = function HookDrawer(_ref, ref) {
         buttonType: 'drawer',
         closeDialog: close,
         drawerFooterRef: footerRef,
-        formInitialValues: ((_config$form2 = config.form) === null || _config$form2 === void 0 ? void 0 : _config$form2.initialValues) || {}
+        formInitialValues: (form === null || form === void 0 ? void 0 : form.initialValues) || {}
       },
-      children: config.form ? /*#__PURE__*/_jsx(DialogForm, {
+      children: form ? /*#__PURE__*/_jsx(DialogForm, {
         ref: formRef,
-        formProps: config.form,
+        formProps: form,
         styles: _objectSpread({
           padding: 24
         }, (_innerConfig$styles = innerConfig.styles) === null || _innerConfig$styles === void 0 ? void 0 : _innerConfig$styles.body),
-        children: config.content
-      }) : config.content
+        children: content
+      }) : content
     })
   }));
 };

package/es/dialog/HookModal.d.ts

@@ -2,7 +2,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModal, CcsDialogModalProps } from './hook';
-export declare const DialogSelfButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onCancel" | "onRequestBefore"> & {
+export declare const DialogSelfButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onRequestBefore" | "onCancel"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/dialog/HookModal.js

@@ -105,7 +105,6 @@ export var DialogSelfButton = function DialogSelfButton(_ref2) {
   });
 };
 var HookModal = function HookModal(_ref3, ref) {
-  var _config$form, _config$form2;
   var hookAfterClose = _ref3.afterClose,
     config = _ref3.config;
   var _useState3 = useState(function () {
@@ -138,6 +137,18 @@ var HookModal = function HookModal(_ref3, ref) {
     if (config.destroyOnClose !== false) hookAfterClose();
     (_innerConfig$afterClo = innerConfig.afterClose) === null || _innerConfig$afterClo === void 0 ? void 0 : _innerConfig$afterClo.call(innerConfig);
   };
+  var auth = innerConfig.auth,
+    form = innerConfig.form,
+    title = innerConfig.title,
+    content = innerConfig.content,
+    _innerConfig$styles = innerConfig.styles,
+    styles = _innerConfig$styles === void 0 ? {} : _innerConfig$styles,
+    className = innerConfig.className,
+    request = innerConfig.request,
+    onCancel = innerConfig.onCancel,
+    onRequestBefore = innerConfig.onRequestBefore,
+    onAfterOk = innerConfig.onAfterOk,
+    onAfterCancel = innerConfig.onAfterCancel;
   var close = function close(e) {
     setInnerConfig(function (c) {
       return _objectSpread(_objectSpread({}, c), {}, {
@@ -146,19 +157,19 @@ var HookModal = function HookModal(_ref3, ref) {
     });
     if ((e === null || e === void 0 ? void 0 : e.type) === 'click') {
       // 通过点击关闭按钮或取消按钮关闭
-      if (innerConfig.afterCloseByCancel) {
-        innerConfig.afterCloseByCancel(e);
+      if (onAfterCancel) {
+        onAfterCancel(e);
       }
     } else {
       // 通过调用closeDialog关闭
-      if (innerConfig.afterCloseByOk) {
-        innerConfig.afterCloseByOk(e);
+      if (onAfterOk) {
+        onAfterOk(e);
       }
     }
 
     // 入参有onClose
-    if (innerConfig.onCancel) {
-      innerConfig.onCancel(e);
+    if (onCancel) {
+      onCancel(e);
     }
   };
   useImperativeHandle(ref, function () {
@@ -171,28 +182,27 @@ var HookModal = function HookModal(_ref3, ref) {
       }
     };
   });
-  var styles = innerConfig.styles || {};
   return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
     onCancel: close,
     afterClose: afterClose
   }, innerConfig), {}, {
     styles: _objectSpread({
-      footer: !innerConfig.request ? {
+      footer: !request ? {
         padding: 0
       } : undefined
     }, styles),
-    className: classNames('ccs-dialog-modal', innerConfig.className),
-    footer: innerConfig.request ? /*#__PURE__*/_jsx("div", {
+    className: classNames('ccs-dialog-modal', className),
+    footer: request ? /*#__PURE__*/_jsx("div", {
       style: {
         padding: '8px 16px'
       },
       children: /*#__PURE__*/_jsx(DialogSelfButton, {
-        auth: config.auth,
-        request: config.request,
+        auth: auth,
+        request: request,
         onCancel: close,
         formRef: formRef,
-        onRequestBefore: config.onRequestBefore,
-        formInitialValues: (_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues
+        onRequestBefore: onRequestBefore,
+        formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
       })
     }) : /*#__PURE__*/_jsx(DialogButtonHolder, {
       ref: buttonRef
@@ -218,7 +228,7 @@ var HookModal = function HookModal(_ref3, ref) {
           });
         });
       },
-      children: config.title
+      children: title
     }),
     modalRender: function modalRender(modal) {
       return /*#__PURE__*/_jsx(DragModal, {
@@ -232,14 +242,14 @@ var HookModal = function HookModal(_ref3, ref) {
         buttonRef: buttonRef,
         buttonType: 'modal',
         Buttons: CcsDialogButtons,
-        formInitialValues: ((_config$form2 = config.form) === null || _config$form2 === void 0 ? void 0 : _config$form2.initialValues) || {},
+        formInitialValues: (form === null || form === void 0 ? void 0 : form.initialValues) || {},
         closeDialog: close
       },
-      children: config.form ? /*#__PURE__*/_jsx(DialogForm, {
+      children: form ? /*#__PURE__*/_jsx(DialogForm, {
         ref: formRef,
-        formProps: config.form,
-        children: config.content
-      }) : config.content
+        formProps: form,
+        children: content
+      }) : content
     })
   }));
 };

package/es/dialog/hook.d.ts

@@ -29,9 +29,9 @@ export type CcsDialogModalProps = ModalFuncProps & {
     /** 关闭后销毁组件，默认true */
     destroyOnClose?: boolean;
     /** 通过closeDialog方法关闭dialog */
-    afterCloseByOk?: (e: any) => void;
+    onAfterOk?: (e: any) => void;
     /** 通过点击关闭按钮或取消按钮关闭 */
-    afterCloseByCancel?: (e: any) => void;
+    onAfterCancel?: (e: any) => void;
 };
 export type CcsDialogDrawerProps = Omit<DrawerProps, 'extra'> & {
     /** antd form */
@@ -45,9 +45,9 @@ export type CcsDialogDrawerProps = Omit<DrawerProps, 'extra'> & {
     /** request执行前参数处理 */
     onRequestBefore?: (values: any) => any;
     /** 通过closeDialog方法关闭dialog */
-    afterCloseByOk?: (e: any) => void;
+    onAfterOk?: (e: any) => void;
     /** 通过点击关闭按钮或取消按钮关闭 */
-    afterCloseByCancel?: (e: any) => void;
+    onAfterCancel?: (e: any) => void;
 };
 export type ModalDialog = (...args: Parameters<ModalFunc>) => ReturnType<ModalFunc>;
 export type DrawerDialog = (...args: Parameters<ModalFunc>) => ReturnType<DrawerFunc>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "A react pro components",
   "license": "MIT",
   "module": "es/index.js",