@hw-component/table 1.10.46 → 1.10.48

package/es/HTableBody/hooks/useControl.d.ts

@@ -12,7 +12,9 @@ interface FilterKeysModal {
     selectedRowKeys?: React.Key[];
     records?: any[];
     rowKey?: string | GetRowKey<any>;
+    preserveSelectedRowKeys?: boolean;
+    selectedRowData?: Record<string, any>[];
 }
-export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, }: FilterKeysModal) => void;
+export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, preserveSelectedRowKeys, selectedRowData }: FilterKeysModal) => void;
 export declare const useAlwaysShowAlert: (selectedRowData: RowObj, alwaysShowAlert?: boolean) => boolean | undefined;
 export {};

package/es/HTableBody/hooks/useControl.js

@@ -1,9 +1,11 @@
 // welcome to hoo hoo hoo
+import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/for-each';
 import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
 import _Object$keys from '@babel/runtime-corejs3/core-js-stable/object/keys';
 import _findIndexInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/find-index';
+import _concatInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/concat';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 import _keysInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/keys';
 import { useState, useEffect, useMemo } from 'react';
@@ -87,25 +89,33 @@ var useTableChange = function useTableChange(_ref) {
 var useSynchronousKeys = function useSynchronousKeys(_ref4) {
   var selectedRowKeys = _ref4.selectedRowKeys,
     records = _ref4.records,
-    rowKey = _ref4.rowKey;
+    rowKey = _ref4.rowKey,
+    preserveSelectedRowKeys = _ref4.preserveSelectedRowKeys;
+    _ref4.selectedRowData;
   var _useHTableContext = useHTableContext(),
     rowOnChange = _useHTableContext.rowOnChange;
   var findId = function findId(key) {
+    var _context, _context2;
+    var mgArray = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     var msRecords = records;
-    var rowIndex = _findIndexInstanceProperty(msRecords).call(msRecords, function (item, index) {
+    var rowIndex = _findIndexInstanceProperty(_context = _concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray(mgArray), _toConsumableArray(msRecords))).call(_context, function (item, index) {
       var id = typeof rowKey === "function" ? rowKey(item, index) : item[rowKey];
       return id === key;
     });
     return msRecords[rowIndex];
   };
   useEffect(function () {
-    if (selectedRowKeys && records && rowKey) {
+    if (!selectedRowKeys || !records || !rowKey) {
+      return;
+    }
+    if (!preserveSelectedRowKeys) {
       var resultData = _mapInstanceProperty(selectedRowKeys).call(selectedRowKeys, function (key) {
         return findId(key);
       });
       rowOnChange(selectedRowKeys, resultData);
+      return;
     }
-  }, [selectedRowKeys, records, rowKey]);
+  }, [selectedRowKeys, records, rowKey, preserveSelectedRowKeys]);
 };
 var useAlwaysShowAlert = function useAlwaysShowAlert(selectedRowData, alwaysShowAlert) {
   var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),

package/es/HTableBody/index.js

@@ -62,7 +62,8 @@ var Body = (function (bodyProps) {
     props = _objectWithoutProperties(bodyProps, _excluded);
   var _ref = rowSelection || {},
     selectedRowKeys = _ref.selectedRowKeys,
-    configAlwaysShowAlert = _ref.alwaysShowAlert;
+    configAlwaysShowAlert = _ref.alwaysShowAlert,
+    preserveSelectedRowKeys = _ref.preserveSelectedRowKeys;
   var _useHTableContext = useHTableContext(),
     contextTableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,
@@ -108,7 +109,9 @@ var Body = (function (bodyProps) {
   useSynchronousKeys({
     selectedRowKeys: selectedRowKeys,
     records: records,
-    rowKey: rowKey
+    rowKey: rowKey,
+    preserveSelectedRowKeys: preserveSelectedRowKeys,
+    selectedRowData: selectedRowData.rowData
   });
   var optionsNode = options && jsx(Options, _objectSpread(_objectSpread({
     reload: function reload() {

package/es/hooks/useRowObj.js

@@ -2,6 +2,17 @@
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import { useState } from 'react';
 
+var initSelectedData = function initSelectedData(rowSelection) {
+  if (!rowSelection) {
+    return {};
+  }
+  var selectedRowKeys = rowSelection.selectedRowKeys,
+    selectedRowData = rowSelection.selectedRowData;
+  return {
+    keys: selectedRowKeys,
+    rowData: selectedRowData
+  };
+};
 var useRowObj = (function (rowSelection) {
   var change = function change(keys, rowData) {
     if (rowSelection === false) {
@@ -11,7 +22,7 @@ var useRowObj = (function (rowSelection) {
       onChange = _ref.onChange;
     onChange === null || onChange === void 0 || onChange(keys, rowData);
   };
-  var _useState = useState({}),
+  var _useState = useState(initSelectedData(rowSelection)),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowData = _useState2[0],
     setSelectedRowData = _useState2[1];

package/es/modal.d.ts

@@ -52,6 +52,7 @@ export interface RowSelectionOuter {
 export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
     alwaysShowAlert?: boolean;
     allCheckType?: "batch" | "single";
+    selectedRowData?: Record<string, any>[];
 });
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowSelection" | "pagination"> {
     request?: (params: ParamsModal) => Promise<ResultModal>;

package/lib/HTableBody/hooks/useControl.d.ts

@@ -12,7 +12,9 @@ interface FilterKeysModal {
     selectedRowKeys?: React.Key[];
     records?: any[];
     rowKey?: string | GetRowKey<any>;
+    preserveSelectedRowKeys?: boolean;
+    selectedRowData?: Record<string, any>[];
 }
-export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, }: FilterKeysModal) => void;
+export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, preserveSelectedRowKeys, selectedRowData }: FilterKeysModal) => void;
 export declare const useAlwaysShowAlert: (selectedRowData: RowObj, alwaysShowAlert?: boolean) => boolean | undefined;
 export {};

package/lib/HTableBody/hooks/useControl.js

@@ -1,10 +1,12 @@
 'use strict';
 
+var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
 var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
 var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
 var _findIndexInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find-index');
+var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/keys');
 var React = require('react');
@@ -88,25 +90,33 @@ var useTableChange = function useTableChange(_ref) {
 var useSynchronousKeys = function useSynchronousKeys(_ref4) {
   var selectedRowKeys = _ref4.selectedRowKeys,
     records = _ref4.records,
-    rowKey = _ref4.rowKey;
+    rowKey = _ref4.rowKey,
+    preserveSelectedRowKeys = _ref4.preserveSelectedRowKeys;
+    _ref4.selectedRowData;
   var _useHTableContext = context.useHTableContext(),
     rowOnChange = _useHTableContext.rowOnChange;
   var findId = function findId(key) {
+    var _context, _context2;
+    var mgArray = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     var msRecords = records;
-    var rowIndex = _findIndexInstanceProperty(msRecords).call(msRecords, function (item, index) {
+    var rowIndex = _findIndexInstanceProperty(_context = _concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray(mgArray), _toConsumableArray(msRecords))).call(_context, function (item, index) {
       var id = typeof rowKey === "function" ? rowKey(item, index) : item[rowKey];
       return id === key;
     });
     return msRecords[rowIndex];
   };
   React.useEffect(function () {
-    if (selectedRowKeys && records && rowKey) {
+    if (!selectedRowKeys || !records || !rowKey) {
+      return;
+    }
+    if (!preserveSelectedRowKeys) {
       var resultData = _mapInstanceProperty(selectedRowKeys).call(selectedRowKeys, function (key) {
         return findId(key);
       });
       rowOnChange(selectedRowKeys, resultData);
+      return;
     }
-  }, [selectedRowKeys, records, rowKey]);
+  }, [selectedRowKeys, records, rowKey, preserveSelectedRowKeys]);
 };
 var useAlwaysShowAlert = function useAlwaysShowAlert(selectedRowData, alwaysShowAlert) {
   var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),

package/lib/HTableBody/index.js

@@ -65,7 +65,8 @@ var Body = (function (bodyProps) {
     props = _objectWithoutProperties(bodyProps, _excluded);
   var _ref = rowSelection || {},
     selectedRowKeys = _ref.selectedRowKeys,
-    configAlwaysShowAlert = _ref.alwaysShowAlert;
+    configAlwaysShowAlert = _ref.alwaysShowAlert,
+    preserveSelectedRowKeys = _ref.preserveSelectedRowKeys;
   var _useHTableContext = context.useHTableContext(),
     contextTableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,
@@ -111,7 +112,9 @@ var Body = (function (bodyProps) {
   useControl.useSynchronousKeys({
     selectedRowKeys: selectedRowKeys,
     records: records,
-    rowKey: rowKey
+    rowKey: rowKey,
+    preserveSelectedRowKeys: preserveSelectedRowKeys,
+    selectedRowData: selectedRowData.rowData
   });
   var optionsNode = options && jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
     reload: function reload() {

package/lib/hooks/useRowObj.js

@@ -5,6 +5,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var React = require('react');
 
+var initSelectedData = function initSelectedData(rowSelection) {
+  if (!rowSelection) {
+    return {};
+  }
+  var selectedRowKeys = rowSelection.selectedRowKeys,
+    selectedRowData = rowSelection.selectedRowData;
+  return {
+    keys: selectedRowKeys,
+    rowData: selectedRowData
+  };
+};
 var useRowObj = (function (rowSelection) {
   var change = function change(keys, rowData) {
     if (rowSelection === false) {
@@ -14,7 +25,7 @@ var useRowObj = (function (rowSelection) {
       onChange = _ref.onChange;
     onChange === null || onChange === void 0 || onChange(keys, rowData);
   };
-  var _useState = React.useState({}),
+  var _useState = React.useState(initSelectedData(rowSelection)),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowData = _useState2[0],
     setSelectedRowData = _useState2[1];

package/lib/modal.d.ts

@@ -52,6 +52,7 @@ export interface RowSelectionOuter {
 export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
     alwaysShowAlert?: boolean;
     allCheckType?: "batch" | "single";
+    selectedRowData?: Record<string, any>[];
 });
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowSelection" | "pagination"> {
     request?: (params: ParamsModal) => Promise<ResultModal>;

package/package.json

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

package/src/components/HTableBody/hooks/useControl.tsx

@@ -78,17 +78,21 @@ interface FilterKeysModal {
   selectedRowKeys?: React.Key[];
   records?: any[];
   rowKey?: string | GetRowKey<any>;
+  preserveSelectedRowKeys?: boolean;
+  selectedRowData?:Record<string, any>[];
 }
 
 export const useSynchronousKeys = ({
   selectedRowKeys,
   records,
   rowKey,
+  preserveSelectedRowKeys,
+                                     selectedRowData
 }: FilterKeysModal) => {
   const { rowOnChange } = useHTableContext();
-  const findId = (key) => {
+  const findId = (key,mgArray:Record<string, any>[]=[]) => {
     const msRecords = records as any[];
-    const rowIndex = msRecords.findIndex((item, index) => {
+    const rowIndex = [...mgArray,...msRecords].findIndex((item, index) => {
       const id =
         typeof rowKey === "function"
           ? rowKey(item, index)
@@ -97,14 +101,23 @@ export const useSynchronousKeys = ({
     });
     return msRecords[rowIndex];
   };
+  const deduplication=(array)=>{
+
+  }
   useEffect(() => {
-    if (selectedRowKeys && records && rowKey) {
+    if (!selectedRowKeys||!records||!rowKey) {
+       return;
+    }
+    if (!preserveSelectedRowKeys) {
       const resultData = selectedRowKeys.map((key) => {
         return findId(key);
       });
       rowOnChange(selectedRowKeys, resultData);
+      return;
     }
-  }, [selectedRowKeys, records, rowKey]);
+  }, [selectedRowKeys, records, rowKey,preserveSelectedRowKeys]);
+
+
 };
 
 export const useAlwaysShowAlert = (

package/src/components/HTableBody/index.tsx

@@ -50,7 +50,7 @@ export default (bodyProps: HTableBodyProps) => {
     ...props
   } = bodyProps;
 
-  const { selectedRowKeys, alwaysShowAlert: configAlwaysShowAlert } =
+  const { selectedRowKeys, alwaysShowAlert: configAlwaysShowAlert,preserveSelectedRowKeys } =
     rowSelection || {};
 
   const {
@@ -90,8 +90,7 @@ export default (bodyProps: HTableBodyProps) => {
       columnsState,
       columns: cols,
     });
-  useSynchronousKeys({ selectedRowKeys, records, rowKey });
-
+  useSynchronousKeys({ selectedRowKeys, records, rowKey,preserveSelectedRowKeys,selectedRowData:selectedRowData.rowData });
   const optionsNode = options && (
     <Options
       reload={() => {

package/src/components/Table.tsx

@@ -31,7 +31,7 @@ export default ({
   loading: propsLoading,
   error: propsError,
   rowSelection,
-                  defaultHeaderOpen,
+  defaultHeaderOpen,
   ...props
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({

package/src/components/hooks/useRowObj.ts

@@ -3,6 +3,19 @@ import { useState } from "react";
 import type { RowObj } from "../modal";
 import type { HRowSelection } from "../modal";
 
+const initSelectedData=(rowSelection?: HRowSelection | false):RowObj=>{
+   if (!rowSelection) {
+     return {
+
+     }
+   }
+   const {selectedRowKeys,selectedRowData}=rowSelection;
+   return  {
+     keys: selectedRowKeys,
+     rowData: selectedRowData
+   }
+}
+
 export default (rowSelection?: HRowSelection | false) => {
   const change = (keys: React.Key[], rowData: any[]) => {
     if (rowSelection === false) {
@@ -11,7 +24,7 @@ export default (rowSelection?: HRowSelection | false) => {
     const { onChange } = rowSelection || {};
     onChange?.(keys, rowData);
   };
-  const [selectedRowData, setSelectedRowData] = useState<RowObj>({});
+  const [selectedRowData, setSelectedRowData] = useState<RowObj>(initSelectedData(rowSelection));
   const { selectAll = false } = selectedRowData;
   const rowOnChange = (keys: React.Key[], rowData: any[]) => {
     setSelectedRowData({

package/src/components/modal.ts

@@ -81,6 +81,7 @@ export type HRowSelection = RowSelectionOuter &
   (TableProps<any>["rowSelection"] & {
     alwaysShowAlert?: boolean;
     allCheckType?: "batch" | "single";
+    selectedRowData?:Record<string, any> [];
   });
 export interface HTableProps
   extends Omit<

package/src/pages/Table/index.tsx

@@ -88,7 +88,6 @@ export const configData = () => {
   ];
 };
 const listReq = (params) => {
-  console.log(params, "params");
   return new Promise((resolve) => {
     setTimeout(() => {
       const { current } = params;
@@ -260,6 +259,8 @@ export default () => {
                 console.log(keys, rowData);
               },
               allCheckType: "batch",
+              selectedRowKeys:["1-1"],
+              selectedRowData:[{id:"1-1"}]
             }}
             affixProps={{
               target: () => document.querySelector(".body"),