@hw-component/table 1.2.2 → 1.2.3

package/es/HTableBody/RowSelection.d.ts

@@ -4,6 +4,7 @@ interface RowSelectionBoxProps {
     data: any;
     onChange?: HRowSelection["onChange"];
     getCheckboxProps?: HRowSelection["getCheckboxProps"];
+    index: number;
 }
-export declare const RowSelectionBox: ({ data, onChange, getCheckboxProps, }: RowSelectionBoxProps) => JSX.Element;
+export declare const RowSelectionBox: ({ data, onChange, index, getCheckboxProps, }: RowSelectionBoxProps) => JSX.Element;
 export {};

package/es/HTableBody/RowSelection.js

@@ -34,8 +34,8 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
   var keys = _keysInstanceProperty(selectedRowData),
     selectAll = selectedRowData.selectAll;
   var allCheck = function allCheck() {
-    var setKeys = _mapInstanceProperty(newData).call(newData, function (item) {
-      return item[rowKey];
+    var setKeys = _mapInstanceProperty(newData).call(newData, function (item, index) {
+      return typeof rowKey === "function" ? rowKey(item, index) : item[rowKey];
     });
     rowOnChange(setKeys, newData);
     onChange === null || onChange === void 0 || onChange(setKeys, newData);
@@ -120,6 +120,7 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
 var RowSelectionBox = function RowSelectionBox(_ref5) {
   var data = _ref5.data,
     onChange = _ref5.onChange,
+    index = _ref5.index,
     getCheckboxProps = _ref5.getCheckboxProps;
   var _useHTableContext2 = useHTableContext(),
     selectedRowData = _useHTableContext2.selectedRowData,
@@ -130,7 +131,7 @@ var RowSelectionBox = function RowSelectionBox(_ref5) {
     rowData = _selectedRowData$rowD === void 0 ? [] : _selectedRowData$rowD,
     _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
     keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys;
-  var key = data[rowKey];
+  var key = typeof rowKey === "function" ? rowKey(data, index) : data[rowKey];
   var check = function check(e) {
     var checked = e.target.checked;
     var newKeys = _toConsumableArray(keys);

package/es/HTableBody/hooks.js

@@ -34,9 +34,10 @@ var rowSelectionCol = function rowSelectionCol(rowSelection) {
     width: 32,
     rowSelectionTitle: true,
     fixed: "left",
-    render: function render(dom, data) {
+    render: function render(dom, data, index) {
       return jsx(RowSelectionBox, {
         data: data,
+        index: index,
         onChange: onChange,
         getCheckboxProps: getCheckboxProps
       });

package/es/HTableBody/index.js

@@ -63,11 +63,9 @@ var Body = (function (_ref) {
     tableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,
     data = _useHTableContext.data,
-    selectedRowData = _useHTableContext.selectedRowData;
-    _useHTableContext.rowOnChange;
-    var error = _useHTableContext.error,
+    selectedRowData = _useHTableContext.selectedRowData,
+    error = _useHTableContext.error,
     loading = _useHTableContext.loading;
-    _useHTableContext.allSelectChange;
   var _useHTableConfigConte = useHTableConfigContext({
       emptyRender: emptyRender,
       errorRender: errorRender

package/es/context.d.ts

@@ -13,7 +13,6 @@ interface HContextModal extends Omit<HTableProps, "request"> {
     onFinish: (value: Record<string, any>) => Promise<any>;
     onPageChange: (value: Record<string, any>) => Promise<any>;
     setSelectedRowData: (row: RowObj) => void;
-    rowKey?: string;
     headerOpen?: boolean;
     setHeaderOpen: Dispatch<SetStateAction<boolean | undefined>>;
 }

package/es/modal.d.ts

@@ -42,6 +42,7 @@ export type actionFn = (...arg: any[]) => void;
 export interface RowSelectionOuter {
     allPageCheck?: boolean;
 }
+type RowKeyFn = (data: any, index: number) => string;
 export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
     alwaysShowAlert?: boolean;
 });
@@ -64,7 +65,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     manual?: boolean;
     dataSource?: ResultModal;
     paginationStyle?: React.CSSProperties;
-    rowKey?: string;
+    rowKey?: string | RowKeyFn;
     allPageCheck?: boolean;
     rowSelection?: HRowSelection | false;
     affixProps?: AffixProps | false;

package/lib/HTableBody/RowSelection.d.ts

@@ -4,6 +4,7 @@ interface RowSelectionBoxProps {
     data: any;
     onChange?: HRowSelection["onChange"];
     getCheckboxProps?: HRowSelection["getCheckboxProps"];
+    index: number;
 }
-export declare const RowSelectionBox: ({ data, onChange, getCheckboxProps, }: RowSelectionBoxProps) => JSX.Element;
+export declare const RowSelectionBox: ({ data, onChange, index, getCheckboxProps, }: RowSelectionBoxProps) => JSX.Element;
 export {};

package/lib/HTableBody/RowSelection.js

@@ -35,8 +35,8 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
   var keys = _keysInstanceProperty(selectedRowData),
     selectAll = selectedRowData.selectAll;
   var allCheck = function allCheck() {
-    var setKeys = _mapInstanceProperty(newData).call(newData, function (item) {
-      return item[rowKey];
+    var setKeys = _mapInstanceProperty(newData).call(newData, function (item, index) {
+      return typeof rowKey === "function" ? rowKey(item, index) : item[rowKey];
     });
     rowOnChange(setKeys, newData);
     onChange === null || onChange === void 0 || onChange(setKeys, newData);
@@ -121,6 +121,7 @@ var RowSelectionTitle = function RowSelectionTitle(_ref) {
 var RowSelectionBox = function RowSelectionBox(_ref5) {
   var data = _ref5.data,
     onChange = _ref5.onChange,
+    index = _ref5.index,
     getCheckboxProps = _ref5.getCheckboxProps;
   var _useHTableContext2 = context.useHTableContext(),
     selectedRowData = _useHTableContext2.selectedRowData,
@@ -131,7 +132,7 @@ var RowSelectionBox = function RowSelectionBox(_ref5) {
     rowData = _selectedRowData$rowD === void 0 ? [] : _selectedRowData$rowD,
     _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
     keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys;
-  var key = data[rowKey];
+  var key = typeof rowKey === "function" ? rowKey(data, index) : data[rowKey];
   var check = function check(e) {
     var checked = e.target.checked;
     var newKeys = _toConsumableArray(keys);

package/lib/HTableBody/hooks.js

@@ -35,9 +35,10 @@ var rowSelectionCol = function rowSelectionCol(rowSelection) {
     width: 32,
     rowSelectionTitle: true,
     fixed: "left",
-    render: function render(dom, data) {
+    render: function render(dom, data, index) {
       return jsxRuntime.jsx(RowSelection.RowSelectionBox, {
         data: data,
+        index: index,
         onChange: onChange,
         getCheckboxProps: getCheckboxProps
       });

package/lib/HTableBody/index.js

@@ -66,11 +66,9 @@ var Body = (function (_ref) {
     tableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,
     data = _useHTableContext.data,
-    selectedRowData = _useHTableContext.selectedRowData;
-    _useHTableContext.rowOnChange;
-    var error = _useHTableContext.error,
+    selectedRowData = _useHTableContext.selectedRowData,
+    error = _useHTableContext.error,
     loading = _useHTableContext.loading;
-    _useHTableContext.allSelectChange;
   var _useHTableConfigConte = TableConfig.useHTableConfigContext({
       emptyRender: emptyRender,
       errorRender: errorRender

package/lib/context.d.ts

@@ -13,7 +13,6 @@ interface HContextModal extends Omit<HTableProps, "request"> {
     onFinish: (value: Record<string, any>) => Promise<any>;
     onPageChange: (value: Record<string, any>) => Promise<any>;
     setSelectedRowData: (row: RowObj) => void;
-    rowKey?: string;
     headerOpen?: boolean;
     setHeaderOpen: Dispatch<SetStateAction<boolean | undefined>>;
 }

package/lib/modal.d.ts

@@ -42,6 +42,7 @@ export type actionFn = (...arg: any[]) => void;
 export interface RowSelectionOuter {
     allPageCheck?: boolean;
 }
+type RowKeyFn = (data: any, index: number) => string;
 export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
     alwaysShowAlert?: boolean;
 });
@@ -64,7 +65,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     manual?: boolean;
     dataSource?: ResultModal;
     paginationStyle?: React.CSSProperties;
-    rowKey?: string;
+    rowKey?: string | RowKeyFn;
     allPageCheck?: boolean;
     rowSelection?: HRowSelection | false;
     affixProps?: AffixProps | false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/HTableBody/RowSelection.tsx

@@ -21,8 +21,8 @@ export const RowSelectionTitle = ({
   });
   const { keys, selectAll } = selectedRowData;
   const allCheck = () => {
-    const setKeys = newData.map((item) => {
-      return item[rowKey];
+    const setKeys = newData.map((item,index) => {
+      return typeof rowKey==="function"?rowKey(item,index):item[(rowKey as string)];
     });
     rowOnChange(setKeys, newData);
     onChange?.(setKeys, newData);
@@ -106,15 +106,17 @@ interface RowSelectionBoxProps {
   data: any;
   onChange?: HRowSelection["onChange"];
   getCheckboxProps?: HRowSelection["getCheckboxProps"];
+  index:number;
 }
 export const RowSelectionBox = ({
   data,
   onChange,
+                                  index,
   getCheckboxProps,
 }: RowSelectionBoxProps) => {
   const { selectedRowData, rowOnChange, rowKey = "id" } = useHTableContext();
   const { rowData = [], keys = [] } = selectedRowData;
-  const key = data[rowKey];
+  const key = typeof rowKey==="function"?rowKey(data,index):data[rowKey];
   const check = (e) => {
     const checked = e.target.checked;
     const newKeys = [...keys];

package/src/components/HTableBody/hooks.tsx

@@ -25,10 +25,11 @@ const rowSelectionCol = (rowSelection?: HRowSelection) => {
     width: 32,
     rowSelectionTitle: true,
     fixed: "left",
-    render: (dom, data) => {
+    render: (dom, data,index) => {
       return (
         <RowSelectionBox
           data={data}
+          index={index}
           onChange={onChange}
           getCheckboxProps={getCheckboxProps}
         />

package/src/components/HTableBody/index.tsx

@@ -83,10 +83,8 @@ export default ({
     configData: contextConfigData,
     data,
     selectedRowData,
-    rowOnChange,
     error,
     loading,
-    allSelectChange,
   } = useHTableContext();
   const {
     emptyRender: tableEmptyRender = defaultRender,
@@ -151,6 +149,7 @@ export default ({
        >
           <ProTable
               {...props}
+
               columnsState={{
                 ...selfColStatus,
                 value,

package/src/components/context.ts

@@ -14,7 +14,6 @@ interface HContextModal extends Omit<HTableProps, "request"> {
   onFinish: (value: Record<string, any>) => Promise<any>;
   onPageChange: (value: Record<string, any>) => Promise<any>;
   setSelectedRowData: (row: RowObj) => void;
-  rowKey?: string;
   headerOpen?: boolean;
   setHeaderOpen: Dispatch<SetStateAction<boolean | undefined>>;
 }

package/src/components/modal.ts

@@ -66,6 +66,7 @@ export type actionFn = (...arg) => void;
 export interface RowSelectionOuter {
   allPageCheck?: boolean;
 }
+type RowKeyFn=(data:any,index:number)=>string;
 export type HRowSelection = RowSelectionOuter &
   (TableProps<any>["rowSelection"] & {
     alwaysShowAlert?: boolean;
@@ -96,7 +97,7 @@ export interface HTableProps
   manual?: boolean;
   dataSource?: ResultModal;
   paginationStyle?: React.CSSProperties;
-  rowKey?: string;
+  rowKey?: string|RowKeyFn;
   allPageCheck?: boolean;
   rowSelection?: HRowSelection | false;
   affixProps?: AffixProps | false;

package/src/pages/Table/index.tsx

@@ -77,7 +77,9 @@ export default () => {
         <HTableConfig>
           <HTable
               configData={configData}
-              rowKey={"id"}
+              rowKey={(data,index)=>{
+                 return index;
+              }}
               table={hTable}
               onReset={() => {
                 hTable.form.setFieldsValue({