@hw-component/table 0.0.4-beta-v19 → 0.0.5-beta-v2

package/es/HTableBody/RowSelection.d.ts

@@ -1,9 +1,9 @@
-interface IRowSelectionTitleProps {
-    allPageCheck?: boolean;
-}
-export declare const RowSelectionTitle: ({ allPageCheck, }: IRowSelectionTitleProps) => JSX.Element;
+import type { HRowSelection } from "../modal";
+export declare const RowSelectionTitle: ({ allPageCheck, onChange, getCheckboxProps, }: HRowSelection) => JSX.Element;
 interface RowSelectionBoxProps {
     data: any;
+    onChange?: HRowSelection["onChange"];
+    getCheckboxProps?: HRowSelection["getCheckboxProps"];
 }
-export declare const RowSelectionBox: ({ data }: RowSelectionBoxProps) => JSX.Element;
+export declare const RowSelectionBox: ({ data, onChange, getCheckboxProps, }: RowSelectionBoxProps) => JSX.Element;
 export {};

package/es/HTableBody/RowSelection.js

@@ -1,5 +1,6 @@
 // welcome to hoo hoo hoo
 import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray';
+import _filterInstanceProperty from '@babel/runtime-corejs3/core-js/instance/filter';
 import _keysInstanceProperty from '@babel/runtime-corejs3/core-js/instance/keys';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
 import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js/instance/index-of';
