@ccs-ui/rc-pro 1.1.1-rc30 → 1.1.1-rc32

package/es/ccs.d.ts

@@ -204,4 +204,9 @@ type GlobalConfig = {
 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, GlobalConfig, HttpListResult, HttpPageResult, AuthButtonItem, MenuTreeNodeData, UserDetail, RouteHistory, TableData, TableFormItems, TableColumns, TableInstance, TableInstanceRef, TriggerChildrenProps, };
+type PageQueryType<T = Record<string, any>> = {
+    pageNo: number;
+    pageSize: number;
+    query: T;
+};
+export type { PageType, RecordType, MenuTreeNode, PageQuery, ListQuery, HttpResult, GlobalConfig, HttpListResult, HttpPageResult, AuthButtonItem, MenuTreeNodeData, UserDetail, RouteHistory, TableData, PageQueryType, TableFormItems, TableColumns, TableInstance, TableInstanceRef, TriggerChildrenProps, };

package/es/dialog/HookDrawer.js

@@ -108,6 +108,7 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     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) || {}

package/es/dialog/HookModal.js

@@ -164,6 +164,7 @@ var HookModal = function HookModal(_ref2, ref) {
     children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
         buttonRef: buttonRef,
+        buttonType: 'modal',
         closeDialog: close,
         formInitialValues: ((_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues) || {}
       },

package/es/dialog/button.js

@@ -29,7 +29,7 @@ export var DialogButtonHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forw
       }
     };
   });
-  return buttons && /*#__PURE__*/_jsx(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
     children: buttons
   });
 }));
@@ -44,7 +44,8 @@ export default function CcsDialogButtons(_ref) {
   var _CcsDialog$useInstanc = CcsDialog.useInstance(),
     closeDialog = _CcsDialog$useInstanc.closeDialog,
     buttonRef = _CcsDialog$useInstanc.buttonRef,
-    formInitialValues = _CcsDialog$useInstanc.formInitialValues;
+    formInitialValues = _CcsDialog$useInstanc.formInitialValues,
+    buttonType = _CcsDialog$useInstanc.buttonType;
   var form = Form.useFormInstance();
   var onOkClick = function onOkClick() {
     if (!onOk) return;
@@ -75,6 +76,14 @@ export default function CcsDialogButtons(_ref) {
         })]
       })]
     });
+    if (buttonType === 'modal') {
+      btns = /*#__PURE__*/_jsx("div", {
+        style: {
+          padding: '8px 16px'
+        },
+        children: btns
+      });
+    }
     (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.onSetButtons(btns);
   });
   return null;

package/es/dialog/context.d.ts

@@ -2,6 +2,8 @@ import { Store } from 'antd/es/form/interface';
 import React, { RefObject } from 'react';
 import { DialogButtonRef } from './button';
 export interface DialogContextType<T = Store> {
+    /** 按钮类型 */
+    buttonType: 'modal' | 'drawer';
     /** 表单初始值 */
     formInitialValues: T;
     /** 按钮 ref */

package/es/dialog/drawer-footer.js

@@ -41,8 +41,7 @@ export default function CcsDrawerFooter(_ref) {
     if (!onOk && !children) return;
     var btns = /*#__PURE__*/_jsxs("div", {
       style: {
-        padding: '8px 16px',
-        borderTop: '1px solid rgba(5, 5, 5, 0.06)'
+        padding: '8px 16px'
       },
       children: [children, onOk && /*#__PURE__*/_jsxs(_Fragment, {
         children: [!hideCancel && /*#__PURE__*/_jsx(Button, {

package/es/dialog/index.less

@@ -12,6 +12,11 @@
 .ccs-dialog-drawer {
   .ant-drawer-footer {
     padding: 0;
-    border-top: 0;
+  }
+}
+
+.ccs-dialog-modal {
+  .ant-modal-footer {
+    padding: 0;
   }
 }

package/package.json

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