@ccs-ui/rc-pro 1.1.1-rc15 → 1.1.1-rc17

package/es/dialog/HookDrawer.js

@@ -12,7 +12,8 @@ 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 { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -31,6 +32,8 @@ 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 afterClose = function afterClose() {
     hookAfterClose();
   };
@@ -81,6 +84,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,9 +94,6 @@ 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'
@@ -99,10 +102,17 @@ var HookDrawer = function HookDrawer(_ref, ref) {
       boxShadow: 'none'
     } : {}), innerConfig.contentWrapperStyle),
     getContainer: isCrInProp ? innerConfig.getContainer : onGetContainer,
-    extra: null,
+    extra: /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: buttonRef
+    }),
+    footer: /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: footerRef
+    }),
     children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
+        buttonRef: buttonRef,
         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, {

package/es/dialog/HookModal.js

@@ -14,6 +14,7 @@ import { Modal } from 'antd';
 import classNames from 'classnames';
 import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import Draggable from 'react-draggable';
+import { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -81,10 +82,7 @@ var HookModal = function HookModal(_ref2, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     dragState = _useState4[0],
     setDragState = _useState4[1];
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    hasButtons = _useState6[0],
-    setHasButtons = _useState6[1];
+  var buttonRef = useRef(null);
   var afterClose = function afterClose() {
     var _innerConfig$afterClo;
     if (config.destroyOnClose !== false) hookAfterClose();
@@ -124,18 +122,15 @@ 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,
     className: classNames('ccs-dialog-modal', innerConfig.className),
-    footer: null,
+    footer: /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: buttonRef
+    }),
     title: /*#__PURE__*/_jsx("div", {
       style: {
         width: '100%',
@@ -168,10 +163,8 @@ var HookModal = function HookModal(_ref2, ref) {
     },
     children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
+        buttonRef: buttonRef,
         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, {

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); }
+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 } 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,9 @@ export default function CcsDialogButtons(_ref) {
     onOk = _ref.onOk;
   var _CcsDialog$useInstanc = CcsDialog.useInstance(),
     closeDialog = _CcsDialog$useInstanc.closeDialog,
-    onHasModalButtons = _CcsDialog$useInstanc.onHasModalButtons,
+    buttonRef = _CcsDialog$useInstanc.buttonRef,
     formInitialValues = _CcsDialog$useInstanc.formInitialValues;
   var form = Form.useFormInstance();
-  useEffect(function () {
-    if (onHasModalButtons) onHasModalButtons();
-  }, []);
   var onOkClick = function onOkClick() {
     if (!onOk) return;
 
@@ -39,9 +58,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 +74,8 @@ export default function CcsDialogButtons(_ref) {
           children: okText || '确定'
         })]
       })]
-    })
-  }) : null;
+    });
+    (_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,15 @@
 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> {
     /** 表单初始值 */
     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,59 @@
+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(_Fragment, {
+      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/index.d.ts

@@ -1,11 +1,17 @@
 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;
 export default CcsDialog;

package/es/dialog/index.js

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

package/es/dialog/index.less

@@ -1,25 +1,10 @@
-.ccs-dialog-buttons {
-  position: absolute;
-  bottom: 0;
-  right: 0;
-  z-index: 1;
-
+.ant-drawer-extra {
   .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
     margin-bottom: 0;
-    margin-left: 8px;
+    margin-inline-start: 8px;
   }
 }
 
-.ccs-dialog-drawer {
-  .ccs-dialog-buttons {
-    right: 16px;
-    top: 0;
-    bottom: auto;
-    height: 57px;
-    line-height: 56px;
-  }
-
-  .ant-drawer-header {
-    padding: 16px;
-  }
+.ant-drawer-footer {
+  overflow: hidden;
 }

package/es/pro-table/index.less

@@ -52,11 +52,6 @@
       padding: 0;
     }
 
-    .ant-form-inline {
-      .ant-form-item:last-child {
-        margin-inline-end: 0;
-      }
-    }
     label {
       white-space: nowrap;
     }
@@ -74,6 +69,10 @@
       align-items: flex-end;
       justify-content: end;
       overflow: hidden;
+
+      .ant-form-item:last-child {
+        margin-inline-end: 0;
+      }
     }
   }
 

package/package.json

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