@@ -11,7 +12,9 @@ import { useMemo } from 'react';
 
 var RowSelectionTitle = function RowSelectionTitle(_ref) {
   var _ref$allPageCheck = _ref.allPageCheck,
-    allPageCheck = _ref$allPageCheck === void 0 ? true : _ref$allPageCheck;
+    allPageCheck = _ref$allPageCheck === void 0 ? true : _ref$allPageCheck,
+    onChange = _ref.onChange,
+    getCheckboxProps = _ref.getCheckboxProps;
   var _useHTableContext = useHTableContext(),
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
@@ -22,16 +25,24 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
   var _ref2 = data || {},
     _ref2$records = _ref2.records,
     records = _ref2$records === void 0 ? [] : _ref2$records;
+  var newData = records === null || records === void 0 ? void 0 : _filterInstanceProperty(records).call(records, function (item) {
+    var _ref3 = (getCheckboxProps === null || getCheckboxProps === void 0 ? void 0 : getCheckboxProps(data)) || {},
+      _ref3$disabled = _ref3.disabled,
+      disabled = _ref3$disabled === void 0 ? false : _ref3$disabled;
+    return !disabled;
+  });
   var keys = _keysInstanceProperty(selectedRowData),
     selectAll = selectedRowData.selectAll;
   var allCheck = function allCheck() {
-    var setKeys = _mapInstanceProperty(records).call(records, function (item) {
+    var setKeys = _mapInstanceProperty(newData).call(newData, function (item) {
       return item[rowKey];
     });
-    rowOnChange(setKeys, records);
+    rowOnChange(setKeys, newData);
+    onChange === null || onChange === void 0 || onChange(setKeys, newData);
   };
   var allCancel = function allCancel() {
     rowOnChange([], []);
+    onChange === null || onChange === void 0 || onChange([], []);
   };
   var checkChange = function checkChange(e) {
     var checked = e.target.checked;
@@ -41,8 +52,8 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
     }
     allCancel();
   };
-  var change = function change(_ref3) {
-    var key = _ref3.key;
+  var change = function change(_ref4) {
+    var key = _ref4.key;
     if (key === "check") {
       allCheck();
       return;
@@ -53,12 +64,14 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
     }
     if (key === "checkAll") {
       allSelectChange === null || allSelectChange === void 0 || allSelectChange(true);
+      onChange === null || onChange === void 0 || onChange([], []);
       return;
     }
     allSelectChange === null || allSelectChange === void 0 || allSelectChange(false);
+    onChange === null || onChange === void 0 || onChange([], []);
   };
   var len = (keys === null || keys === void 0 ? void 0 : keys.length) || 0;
-  var dataLen = (records === null || records === void 0 ? void 0 : records.length) || 0;
+  var dataLen = (newData === null || newData === void 0 ? void 0 : newData.length) || 0;
   var checked = len === dataLen && len !== 0;
   var configItems = useMemo(function () {
     var fsArray = checked ? {
@@ -85,6 +98,7 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
     });
   };
   var disabled = dataLen === 0;
+  console.log(dataLen, "dadada");
   if (allPageCheck) {
     return jsx(Dropdown, {
       overlay: menu,
@@ -104,8 +118,10 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
     disabled: disabled
   });
 };
-var RowSelectionBox = function RowSelectionBox(_ref4) {
-  var data = _ref4.data;
+var RowSelectionBox = function RowSelectionBox(_ref5) {
+  var data = _ref5.data,
+    onChange = _ref5.onChange,
+    getCheckboxProps = _ref5.getCheckboxProps;
   var _useHTableContext2 = useHTableContext(),
     selectedRowData = _useHTableContext2.selectedRowData,
     rowOnChange = _useHTableContext2.rowOnChange,
@@ -124,15 +140,22 @@ var RowSelectionBox = function RowSelectionBox(_ref4) {
       newKeys.push(key);
       newRowData.push(data);
       rowOnChange(newKeys, newRowData);
+      onChange === null || onChange === void 0 || onChange(newKeys, newRowData);
       return;
     }
     var index = _indexOfInstanceProperty(newKeys).call(newKeys, key);
     _spliceInstanceProperty(newKeys).call(newKeys, index, 1);
     _spliceInstanceProperty(newRowData).call(newRowData, index, 1);
+    rowOnChange(newKeys, newRowData);
+    onChange === null || onChange === void 0 || onChange(newKeys, newRowData);
   };
+  var _ref6 = (getCheckboxProps === null || getCheckboxProps === void 0 ? void 0 : getCheckboxProps(data)) || {},
+    _ref6$disabled = _ref6.disabled,
+    disabled = _ref6$disabled === void 0 ? false : _ref6$disabled;
   return jsx(Checkbox, {
     checked: _indexOfInstanceProperty(keys).call(keys, key) !== -1,
-    onChange: check
+    onChange: check,
+    disabled: disabled
   });
 };
 

package/es/HTableBody/hooks.d.ts

@@ -830,7 +830,7 @@ export declare const useCols: ({ configData, rowSelection, table }: HTableProps)
         request?: import("@ant-design/pro-utils").ProFieldRequestData | undefined;
         width?: number | undefined;
     } | undefined) | undefined;
-    fieldProps?: (import("antd").CascaderProps<any> | Record<string, any> | import("antd").InputProps | import("antd/lib/input").PasswordProps | import("antd/lib/input").TextAreaProps | import("antd").DatePickerProps | import("antd/lib/date-picker").RangePickerProps | import("antd").TimeRangePickerProps | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | import("antd").CheckboxProps | import("antd").RateProps | import("antd").RadioProps | import("antd").ProgressProps | import("antd").InputNumberProps<string | number> | import("antd").AvatarProps | import("antd").SwitchProps | import("rc-image").ImageProps | import("antd").TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType> | (import("react-color").SketchPickerProps & {
+    fieldProps?: (import("antd").CascaderProps<any> | Record<string, any> | import("antd").InputProps | import("antd").CheckboxProps | import("antd").RadioProps | import("antd/lib/input").PasswordProps | import("antd/lib/input").TextAreaProps | import("antd").DatePickerProps | import("antd/lib/date-picker").RangePickerProps | import("antd").TimeRangePickerProps | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | import("antd").RateProps | import("antd").ProgressProps | import("antd").InputNumberProps<string | number> | import("antd").AvatarProps | import("antd").SwitchProps | import("rc-image").ImageProps | import("antd").TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType> | (import("react-color").SketchPickerProps & {
         value?: string | undefined;
         popoverProps?: import("antd").PopoverProps | undefined;
         mode?: "read" | "edit" | undefined;
@@ -1150,7 +1150,7 @@ export declare const useCols: ({ configData, rowSelection, table }: HTableProps)
         rowKey?: string | undefined;
         rowIndex: number;
         entity: any;
-    }) => import("antd").CascaderProps<any> | Record<string, any> | import("antd").InputProps | import("antd/lib/input").PasswordProps | import("antd/lib/input").TextAreaProps | import("antd").DatePickerProps | import("antd/lib/date-picker").RangePickerProps | import("antd").TimeRangePickerProps | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | import("antd").CheckboxProps | import("antd").RateProps | import("antd").RadioProps | import("antd").ProgressProps | import("antd").InputNumberProps<string | number> | import("antd").AvatarProps | import("antd").SwitchProps | import("rc-image").ImageProps | import("antd").TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType> | (import("react-color").SketchPickerProps & {
+    }) => import("antd").CascaderProps<any> | Record<string, any> | import("antd").InputProps | import("antd").CheckboxProps | import("antd").RadioProps | import("antd/lib/input").PasswordProps | import("antd/lib/input").TextAreaProps | import("antd").DatePickerProps | import("antd/lib/date-picker").RangePickerProps | import("antd").TimeRangePickerProps | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | import("antd").RateProps | import("antd").ProgressProps | import("antd").InputNumberProps<string | number> | import("antd").AvatarProps | import("antd").SwitchProps | import("rc-image").ImageProps | import("antd").TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType> | (import("react-color").SketchPickerProps & {
         value?: string | undefined;
         popoverProps?: import("antd").PopoverProps | undefined;
         mode?: "read" | "edit" | undefined;

package/es/HTableBody/hooks.js

@@ -19,30 +19,36 @@ import { RowSelectionTitle, RowSelectionBox } from './RowSelection.js';
 
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
-var rowSelectionCol = function rowSelectionCol(allPageCheck) {
+var rowSelectionCol = function rowSelectionCol(rowSelection) {
+  var _ref = rowSelection || {},
+    allPageCheck = _ref.allPageCheck,
+    onChange = _ref.onChange,
+    getCheckboxProps = _ref.getCheckboxProps;
   return {
     title: jsx(RowSelectionTitle, {
-      allPageCheck: allPageCheck
+      allPageCheck: allPageCheck,
+      onChange: onChange,
+      getCheckboxProps: getCheckboxProps
     }),
     dataIndex: "rowSelectionTitle",
     width: 32,
     render: function render(dom, data) {
       return jsx(RowSelectionBox, {
-        data: data
+        data: data,
+        onChange: onChange,
+        getCheckboxProps: getCheckboxProps
       });
     }
   };
 };
-var useCols = function useCols(_ref) {
-  var configData = _ref.configData,
-    rowSelection = _ref.rowSelection,
-    table = _ref.table;
+var useCols = function useCols(_ref2) {
+  var configData = _ref2.configData,
+    rowSelection = _ref2.rowSelection,
+    table = _ref2.table;
   return useMemo(function () {
     var colsArray = _toConsumableArray(configData);
     if (rowSelection !== false) {
-      var _ref2 = rowSelection || {},
-        allPageCheck = _ref2.allPageCheck;
-      _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, rowSelectionCol(allPageCheck));
+      _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, rowSelectionCol(rowSelection));
     }
     return _mapInstanceProperty(colsArray).call(colsArray, function (item) {
       var _render = item.render;
@@ -55,7 +61,7 @@ var useCols = function useCols(_ref) {
         }
       });
     });
-  }, [configData, table]);
+  }, [configData, table, rowSelection]);
 };
 var useSynchronousKeys = function useSynchronousKeys(_ref3) {
   var selectedRowKeys = _ref3.selectedRowKeys,

package/es/HTableBody/index.d.ts

@@ -2,7 +2,8 @@ import type { ProTableProps } from "@ant-design/pro-table";
 import type { ActionRenderFn, ConfigDataModal, ParamsModal } from "../modal";
 import React from "react";
 import type { HTableInstance } from "../modal";
-interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
+import type { HRowSelection } from "../modal";
+interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection"> {
     configData?: ConfigDataModal;
     onPageChange?: (params: ParamsModal) => void;
     emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
@@ -10,6 +11,7 @@ interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
     tableStyle?: React.CSSProperties;
     paginationStyle?: React.CSSProperties;
     actionRender?: ActionRenderFn;
+    rowSelection?: HRowSelection;
 }
 declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, options, actionRender, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/es/HTableBody/index.js

@@ -52,7 +52,6 @@ var Body = (function (_ref) {
     actionRender = _ref.actionRender,
     props = _objectWithoutProperties(_ref, _excluded);
   var selectedRowKeys = rowSelection.selectedRowKeys;
-    rowSelection.onChange;
   var _useHTableContext = useHTableContext(),
     tableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,

package/es/modal.d.ts

@@ -4,6 +4,7 @@ import type { HItemProps, HFormInstance } from "@hw-component/form/es/Form/modal
 import type { ColProps } from "antd";
 import type React from "react";
 import type { ModalProps } from "antd";
+import type { TableProps } from "antd/lib/table";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];
@@ -33,7 +34,9 @@ export type actionFn = (...arg: any[]) => void;
 export interface RowSelectionOuter {
     allPageCheck?: boolean;
 }
-export type HRowSelection = RowSelectionOuter & ProTableProps<any, any>["rowSelection"];
+export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
+    alwaysShowAlert?: boolean;
+});
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowKey" | "rowSelection"> {
     request?: (params: ParamsModal) => Promise<ResultModal>;
     configData: ConfigDataModal;
@@ -55,7 +58,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     paginationStyle?: React.CSSProperties;
     rowKey?: string;
     allPageCheck?: boolean;
-    rowSelection?: HRowSelection;
+    rowSelection?: HRowSelection | false;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/lib/HTableBody/RowSelection.d.ts

@@ -1,9 +1,9 @@
-interface IRowSelectionTitleProps {
-    allPageCheck?: boolean;
-}
-export declare const RowSelectionTitle: ({ allPageCheck, }: IRowSelectionTitleProps) => JSX.Element;
+import type { HRowSelection } from "../modal";
+export declare const RowSelectionTitle: ({ allPageCheck, onChange, getCheckboxProps, }: HRowSelection) => JSX.Element;
 interface RowSelectionBoxProps {
     data: any;
+    onChange?: HRowSelection["onChange"];
+    getCheckboxProps?: HRowSelection["getCheckboxProps"];
 }
-export declare const RowSelectionBox: ({ data }: RowSelectionBoxProps) => JSX.Element;
+export declare const RowSelectionBox: ({ data, onChange, getCheckboxProps, }: RowSelectionBoxProps) => JSX.Element;
 export {};

package/lib/HTableBody/RowSelection.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
 var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/index-of');
@@ -12,7 +13,9 @@ var React = require('react');
 
 var RowSelectionTitle = function RowSelectionTitle(_ref) {
   var _ref$allPageCheck = _ref.allPageCheck,
-    allPageCheck = _ref$allPageCheck === void 0 ? true : _ref$allPageCheck;
+    allPageCheck = _ref$allPageCheck === void 0 ? true : _ref$allPageCheck,
+    onChange = _ref.onChange,
+    getCheckboxProps = _ref.getCheckboxProps;
   var _useHTableContext = context.useHTableContext(),
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
@@ -23,16 +26,24 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
   var _ref2 = data || {},
     _ref2$records = _ref2.records,
     records = _ref2$records === void 0 ? [] : _ref2$records;
+  var newData = records === null || records === void 0 ? void 0 : _filterInstanceProperty(records).call(records, function (item) {
+    var _ref3 = (getCheckboxProps === null || getCheckboxProps === void 0 ? void 0 : getCheckboxProps(data)) || {},
+      _ref3$disabled = _ref3.disabled,
+      disabled = _ref3$disabled === void 0 ? false : _ref3$disabled;
+    return !disabled;
+  });
   var keys = _keysInstanceProperty(selectedRowData),
     selectAll = selectedRowData.selectAll;
   var allCheck = function allCheck() {
-    var setKeys = _mapInstanceProperty(records).call(records, function (item) {
+    var setKeys = _mapInstanceProperty(newData).call(newData, function (item) {
       return item[rowKey];
     });
-    rowOnChange(setKeys, records);
+    rowOnChange(setKeys, newData);
+    onChange === null || onChange === void 0 || onChange(setKeys, newData);
   };
   var allCancel = function allCancel() {
     rowOnChange([], []);
+    onChange === null || onChange === void 0 || onChange([], []);
   };
   var checkChange = function checkChange(e) {
     var checked = e.target.checked;
@@ -42,8 +53,8 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
     }
     allCancel();
   };
-  var change = function change(_ref3) {
-    var key = _ref3.key;
+  var change = function change(_ref4) {
+    var key = _ref4.key;
     if (key === "check") {
       allCheck();
       return;
@@ -54,12 +65,14 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
     }
     if (key === "checkAll") {
       allSelectChange === null || allSelectChange === void 0 || allSelectChange(true);
+      onChange === null || onChange === void 0 || onChange([], []);
       return;
     }
     allSelectChange === null || allSelectChange === void 0 || allSelectChange(false);
+    onChange === null || onChange === void 0 || onChange([], []);
   };
   var len = (keys === null || keys === void 0 ? void 0 : keys.length) || 0;
-  var dataLen = (records === null || records === void 0 ? void 0 : records.length) || 0;
+  var dataLen = (newData === null || newData === void 0 ? void 0 : newData.length) || 0;
   var checked = len === dataLen && len !== 0;
   var configItems = React.useMemo(function () {
     var fsArray = checked ? {
@@ -86,6 +99,7 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
     });
   };
   var disabled = dataLen === 0;
+  console.log(dataLen, "dadada");
   if (allPageCheck) {
     return jsxRuntime.jsx(antd.Dropdown, {
       overlay: menu,
@@ -105,8 +119,10 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
     disabled: disabled
   });
 };
-var RowSelectionBox = function RowSelectionBox(_ref4) {
-  var data = _ref4.data;
+var RowSelectionBox = function RowSelectionBox(_ref5) {
+  var data = _ref5.data,
+    onChange = _ref5.onChange,
+    getCheckboxProps = _ref5.getCheckboxProps;
   var _useHTableContext2 = context.useHTableContext(),
     selectedRowData = _useHTableContext2.selectedRowData,
     rowOnChange = _useHTableContext2.rowOnChange,
@@ -125,15 +141,22 @@ var RowSelectionBox = function RowSelectionBox(_ref4) {
       newKeys.push(key);
       newRowData.push(data);
       rowOnChange(newKeys, newRowData);
+      onChange === null || onChange === void 0 || onChange(newKeys, newRowData);
       return;
     }
     var index = _indexOfInstanceProperty(newKeys).call(newKeys, key);
     _spliceInstanceProperty(newKeys).call(newKeys, index, 1);
     _spliceInstanceProperty(newRowData).call(newRowData, index, 1);
+    rowOnChange(newKeys, newRowData);
+    onChange === null || onChange === void 0 || onChange(newKeys, newRowData);
   };
+  var _ref6 = (getCheckboxProps === null || getCheckboxProps === void 0 ? void 0 : getCheckboxProps(data)) || {},
+    _ref6$disabled = _ref6.disabled,
+    disabled = _ref6$disabled === void 0 ? false : _ref6$disabled;
   return jsxRuntime.jsx(antd.Checkbox, {
     checked: _indexOfInstanceProperty(keys).call(keys, key) !== -1,
-    onChange: check
+    onChange: check,
+    disabled: disabled
   });
 };
 

package/lib/HTableBody/hooks.d.ts

@@ -830,7 +830,7 @@ export declare const useCols: ({ configData, rowSelection, table }: HTableProps)
         request?: import("@ant-design/pro-utils").ProFieldRequestData | undefined;
         width?: number | undefined;
     } | undefined) | undefined;
-    fieldProps?: (import("antd").CascaderProps<any> | Record<string, any> | import("antd").InputProps | import("antd/lib/input").PasswordProps | import("antd/lib/input").TextAreaProps | import("antd").DatePickerProps | import("antd/lib/date-picker").RangePickerProps | import("antd").TimeRangePickerProps | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | import("antd").CheckboxProps | import("antd").RateProps | import("antd").RadioProps | import("antd").ProgressProps | import("antd").InputNumberProps<string | number> | import("antd").AvatarProps | import("antd").SwitchProps | import("rc-image").ImageProps | import("antd").TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType> | (import("react-color").SketchPickerProps & {
+    fieldProps?: (import("antd").CascaderProps<any> | Record<string, any> | import("antd").InputProps | import("antd").CheckboxProps | import("antd").RadioProps | import("antd/lib/input").PasswordProps | import("antd/lib/input").TextAreaProps | import("antd").DatePickerProps | import("antd/lib/date-picker").RangePickerProps | import("antd").TimeRangePickerProps | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | import("antd").RateProps | import("antd").ProgressProps | import("antd").InputNumberProps<string | number> | import("antd").AvatarProps | import("antd").SwitchProps | import("rc-image").ImageProps | import("antd").TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType> | (import("react-color").SketchPickerProps & {
         value?: string | undefined;
         popoverProps?: import("antd").PopoverProps | undefined;
         mode?: "read" | "edit" | undefined;
@@ -1150,7 +1150,7 @@ export declare const useCols: ({ configData, rowSelection, table }: HTableProps)
         rowKey?: string | undefined;
         rowIndex: number;
         entity: any;
-    }) => import("antd").CascaderProps<any> | Record<string, any> | import("antd").InputProps | import("antd/lib/input").PasswordProps | import("antd/lib/input").TextAreaProps | import("antd").DatePickerProps | import("antd/lib/date-picker").RangePickerProps | import("antd").TimeRangePickerProps | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | import("antd").CheckboxProps | import("antd").RateProps | import("antd").RadioProps | import("antd").ProgressProps | import("antd").InputNumberProps<string | number> | import("antd").AvatarProps | import("antd").SwitchProps | import("rc-image").ImageProps | import("antd").TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType> | (import("react-color").SketchPickerProps & {
+    }) => import("antd").CascaderProps<any> | Record<string, any> | import("antd").InputProps | import("antd").CheckboxProps | import("antd").RadioProps | import("antd/lib/input").PasswordProps | import("antd/lib/input").TextAreaProps | import("antd").DatePickerProps | import("antd/lib/date-picker").RangePickerProps | import("antd").TimeRangePickerProps | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | import("antd").RateProps | import("antd").ProgressProps | import("antd").InputNumberProps<string | number> | import("antd").AvatarProps | import("antd").SwitchProps | import("rc-image").ImageProps | import("antd").TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType> | (import("react-color").SketchPickerProps & {
         value?: string | undefined;
         popoverProps?: import("antd").PopoverProps | undefined;
         mode?: "read" | "edit" | undefined;

package/lib/HTableBody/hooks.js

@@ -20,30 +20,36 @@ var RowSelection = require('./RowSelection.js');
 
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
-var rowSelectionCol = function rowSelectionCol(allPageCheck) {
+var rowSelectionCol = function rowSelectionCol(rowSelection) {
+  var _ref = rowSelection || {},
+    allPageCheck = _ref.allPageCheck,
+    onChange = _ref.onChange,
+    getCheckboxProps = _ref.getCheckboxProps;
   return {
     title: jsxRuntime.jsx(RowSelection.RowSelectionTitle, {
-      allPageCheck: allPageCheck
+      allPageCheck: allPageCheck,
+      onChange: onChange,
+      getCheckboxProps: getCheckboxProps
     }),
     dataIndex: "rowSelectionTitle",
     width: 32,
     render: function render(dom, data) {
       return jsxRuntime.jsx(RowSelection.RowSelectionBox, {
-        data: data
+        data: data,
+        onChange: onChange,
+        getCheckboxProps: getCheckboxProps
       });
     }
   };
 };
-var useCols = function useCols(_ref) {
-  var configData = _ref.configData,
-    rowSelection = _ref.rowSelection,
-    table = _ref.table;
+var useCols = function useCols(_ref2) {
+  var configData = _ref2.configData,
+    rowSelection = _ref2.rowSelection,
+    table = _ref2.table;
   return React.useMemo(function () {
     var colsArray = _toConsumableArray(configData);
     if (rowSelection !== false) {
-      var _ref2 = rowSelection || {},
-        allPageCheck = _ref2.allPageCheck;
-      _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, rowSelectionCol(allPageCheck));
+      _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, rowSelectionCol(rowSelection));
     }
     return _mapInstanceProperty(colsArray).call(colsArray, function (item) {
       var _render = item.render;
@@ -56,7 +62,7 @@ var useCols = function useCols(_ref) {
         }
       });
     });
-  }, [configData, table]);
+  }, [configData, table, rowSelection]);
 };
 var useSynchronousKeys = function useSynchronousKeys(_ref3) {
   var selectedRowKeys = _ref3.selectedRowKeys,

package/lib/HTableBody/index.d.ts

@@ -2,7 +2,8 @@ import type { ProTableProps } from "@ant-design/pro-table";
 import type { ActionRenderFn, ConfigDataModal, ParamsModal } from "../modal";
 import React from "react";
 import type { HTableInstance } from "../modal";
-interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
+import type { HRowSelection } from "../modal";
+interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection"> {
     configData?: ConfigDataModal;
     onPageChange?: (params: ParamsModal) => void;
     emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
@@ -10,6 +11,7 @@ interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
     tableStyle?: React.CSSProperties;
     paginationStyle?: React.CSSProperties;
     actionRender?: ActionRenderFn;
+    rowSelection?: HRowSelection;
 }
 declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, options, actionRender, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/lib/HTableBody/index.js

@@ -55,7 +55,6 @@ var Body = (function (_ref) {
     actionRender = _ref.actionRender,
     props = _objectWithoutProperties(_ref, _excluded);
   var selectedRowKeys = rowSelection.selectedRowKeys;
-    rowSelection.onChange;
   var _useHTableContext = context.useHTableContext(),
     tableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,

package/lib/modal.d.ts

@@ -4,6 +4,7 @@ import type { HItemProps, HFormInstance } from "@hw-component/form/es/Form/modal
 import type { ColProps } from "antd";
 import type React from "react";
 import type { ModalProps } from "antd";
+import type { TableProps } from "antd/lib/table";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];
@@ -33,7 +34,9 @@ export type actionFn = (...arg: any[]) => void;
 export interface RowSelectionOuter {
     allPageCheck?: boolean;
 }
-export type HRowSelection = RowSelectionOuter & ProTableProps<any, any>["rowSelection"];
+export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
+    alwaysShowAlert?: boolean;
+});
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowKey" | "rowSelection"> {
     request?: (params: ParamsModal) => Promise<ResultModal>;
     configData: ConfigDataModal;
@@ -55,7 +58,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     paginationStyle?: React.CSSProperties;
     rowKey?: string;
     allPageCheck?: boolean;
-    rowSelection?: HRowSelection;
+    rowSelection?: HRowSelection | false;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "0.0.4-beta-v19",
+  "version": "0.0.5-beta-v2",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/HTableBody/RowSelection.tsx

@@ -1,12 +1,12 @@
 import { useHTableContext } from "../context";
 import { Checkbox, Dropdown, Menu } from "antd";
 import { useMemo } from "react";
-interface IRowSelectionTitleProps {
-  allPageCheck?: boolean;
-}
+import type { HRowSelection } from "../modal";
 export const RowSelectionTitle = ({
   allPageCheck = true,
-}: IRowSelectionTitleProps) => {
+  onChange,
+  getCheckboxProps,
+}: HRowSelection) => {
   const {
     data,
     selectedRowData,
@@ -15,15 +15,21 @@ export const RowSelectionTitle = ({
     rowKey = "id",
   } = useHTableContext();
   const { records = [] } = data || {};
+  const newData = records?.filter((item) => {
+    const { disabled = false } = getCheckboxProps?.(data) || {};
+    return !disabled;
+  });
   const { keys, selectAll } = selectedRowData;
   const allCheck = () => {
-    const setKeys = records.map((item) => {
+    const setKeys = newData.map((item) => {
       return item[rowKey];
     });
-    rowOnChange(setKeys, records);
+    rowOnChange(setKeys, newData);
+    onChange?.(setKeys, newData);
   };
   const allCancel = () => {
     rowOnChange([], []);
+    onChange?.([], []);
   };
   const checkChange = (e) => {
     const checked = e.target.checked;
@@ -44,12 +50,14 @@ export const RowSelectionTitle = ({
     }
     if (key === "checkAll") {
       allSelectChange?.(true);
+      onChange?.([], []);
       return;
     }
     allSelectChange?.(false);
+    onChange?.([], []);
   };
-  const len = keys?.length||0;
-  const dataLen=records?.length||0;
+  const len = keys?.length || 0;
+  const dataLen = newData?.length || 0;
   const checked = len === dataLen && len !== 0;
   const configItems = useMemo(() => {
     const fsArray = checked
@@ -73,25 +81,38 @@ export const RowSelectionTitle = ({
     return [fsArray, enArray];
   }, [checked, selectAll]);
 
-  const menu = ()=>{
-    const MenuEle=(Menu as any);
-    return <MenuEle onClick={change} items={configItems}/>;
-  }
-  const disabled=dataLen===0;
+  const menu = () => {
+    const MenuEle = Menu as any;
+    return <MenuEle onClick={change} items={configItems} />;
+  };
+  const disabled = dataLen === 0;
+  console.log(dataLen, "dadada");
   if (allPageCheck) {
     return (
       <Dropdown overlay={menu} arrow placement={"bottom"} disabled={disabled}>
-        <Checkbox checked={checked} onChange={checkChange} disabled={disabled}/>
+        <Checkbox
+          checked={checked}
+          onChange={checkChange}
+          disabled={disabled}
+        />
       </Dropdown>
     );
   }
-  return <Checkbox checked={checked} onChange={checkChange} disabled={disabled}/>;
+  return (
+    <Checkbox checked={checked} onChange={checkChange} disabled={disabled} />
+  );
 };
 
 interface RowSelectionBoxProps {
   data: any;
+  onChange?: HRowSelection["onChange"];
+  getCheckboxProps?: HRowSelection["getCheckboxProps"];
 }
-export const RowSelectionBox = ({ data }: RowSelectionBoxProps) => {
+export const RowSelectionBox = ({
+  data,
+  onChange,
+  getCheckboxProps,
+}: RowSelectionBoxProps) => {
   const { selectedRowData, rowOnChange, rowKey = "id" } = useHTableContext();
   const { rowData = [], keys = [] } = selectedRowData;
   const key = data[rowKey];
@@ -103,11 +124,21 @@ export const RowSelectionBox = ({ data }: RowSelectionBoxProps) => {
       newKeys.push(key);
       newRowData.push(data);
       rowOnChange(newKeys, newRowData);
+      onChange?.(newKeys, newRowData);
       return;
     }
     const index = newKeys.indexOf(key);
     newKeys.splice(index, 1);
     newRowData.splice(index, 1);
+    rowOnChange(newKeys, newRowData);
+    onChange?.(newKeys, newRowData);
   };
-  return <Checkbox checked={keys.indexOf(key) !== -1} onChange={check} />;
+  const { disabled = false } = getCheckboxProps?.(data) || {};
+  return (
+    <Checkbox
+      checked={keys.indexOf(key) !== -1}
+      onChange={check}
+      disabled={disabled}
+    />
+  );
 };

package/src/components/HTableBody/hooks.tsx

@@ -4,13 +4,27 @@ import { useEffect, useMemo } from "react";
 import { useHTableContext } from "../context";
 import type { GetRowKey } from "rc-table/lib/interface";
 import { RowSelectionBox, RowSelectionTitle } from "./RowSelection";
-const rowSelectionCol = (allPageCheck?: boolean) => {
+import type { HRowSelection } from "../modal";
+const rowSelectionCol = (rowSelection?: HRowSelection) => {
+  const { allPageCheck, onChange, getCheckboxProps } = rowSelection || {};
   return {
-    title: <RowSelectionTitle allPageCheck={allPageCheck} />,
+    title: (
+      <RowSelectionTitle
+        allPageCheck={allPageCheck}
+        onChange={onChange}
+        getCheckboxProps={getCheckboxProps}
+      />
+    ),
     dataIndex: "rowSelectionTitle",
     width: 32,
     render: (dom, data) => {
-      return <RowSelectionBox data={data} />;
+      return (
+        <RowSelectionBox
+          data={data}
+          onChange={onChange}
+          getCheckboxProps={getCheckboxProps}
+        />
+      );
     },
   };
 };
@@ -18,8 +32,7 @@ export const useCols = ({ configData, rowSelection, table }: HTableProps) => {
   return useMemo(() => {
     const colsArray = [...configData];
     if (rowSelection !== false) {
-      const { allPageCheck } = rowSelection || {};
-      colsArray.splice(0, 0, rowSelectionCol(allPageCheck));
+      colsArray.splice(0, 0, rowSelectionCol(rowSelection));
     }
     return colsArray.map((item) => {
       const { render } = item;
@@ -33,7 +46,7 @@ export const useCols = ({ configData, rowSelection, table }: HTableProps) => {
         },
       };
     });
-  }, [configData, table]);
+  }, [configData, table, rowSelection]);
 };
 interface FilterKeysModal {
   selectedRowKeys?: React.Key[];

package/src/components/HTableBody/index.tsx

@@ -1,6 +1,6 @@
 import type { ProTableProps } from "@ant-design/pro-table";
 import ProTable from "@ant-design/pro-table";
-import type {ActionRenderFn, ConfigDataModal, ParamsModal} from "../modal";
+import type { ActionRenderFn, ConfigDataModal, ParamsModal } from "../modal";
 import { useCols, useSynchronousKeys } from "./hooks";
 import { useHTableContext } from "../context";
 import type { DetailedReactHTMLElement } from "react";
@@ -11,7 +11,9 @@ import { useHTableConfigContext } from "../TableConfig";
 import HTablePagination from "../HTablePagination";
 import { useClassName } from "../hooks";
 import AlertMsg from "./AlertMsg";
-interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
+import type { HRowSelection } from "../modal";
+interface HTableBodyProps
+  extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection"> {
   configData?: ConfigDataModal;
   onPageChange?: (params: ParamsModal) => void;
   emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
@@ -21,7 +23,8 @@ interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
   ) => React.ReactNode;
   tableStyle?: React.CSSProperties;
   paginationStyle?: React.CSSProperties;
-  actionRender?:ActionRenderFn
+  actionRender?: ActionRenderFn;
+  rowSelection?: HRowSelection;
 }
 const defaultRender = () => {
   return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />;
@@ -43,11 +46,11 @@ export default ({
   paginationStyle,
   headerTitle,
   options,
-                  actionRender,
+  actionRender,
   ...props
 }: HTableBodyProps) => {
   // @ts-ignore
-  const { selectedRowKeys, onChange } = rowSelection;
+  const { selectedRowKeys } = rowSelection;
   const {
     tableInstance,
     configData: contextConfigData,
@@ -97,7 +100,10 @@ export default ({
         )}
         {alwaysShowAlert && (
           <div style={contentStyle}>
-            <Alert message={<AlertMsg actionRender={actionRender}/>} type="info" />
+            <Alert
+              message={<AlertMsg actionRender={actionRender} />}
+              type="info"
+            />
           </div>
         )}
         <ProTable

package/src/components/TableCustomize.tsx

@@ -12,7 +12,7 @@ const Index: React.FC<HTableProps> = ({
   table,
   action = {},
   children,
-                                          rowKey,
+  rowKey,
   ...props
 }) => {
   const { run, loading, data, error, saveParams } = useReq({
@@ -57,7 +57,7 @@ const Index: React.FC<HTableProps> = ({
         },
         onPageChange: tableInstance.table.reloadWithParams,
         setSelectedRowData,
-          rowKey,
+        rowKey,
       }}
     >
       {children}

package/src/components/modal.ts

@@ -7,6 +7,7 @@ import type {
 import type { ColProps } from "antd";
 import type React from "react";
 import type { ModalProps } from "antd";
+import type { TableProps } from "antd/lib/table";
 
 export interface RowObj {
   keys?: React.Key[];
@@ -57,7 +58,9 @@ export interface RowSelectionOuter {
   allPageCheck?: boolean;
 }
 export type HRowSelection = RowSelectionOuter &
-  ProTableProps<any, any>["rowSelection"];
+  (TableProps<any>["rowSelection"] & {
+    alwaysShowAlert?: boolean;
+  });
 export interface HTableProps
   extends Omit<
     ProTableProps<any, any>,
@@ -86,7 +89,7 @@ export interface HTableProps
   paginationStyle?: React.CSSProperties;
   rowKey?: string;
   allPageCheck?: boolean;
-  rowSelection?: HRowSelection;
+  rowSelection?: HRowSelection | false;
 }
 export interface TableInstance {
   reload: (params?: ParamsModal) => Promise<any>;

package/src/pages/Table/index.tsx

@@ -36,16 +36,14 @@ export default () => {
           configData={configData}
           rowKey={"id"}
           table={hTable}
-          rowSelection={{
-
-          }}
+          rowSelection={{}}
           options={{
             reload: false,
             setting: false,
             density: false,
           }}
-          actionRender={()=>{
-            return <Button>你大爷</Button>
+          actionRender={() => {
+            return <Button>你大爷</Button>;
           }}
           headerTitle={<Button type={"primary"}>操作</Button>}
           request={(params) => {

package/src/pages/TableCustomize/index.tsx

@@ -65,6 +65,11 @@ export default () => {
           pagination={false}
           scroll={{ x: 1000, y: 100 }}
           headerTitle={<AddBtn />}
+          rowSelection={{
+            onChange: () => {
+              console.log("rowSelection");
+            },
+          }}
         />
       </Space>
     </TableCustomize>

package/src/routes.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { Navigate } from "react-router-dom";
 import Table from "./pages/Table";
 import ModalTable from "./pages/ModalTable";
-import TableCustomize from './pages/TableCustomize'
+import TableCustomize from "./pages/TableCustomize";
 export interface RouteModal {
   path?: string;
   name?: string;