@ccs-ui/rc-pro 1.1.25-beta-27 → 1.2.0-beta-2

package/es/ccs.d.ts

@@ -83,6 +83,8 @@ type PageQuery<T = any> = {
     limit?: QueryLimit;
     /** 排序字段,一般前端不传，由后端指定 */
     orderProps?: OrderProp[];
+    /** 过滤字段 */
+    filters?: Record<string, any[]>;
     /** 页码 */
     pageNo?: number;
     /** 页长 */

package/es/context/index.d.ts

@@ -1,7 +1,7 @@
 import { TabPaneProps } from 'antd';
 import { Store } from 'antd/es/form/interface';
-import { Location } from 'history';
 import React from 'react';
+import { Location } from 'react-router';
 import CCS from '..';
 type CcsTabsChangeProps = {
     /** 当前激活tab面板的key */
@@ -55,5 +55,5 @@ declare const GlobalContext: React.Context<GlobalContextType>;
 declare const DrawerAndModalContext: React.Context<FnContextType<any>>;
 declare const PageContext: React.Context<PageContextType>;
 declare const TabsContext: React.Context<CcsTabsContextType>;
-export type { FnContextType, CcsTabsContextType, CcsTabsChangeProps, GlobalContextPropsType, };
-export { TabsContext, PageContext, GlobalContext, DrawerAndModalContext };
+export { DrawerAndModalContext, GlobalContext, PageContext, TabsContext };
+export type { CcsTabsChangeProps, CcsTabsContextType, FnContextType, GlobalContextPropsType, };

package/es/context/index.js

@@ -3,4 +3,4 @@ var GlobalContext = /*#__PURE__*/createContext({});
 var DrawerAndModalContext = /*#__PURE__*/createContext({});
 var PageContext = /*#__PURE__*/createContext({});
 var TabsContext = /*#__PURE__*/React.createContext({});
-export { TabsContext, PageContext, GlobalContext, DrawerAndModalContext };
+export { DrawerAndModalContext, GlobalContext, PageContext, TabsContext };

package/es/dialog/DialogRequestButton.d.ts

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

package/es/dialog/DialogRequestButton.js

@@ -19,6 +19,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 var DialogRequestButton = function DialogRequestButton(_ref) {
   var auth = _ref.auth,
     formRef = _ref.formRef,
+    extraBtn = _ref.extraBtn,
     _ref$formInitialValue = _ref.formInitialValues,
     formInitialValues = _ref$formInitialValue === void 0 ? {} : _ref$formInitialValue,
     request = _ref.request,
@@ -50,7 +51,7 @@ var DialogRequestButton = function DialogRequestButton(_ref) {
     });
   };
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(Button, {
+    children: [extraBtn, /*#__PURE__*/_jsx(Button, {
       onClick: onCancel,
       children: "\u53D6\u6D88"
     }), /*#__PURE__*/_jsx(CcsAuth.Button, {

package/es/dialog/DialogSelfOkButton.d.ts

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

package/es/dialog/DialogSelfOkButton.js

@@ -12,6 +12,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 var DialogSelfOkButton = function DialogSelfOkButton(_ref) {
   var auth = _ref.auth,
     formRef = _ref.formRef,
+    extraBtn = _ref.extraBtn,
     _ref$formInitialValue = _ref.formInitialValues,
     formInitialValues = _ref$formInitialValue === void 0 ? {} : _ref$formInitialValue,
     onCancel = _ref.onCancel,
@@ -29,7 +30,7 @@ var DialogSelfOkButton = function DialogSelfOkButton(_ref) {
     });
   };
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(Button, {
+    children: [extraBtn, /*#__PURE__*/_jsx(Button, {
       onClick: onCancel,
       children: "\u53D6\u6D88"
     }), /*#__PURE__*/_jsx(CcsAuth.Button, {

package/es/dialog/HookDrawer.js

@@ -19,7 +19,6 @@ import DialogRequestButton from "./DialogRequestButton";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
 var HookDrawer = function HookDrawer(_ref, ref) {
-  var _innerConfig$styles;
   var hookAfterClose = _ref.afterClose,
     config = _ref.config;
   var _useState = useState(function () {
@@ -92,26 +91,18 @@ var HookDrawer = function HookDrawer(_ref, ref) {
   };
   var isCrInProp = ('getContainer' in innerConfig);
   var styles = innerConfig.styles || {};
-  if (form) {
-    styles.body = {
-      padding: 0
-    };
-  }
   styles.mask = _objectSpread({
     background: 'rgba(0, 0, 0, 0.1)'
   }, styles.mask);
   var renderExtra = function renderExtra() {
     if (request) {
-      return /*#__PURE__*/_jsx("div", {
-        className: "ccs-dialog-footer",
-        children: /*#__PURE__*/_jsx(DialogRequestButton, {
-          auth: auth,
-          request: request,
-          onCancel: close,
-          formRef: formRef,
-          onRequestBefore: onRequestBefore,
-          formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
-        })
+      return /*#__PURE__*/_jsx(DialogRequestButton, {
+        auth: auth,
+        request: request,
+        onCancel: close,
+        formRef: formRef,
+        onRequestBefore: onRequestBefore,
+        formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
       });
     }
     return /*#__PURE__*/_jsx(DialogButtonHolder, {
@@ -146,9 +137,6 @@ var HookDrawer = function HookDrawer(_ref, ref) {
       children: form ? /*#__PURE__*/_jsx(DialogForm, {
         ref: formRef,
         formProps: form,
-        styles: _objectSpread({
-          padding: 24
-        }, (_innerConfig$styles = innerConfig.styles) === null || _innerConfig$styles === void 0 ? void 0 : _innerConfig$styles.body),
         children: content
       }) : content
     })

package/es/dialog/HookModal.js

@@ -96,6 +96,7 @@ var HookModal = function HookModal(_ref2, ref) {
     _innerConfig$styles = innerConfig.styles,
     styles = _innerConfig$styles === void 0 ? {} : _innerConfig$styles,
     className = innerConfig.className,
+    extraBtn = innerConfig.extraBtn,
     request = innerConfig.request,
     onCancel = innerConfig.onCancel,
     onRequestBefore = innerConfig.onRequestBefore,
@@ -135,32 +136,34 @@ var HookModal = function HookModal(_ref2, ref) {
     };
   });
   var renderFooter = function renderFooter() {
+    // 传入接口请求参数
     if (request) {
-      return /*#__PURE__*/_jsx("div", {
-        className: "ccs-dialog-footer",
-        children: /*#__PURE__*/_jsx(DialogRequestButton, {
-          auth: auth,
-          request: request,
-          onCancel: close,
-          formRef: formRef,
-          onRequestBefore: onRequestBefore,
-          formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
-        })
+      return /*#__PURE__*/_jsx(DialogRequestButton, {
+        auth: auth,
+        request: request,
+        onCancel: close,
+        formRef: formRef,
+        extraBtn: extraBtn,
+        onRequestBefore: onRequestBefore,
+        formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
       });
     }
+
+    // 传入onOk参数
     if (innerConfig.onOk) {
-      return /*#__PURE__*/_jsx("div", {
-        className: "ccs-dialog-footer",
-        children: /*#__PURE__*/_jsx(DialogSelfOkButton, {
-          auth: auth,
-          onOk: innerConfig.onOk,
-          onCancel: close,
-          formRef: formRef,
-          formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
-        })
+      return /*#__PURE__*/_jsx(DialogSelfOkButton, {
+        auth: auth,
+        onCancel: close,
+        formRef: formRef,
+        extraBtn: extraBtn,
+        onOk: innerConfig.onOk,
+        formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
       });
     }
+
+    // 对话框中使用buttons生成按钮
     return /*#__PURE__*/_jsx(DialogButtonHolder, {
+      extraBtn: extraBtn,
       ref: buttonRef
     });
   };
@@ -168,11 +171,7 @@ var HookModal = function HookModal(_ref2, ref) {
     onCancel: close,
     afterClose: afterClose
   }, innerConfig), {}, {
-    styles: _objectSpread({
-      footer: !request ? {
-        padding: 0
-      } : undefined
-    }, styles),
+    styles: styles,
     className: classNames('ccs-dialog-modal', className),
     footer: renderFooter(),
     title: /*#__PURE__*/_jsx("div", {

package/es/dialog/button.d.ts

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

package/es/dialog/button.js

@@ -12,16 +12,18 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { CcsAuth, CcsUtils } from "./..";
 import { Button, Form } from 'antd';
-import React, { useEffect, useImperativeHandle, useState } from 'react';
+import React, { useEffect, useImperativeHandle, useRef, useState } from 'react';
 import CcsDialog from '.';
-import { Fragment as _Fragment } from "react/jsx-runtime";
 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 var DialogButtonHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (_props, ref) {
+export var DialogButtonHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+  var extraBtn = _ref.extraBtn;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     buttons = _useState2[0],
     setButtons = _useState2[1];
+  var noBtnRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
       onSetButtons: function onSetButtons(e) {
@@ -29,18 +31,28 @@ export var DialogButtonHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forw
       }
     };
   });
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: buttons
+  useEffect(function () {
+    if (buttons) {
+      noBtnRef.current.parentElement.removeAttribute('style');
+    } else {
+      // 没有按钮时，ant-modal-footer padding置0。
+      noBtnRef.current.parentElement.style.padding = '0px';
+    }
+  }, [buttons]);
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [extraBtn, buttons, /*#__PURE__*/_jsx("div", {
+      ref: noBtnRef
+    })]
   });
 }));
-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;
+export default function CcsDialogButtons(_ref2) {
+  var okText = _ref2.okText,
+    okAuth = _ref2.okAuth,
+    loading = _ref2.loading,
+    children = _ref2.children,
+    hideCancel = _ref2.hideCancel,
+    cancelText = _ref2.cancelText,
+    onOk = _ref2.onOk;
   var _CcsDialog$useInstanc = CcsDialog.useInstance(),
     closeDialog = _CcsDialog$useInstanc.closeDialog,
     buttonRef = _CcsDialog$useInstanc.buttonRef,
@@ -77,8 +89,7 @@ export default function CcsDialogButtons(_ref) {
       })]
     });
     if (buttonType === 'modal') {
-      btns = /*#__PURE__*/_jsx("div", {
-        className: "ccs-dialog-footer",
+      btns = /*#__PURE__*/_jsx(_Fragment, {
         children: btns
       });
     }

package/es/dialog/drawer-footer.js

@@ -39,10 +39,7 @@ export default function CcsDrawerFooter(_ref) {
   useEffect(function () {
     var _drawerFooterRef$curr;
     if (!onOk && !children) return;
-    var btns = /*#__PURE__*/_jsxs("div", {
-      style: {
-        padding: '8px 16px'
-      },
+    var btns = /*#__PURE__*/_jsxs(_Fragment, {
       children: [children, onOk && /*#__PURE__*/_jsxs(_Fragment, {
         children: [!hideCancel && /*#__PURE__*/_jsx(Button, {
           onClick: closeDialog,

package/es/dialog/form.d.ts

@@ -1,9 +1,8 @@
 import { FormInstance, FormProps } from 'antd';
-import React, { CSSProperties, ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 type PropsType = {
     children: ReactNode;
     formProps: FormProps;
-    styles?: CSSProperties;
 };
 export type DialogFormRef = {
     formInstance: FormInstance;

package/es/dialog/form.js

@@ -22,7 +22,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
  */
 var DialogForm = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var children = _ref.children,
-    styles = _ref.styles,
     _ref$formProps = _ref.formProps,
     labelCol = _ref$formProps.labelCol,
     wrapperCol = _ref$formProps.wrapperCol,
@@ -45,10 +44,10 @@ var DialogForm = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     },
     preserve: false
   }, restProps), {}, {
-    style: _objectSpread(_objectSpread({
+    style: _objectSpread({
       height: '100%',
       overflow: 'auto'
-    }, styles), restProps.style),
+    }, restProps.style),
     children: children
   }));
 });

package/es/dialog/hook.d.ts

@@ -22,12 +22,14 @@ export type CcsDialogModalProps = ModalFuncProps & {
     form?: FormProps;
     /** 表单接口请求权限 */
     auth?: string;
+    /** 关闭后销毁组件，默认true */
+    destroyOnClose?: boolean;
+    /** 通过参数传递的扩展按钮 */
+    extraBtn?: ReactNode;
     /** 表单接口请求 */
     request?: (values: any) => Promise<CCS.HttpResult>;
     /** request执行前参数处理 */
     onRequestBefore?: (values: any) => any;
-    /** 关闭后销毁组件，默认true */
-    destroyOnClose?: boolean;
     /** 通过closeDialog方法关闭dialog */
     onAfterOk?: (e: any) => void;
     /** 通过点击关闭按钮或取消按钮关闭 */
@@ -40,6 +42,8 @@ export type CcsDialogDrawerProps = Omit<DrawerProps, 'extra'> & {
     auth?: string;
     /** 抽屉内容 */
     content?: ReactNode;
+    /** 通过参数传递的扩展按钮 */
+    extraBtn?: ReactNode;
     /** 表单接口请求 */
     request?: (values: any) => Promise<CCS.HttpResult>;
     /** request执行前参数处理 */

package/es/dialog/hook.js

@@ -12,6 +12,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import _debounce from 'lodash/debounce';
 import React from 'react';
+import { createRoot } from 'react-dom/client';
+import { CcsUtils } from '..';
 import HookDrawer from "./HookDrawer";
 import HookModal from "./HookModal";
 import usePatchElement from "./usePatchElement";
@@ -53,10 +55,12 @@ export default function useCcsDialog() {
     }
   }, [actionQueue]);
   var getModalFunc = React.useCallback(function (config) {
-    var _holderRef$current;
     modalUuid += 1;
     var modalRef = /*#__PURE__*/React.createRef();
+
+    // 关闭事件
     var closeFunc;
+    // modal
     var modal = /*#__PURE__*/_jsx(HookModal, {
       config: config,
       afterClose: function afterClose() {
@@ -65,7 +69,24 @@ export default function useCcsDialog() {
       },
       ref: modalRef
     }, "modal-".concat(modalUuid));
-    closeFunc = (_holderRef$current = holderRef.current) === null || _holderRef$current === void 0 ? void 0 : _holderRef$current.patchElement(modal);
+    if (holderRef.current) {
+      // 加载了contextHolder
+      closeFunc = holderRef.current.patchElement(modal);
+    } else {
+      CcsUtils.showWarning(true, "\u672A\u5C06contextHolder\u63D2\u5165\u7EC4\u4EF6\u4E2D\uFF0C\u5C06\u65E0\u6CD5\u9002\u914Dantd\u4E3B\u9898\u914D\u7F6E\u548C\u83B7\u53D6context\u3002");
+      // 未加载contextHolder，创建dom
+      var dialogEle = document.createElement('div');
+      document.body.append(dialogEle);
+      var root = createRoot(dialogEle);
+      root.render( /*#__PURE__*/_jsx(_Fragment, {
+        children: modal
+      }));
+      closeFunc = function closeFunc() {
+        setTimeout(function () {
+          root.unmount();
+        }, 500);
+      };
+    }
     if (closeFunc) {
       destroyFns.push(closeFunc);
     }
@@ -100,7 +121,6 @@ export default function useCcsDialog() {
     return instance;
   }, []);
   var getDrawerFunc = React.useCallback(function (config) {
-    var _holderRef$current2;
     drawerUuid += 1;
     var modalRef = /*#__PURE__*/React.createRef();
     var closeFunc;
@@ -112,7 +132,25 @@ export default function useCcsDialog() {
       },
       ref: modalRef
     }, "drawer-".concat(drawerUuid));
-    closeFunc = (_holderRef$current2 = holderRef.current) === null || _holderRef$current2 === void 0 ? void 0 : _holderRef$current2.patchElement(modal);
+    if (holderRef.current) {
+      var _holderRef$current;
+      // 加载了contextHolder
+      closeFunc = (_holderRef$current = holderRef.current) === null || _holderRef$current === void 0 ? void 0 : _holderRef$current.patchElement(modal);
+    } else {
+      CcsUtils.showWarning(true, "\u672A\u5C06contextHolder\u63D2\u5165\u7EC4\u4EF6\u4E2D\uFF0C\u5C06\u65E0\u6CD5\u9002\u914Dantd\u4E3B\u9898\u914D\u7F6E\u548C\u83B7\u53D6context\u3002");
+      // 未加载contextHolder，创建dom
+      var dialogEle = document.createElement('div');
+      document.body.append(dialogEle);
+      var root = createRoot(dialogEle);
+      root.render( /*#__PURE__*/_jsx(_Fragment, {
+        children: modal
+      }));
+      closeFunc = function closeFunc() {
+        setTimeout(function () {
+          root.unmount();
+        }, 500);
+      };
+    }
     if (closeFunc) {
       destroyFns.push(closeFunc);
     }

package/es/dialog/index.less

@@ -14,17 +14,3 @@
     padding: 0;
   }
 }
-
-.ccs-dialog-modal {
-  .ant-modal-footer {
-    padding: 0;
-  }
-}
-
-.ccs-dialog-footer {
-  padding: 8px 16px;
-
-  > .ant-btn + .ant-btn {
-    margin-inline-start: 8px;
-  }
-}

package/es/hooks/use-page.d.ts

@@ -1,6 +1,6 @@
 declare const usePage: () => {
     id: string;
-    location: import("history").Location;
+    location: import("react-router").Location<any>;
     isActive: boolean;
     onDestroy: (path: string) => void;
     onAuth: (code: string) => boolean;

package/es/layout-keep-alive/page.d.ts

@@ -1,5 +1,5 @@
-import { Location } from 'history';
 import { JSXElementConstructor, ReactElement } from 'react';
+import { Location } from 'react-router';
 export type CachePageProps = {
     /** 选中状态 */
     active: boolean;

package/es/pro-table/index.less

@@ -190,28 +190,30 @@
   }
 
   .ant-table-wrapper .ant-table > .ant-table-container {
+    border-inline-start: 0;
+    border-top: 0;
+
     & > .ant-table-header > table > thead > tr {
       & > th:last-child {
         border-inline-end: 0;
         border-start-start-radius: 0;
         border-start-end-radius: 0;
       }
+
       & > th:first-child {
         border-start-start-radius: 0;
       }
     }
+
     & > .ant-table-body > table > tbody > tr > td:last-child {
       border-inline-end: 0;
     }
   }
 
-  .ant-table-wrapper .ant-table > .ant-table-container {
-    border-inline-start: 0;
-    border-top: 0;
-  }
   .ant-table-wrapper table {
     border-radius: 0;
   }
+
   .ant-table-wrapper .ant-table .ant-table-header {
     border-radius: 0;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.25-beta-27",
-  "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;",
+  "version": "1.2.0-beta-2",
+  "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;CcsDialog不适应contextHolder也能打开。",
   "license": "MIT",
   "author": {
     "name": "Hong",
@@ -68,6 +68,7 @@
     "js-base64": "^3.7.5",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
+    "rc-menu": "^9.15.1",
     "rc-trigger": "^5.3.4",
     "rc-util": "^5.32.4",
     "react-color": "^2.19.3",
@@ -102,6 +103,7 @@
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.0.0",
     "prettier-plugin-packagejson": "^2.2.18",
+    "rc-table": "^7.47.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "stylelint": "^14.9.1"