@ccs-ui/rc-pro 1.1.25-beta-6 → 1.1.25-beta-8

package/es/auth/auth-button.d.ts

@@ -1,13 +1,21 @@
+/// <reference types="react" />
 import { ButtonProps } from 'antd';
-type CcsAuthButtonProps = ButtonProps & {
+type CcsAuthButtonProps = Omit<ButtonProps, 'onClick'> & {
+    /** 权限标识 */
     auth: string;
+    /** 文本 */
     text?: string;
+    /** 二次确认消息 */
     confirm?: string;
+    /** 点击事件 */
+    onClick?: (e: React.MouseEvent<HTMLElement, MouseEvent>, selectedRows?: any[]) => void;
+    /** 按钮禁用方法 */
+    onDisabled?: (selectedRows?: any[]) => boolean;
 };
 /**
  * 带权限的按钮组件、继承Ant Button所有属性
  * @param CcsAuthButtonProps
  * @returns
  */
-declare const _default: ({ auth, text, confirm, onClick, ...restProps }: CcsAuthButtonProps) => import("react/jsx-runtime").JSX.Element;
+declare const _default: ({ auth, text, confirm, disabled, onClick, onDisabled, ...restProps }: CcsAuthButtonProps) => import("react/jsx-runtime").JSX.Element;
 export default _default;

package/es/auth/auth-button.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["auth", "text", "confirm", "onClick"];
+var _excluded = ["auth", "text", "confirm", "disabled", "onClick", "onDisabled"];
 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; }
@@ -9,9 +9,10 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 { ExclamationCircleOutlined } from '@ant-design/icons';
 import { Button } from 'antd';
-import { useRef } from 'react';
+import { useContext, useRef } from 'react';
 import { ModalConfirm } from '.';
 import { useCcsPage } from "../";
+import { TableSelectionContext } from "../pro-table/table";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -24,11 +25,15 @@ export default (function (_ref) {
   var auth = _ref.auth,
     text = _ref.text,
     confirm = _ref.confirm,
+    disabled = _ref.disabled,
     _onClick = _ref.onClick,
+    onDisabled = _ref.onDisabled,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useCcsPage() || {},
     onAuth = _ref2.onAuth;
   var modalRef = useRef(null);
+  var _ref3 = useContext(TableSelectionContext) || {},
+    selectedRows = _ref3.selectedRows;
   var button = /*#__PURE__*/_jsxs(Button, _objectSpread(_objectSpread({}, restProps), {}, {
     onClick: function onClick(e) {
       if (!_onClick) return;
@@ -42,13 +47,14 @@ export default (function (_ref) {
           okText: '确认',
           cancelText: '取消',
           onOk: function onOk() {
-            return _onClick(e);
+            return _onClick(e, selectedRows);
           }
         });
         return;
       }
-      _onClick(e);
+      _onClick(e, selectedRows);
     },
+    disabled: disabled || onDisabled && onDisabled(selectedRows),
     children: [text, restProps.children]
   }));
 

package/es/auth/auth-dropdown.d.ts

@@ -19,7 +19,10 @@ type MenuDividerAuthType = MenuDividerType & {
     auth?: string;
     children?: DropdownMenuItemType[];
 };
-type DropdownMenuItemType = MenuItemAuthType | SubMenuAuthType | MenuItemGroupAuthType | MenuDividerAuthType;
+type DropdownMenuItemType = (MenuItemAuthType | SubMenuAuthType | MenuItemGroupAuthType | MenuDividerAuthType) & {
+    disabled?: boolean;
+    onDisabled?: (selectedRows?: any[]) => boolean;
+};
 type CcsAuthDropdownProps = Omit<DropDownProps, 'overlay' | 'children'> & {
     /** 权限标识 */
     auth?: string;
@@ -28,7 +31,7 @@ type CcsAuthDropdownProps = Omit<DropDownProps, 'overlay' | 'children'> & {
     /** 自定义显示内容 */
     children: ChildrenType;
     /** 点击事件 */
-    onClick?: (info: MenuInfo) => void;
+    onClick?: (info: MenuInfo, selectedRows?: any[]) => void;
 };
 /**
  * 带权限的Dropdown组件

package/es/auth/auth-dropdown.js

@@ -1,5 +1,6 @@
 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); }
-var _excluded = ["auth", "menus", "children", "onClick"];
+var _excluded = ["auth", "menus", "children", "onClick"],
+  _excluded2 = ["onDisabled"];
 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; }
@@ -8,8 +9,9 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 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 { Dropdown } from 'antd';
-import React, { useMemo } from 'react';
+import React, { useContext, useMemo } from 'react';
 import { useCcsPage } from "../";
+import { TableSelectionContext } from "../pro-table/table";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
@@ -20,10 +22,12 @@ export default (function (_ref) {
     _ref$menus = _ref.menus,
     menus = _ref$menus === void 0 ? [] : _ref$menus,
     children = _ref.children,
-    onClick = _ref.onClick,
+    _onClick = _ref.onClick,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useCcsPage() || {},
     onAuth = _ref2.onAuth;
+  var _ref3 = useContext(TableSelectionContext) || {},
+    selectedRows = _ref3.selectedRows;
   var items = useMemo(function () {
     function filterTreeArray(menuItems) {
       var mis = menuItems.filter(function (item) {
@@ -63,8 +67,16 @@ export default (function (_ref) {
     return i.type !== 'divider';
   }).length ? /*#__PURE__*/_jsx(Dropdown, _objectSpread(_objectSpread({}, restProps), {}, {
     menu: {
-      items: items,
-      onClick: onClick
+      items: items.map(function (_ref4) {
+        var onDisabled = _ref4.onDisabled,
+          item = _objectWithoutProperties(_ref4, _excluded2);
+        return _objectSpread(_objectSpread({}, item), {}, {
+          disabled: (item === null || item === void 0 ? void 0 : item.disabled) || onDisabled && onDisabled(selectedRows)
+        });
+      }),
+      onClick: function onClick(e) {
+        if (_onClick) _onClick(e, selectedRows);
+      }
     },
     children: renderChildren
   })) : /*#__PURE__*/_jsx(_Fragment, {});

package/es/auth/index.d.ts

@@ -29,14 +29,16 @@ export declare function ModalConfirm({ modalRef }: {
 declare function CcsAuth({ auth, children }: CcsAuthProps): ReactElement<any, string | import("react").JSXElementConstructor<any>> | null;
 declare namespace CcsAuth {
     var Group: typeof AuthGroup;
-    var Button: ({ auth, text, confirm, onClick, ...restProps }: ButtonProps & {
+    var Button: ({ auth, text, confirm, disabled, onClick, onDisabled, ...restProps }: Omit<ButtonProps, "onClick"> & {
         auth: string;
         text?: string | undefined;
         confirm?: string | undefined;
+        onClick?: ((e: import("react").MouseEvent<HTMLElement, MouseEvent>, selectedRows?: any[] | undefined) => void) | undefined;
+        onDisabled?: ((selectedRows?: any[] | undefined) => boolean) | undefined;
     }) => import("react/jsx-runtime").JSX.Element;
     var Dropdown: ({ auth, menus, children, onClick, ...restProps }: import("./auth-dropdown").CcsAuthDropdownProps) => ReactElement<any, string | import("react").JSXElementConstructor<any>>;
 }
-declare function AuthGroup({ size, isLink, showCount, moreIcon, moreText, items, onClick, ...otherProps }: CcsAuthGroupProps): import("react/jsx-runtime").JSX.Element | null;
+declare function AuthGroup({ size, isLink, showCount, moreIcon, moreText, items, onClick, }: CcsAuthGroupProps): import("react/jsx-runtime").JSX.Element | null;
 declare namespace AuthGroup {
     var displayName: string;
 }

package/es/auth/index.js

@@ -1,7 +1,6 @@
 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); }
-var _excluded = ["size", "isLink", "showCount", "moreIcon", "moreText", "items", "onClick"],
-  _excluded2 = ["key", "label"],
-  _excluded3 = ["key", "label", "disabled", "onDisabled"];
+var _excluded = ["key", "label"],
+  _excluded2 = ["key", "label", "disabled", "onDisabled"];
 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; }
@@ -17,8 +16,9 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { EllipsisOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import { Button, Dropdown, Modal, Space } from 'antd';
-import { useEffect, useRef } from 'react';
+import { useContext, useEffect, useRef } from 'react';
 import { useCcsPage } from '..';
+import { TableSelectionContext } from "../pro-table/table";
 import AuthButton from "./auth-button";
 import AuthDropdown from "./auth-dropdown";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -55,16 +55,17 @@ function AuthGroup(_ref4) {
     moreText = _ref4.moreText,
     _ref4$items = _ref4.items,
     items = _ref4$items === void 0 ? [] : _ref4$items,
-    onClick = _ref4.onClick,
-    otherProps = _objectWithoutProperties(_ref4, _excluded);
+    onClick = _ref4.onClick;
   var _ref5 = useCcsPage() || {},
     onAuth = _ref5.onAuth;
   var modalRef = useRef(null);
+  var _ref6 = useContext(TableSelectionContext) || {},
+    selectedRows = _ref6.selectedRows;
   var authButtons = [];
 
   // 过滤隐藏按钮
   authButtons = items.filter(function (item) {
-    return !item.hidden && !(item.onHidden && item.onHidden(otherProps === null || otherProps === void 0 ? void 0 : otherProps.selectedRows));
+    return !item.hidden && !(item.onHidden && item.onHidden(selectedRows));
   });
 
   // 需要判断权限
@@ -93,22 +94,22 @@ function AuthGroup(_ref4) {
         okText: '确认',
         cancelText: '取消',
         onOk: function onOk() {
-          return onClick && onClick(key, otherProps === null || otherProps === void 0 ? void 0 : otherProps.selectedRows);
+          return onClick && onClick(key, selectedRows);
         }
       });
       return;
     }
-    onClick(key, otherProps === null || otherProps === void 0 ? void 0 : otherProps.selectedRows);
+    onClick(key, selectedRows);
   };
 
   // link类型按钮
   if (isLink) {
     return /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(Space, {
-        children: showBtns === null || showBtns === void 0 ? void 0 : showBtns.map(function (_ref6) {
-          var key = _ref6.key,
-            label = _ref6.label,
-            restProps = _objectWithoutProperties(_ref6, _excluded2);
+        children: showBtns === null || showBtns === void 0 ? void 0 : showBtns.map(function (_ref7) {
+          var key = _ref7.key,
+            label = _ref7.label,
+            restProps = _objectWithoutProperties(_ref7, _excluded);
           return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, restProps), {}, {
             size: size,
             type: "link",
@@ -141,12 +142,15 @@ function AuthGroup(_ref4) {
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Space, {
       wrap: true,
-      children: showBtns === null || showBtns === void 0 ? void 0 : showBtns.map(function (_ref7, index) {
-        var key = _ref7.key,
-          label = _ref7.label,
-          disabled = _ref7.disabled,
-          onDisabled = _ref7.onDisabled,
-          restProps = _objectWithoutProperties(_ref7, _excluded3);
+      children: showBtns === null || showBtns === void 0 ? void 0 : showBtns.map(function (_ref8, index) {
+        var key = _ref8.key,
+          label = _ref8.label,
+          disabled = _ref8.disabled,
+          onDisabled = _ref8.onDisabled,
+          restProps = _objectWithoutProperties(_ref8, _excluded2);
+        // 按钮禁用
+        var isDisabled = disabled || onDisabled && onDisabled(selectedRows);
+
         // 更多按钮
         if (index === showBtns.length - 1 && authButtons.length > 0) {
           return /*#__PURE__*/_jsxs(Space.Compact, {
@@ -155,6 +159,7 @@ function AuthGroup(_ref4) {
               onClick: function onClick() {
                 return handleOnClick(key);
               },
+              disabled: isDisabled,
               children: label
             })), /*#__PURE__*/_jsx(Dropdown, {
               menu: {
@@ -170,9 +175,6 @@ function AuthGroup(_ref4) {
             })]
           }, key);
         }
-
-        // 按钮禁用
-        var isDisabled = disabled || onDisabled && onDisabled(otherProps === null || otherProps === void 0 ? void 0 : otherProps.selectedRows);
         return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, restProps), {}, {
           size: size,
           disabled: isDisabled,

package/es/ccs.d.ts

@@ -147,9 +147,9 @@ type AuthButtonItem = {
     /** 按钮禁用 */
     disabled?: boolean;
     /** 根据选中数据判断是否禁用 */
-    onDisabled?: (selectedRows: any[]) => boolean;
+    onDisabled?: (selectedRows?: any[]) => boolean;
     /** 根据选中数据判断是否隐藏 */
-    onHidden?: (selectedRows: any[]) => boolean;
+    onHidden?: (selectedRows?: any[]) => boolean;
     /** 按钮隐藏 */
     hidden?: boolean;
     /** 警告按钮 */

package/es/pro-table/table.d.ts

@@ -1,7 +1,7 @@
 import { ColProps, TableProps } from 'antd';
 import { ColumnGroupType, ColumnType } from 'antd/es/table';
 import { TableSticky } from 'rc-table/lib/interface';
-import { CSSProperties, ReactElement, ReactNode } from 'react';
+import React, { CSSProperties, ReactElement, ReactNode } from 'react';
 import CCS from '..';
 import { HttpPageResult, TableColumns } from '../ccs';
 import './index.less';
@@ -98,6 +98,9 @@ export type TableStickyProps = boolean | (TableSticky & {
     isInDialog?: boolean;
 });
 export declare const classPrefix = "ccs-pl";
+export declare const TableSelectionContext: React.Context<{
+    selectedRows?: any[] | undefined;
+}>;
 /**
  * 布局组件 包括form、查询、toolbar、table 自动初始化数据
  * @param CcsProTableType

package/es/pro-table/table.js

@@ -19,7 +19,7 @@ import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from
 import { CcsUtils, CcsWaterMark } from '..';
 import { useCcsPage } from "../";
 import CcsTable from "../table";
-import { getAllChildrenId, getDataById, isComponent, onTableInModalOrDrawer, onTableInTabItem } from "./_utils";
+import { getAllChildrenId, getDataById, onTableInModalOrDrawer, onTableInTabItem } from "./_utils";
 import "./index.less";
 import TableOperation from "./operation";
 import SearchComponent from "./search";
@@ -29,6 +29,9 @@ import TableTree from "./tree";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var classPrefix = 'ccs-pl';
+export var TableSelectionContext = /*#__PURE__*/React.createContext({
+  selectedRows: undefined
+});
 
 /**
  * 布局组件 包括form、查询、toolbar、table 自动初始化数据
@@ -478,14 +481,18 @@ var InternalProTable = function InternalProTable(props) {
       } : undefined
     }));
   };
-  var isAuthGroupToolbar = isComponent(toolbar, 'AuthGroup');
-  var isAuthGroupToolbarExtra = isComponent(toolbarExtra, 'AuthGroup');
-  var newToolbar = isAuthGroupToolbar ? /*#__PURE__*/React.cloneElement(toolbar, {
-    selectedRows: selectedRows
-  }) : toolbar;
-  var newToolbarExtra = isAuthGroupToolbarExtra ? /*#__PURE__*/React.cloneElement(toolbarExtra, {
-    selectedRows: selectedRows
-  }) : toolbarExtra;
+  var newToolbar = /*#__PURE__*/_jsx(TableSelectionContext.Provider, {
+    value: {
+      selectedRows: selectedRows
+    },
+    children: toolbar
+  });
+  var newToolbarExtra = /*#__PURE__*/_jsx(TableSelectionContext.Provider, {
+    value: {
+      selectedRows: selectedRows
+    },
+    children: toolbarExtra
+  });
 
   // 暗黑模式
   var isDark = token._appTheme === 'dark';

package/es/theme.js

@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { darkTheme, defaultTheme } from '@ant-design/compatible';
 import { App, ConfigProvider, Modal, message, notification } from 'antd';
 import zhCN from 'antd/locale/zh_CN';
-import { useEffect } from 'react';
+import { useState } from 'react';
 import ThemeDialog from "./theme-dialog";
 
 /** 主题设置 */
@@ -36,9 +36,9 @@ export default function AppTheme(_ref) {
     _Modal$useModal2 = _slicedToArray(_Modal$useModal, 2),
     modalApi = _Modal$useModal2[0],
     contextModalHolder = _Modal$useModal2[1];
-  useEffect(function () {
+  useState(function () {
     ThemeDialog.setConfig(messageApi, noticeApi, modalApi);
-  }, []);
+  });
 
   // 主题
   var appTheme = theme === 'dark' ? darkTheme : defaultTheme;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.25-beta-6",
+  "version": "1.1.25-beta-8",
   "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加传统布局模式;",
   "license": "MIT",
   "author": {