@hw-component/table 1.10.46 → 1.10.47

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/es/HTableBody/hooks/useControl.d.ts +2 -1
  2. package/es/HTableBody/hooks/useControl.js +7 -3
  3. package/es/HTableBody/index.js +4 -2
  4. package/lib/HTableBody/hooks/useControl.d.ts +2 -1
  5. package/lib/HTableBody/hooks/useControl.js +7 -3
  6. package/lib/HTableBody/index.js +4 -2
  7. package/package.json +1 -1
  8. package/src/components/HTableBody/hooks/useControl.tsx +7 -2
  9. package/src/components/HTableBody/index.tsx +2 -2
  10. package/src/components/Table.tsx +1 -1
package/es/HTableBody/hooks/useControl.d.ts CHANGED
@@ -12,7 +12,8 @@ interface FilterKeysModal {
12
12
  selectedRowKeys?: React.Key[];
13
13
  records?: any[];
14
14
  rowKey?: string | GetRowKey<any>;
15
+ preserveSelectedRowKeys?: boolean;
15
16
  }
16
- export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, }: FilterKeysModal) => void;
17
+ export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, preserveSelectedRowKeys }: FilterKeysModal) => void;
17
18
  export declare const useAlwaysShowAlert: (selectedRowData: RowObj, alwaysShowAlert?: boolean) => boolean | undefined;
18
19
  export {};
package/es/HTableBody/hooks/useControl.js CHANGED
@@ -87,7 +87,8 @@ var useTableChange = function useTableChange(_ref) {
87
87
  var useSynchronousKeys = function useSynchronousKeys(_ref4) {
88
88
  var selectedRowKeys = _ref4.selectedRowKeys,
89
89
  records = _ref4.records,
90
- rowKey = _ref4.rowKey;
90
+ rowKey = _ref4.rowKey,
91
+ preserveSelectedRowKeys = _ref4.preserveSelectedRowKeys;
91
92
  var _useHTableContext = useHTableContext(),
92
93
  rowOnChange = _useHTableContext.rowOnChange;
93
94
  var findId = function findId(key) {
@@ -99,13 +100,16 @@ var useSynchronousKeys = function useSynchronousKeys(_ref4) {
99
100
  return msRecords[rowIndex];
100
101
  };
101
102
  useEffect(function () {
102
- if (selectedRowKeys && records && rowKey) {
103
+ if (!selectedRowKeys || !records || !rowKey) {
104
+ return;
105
+ }
106
+ if (!preserveSelectedRowKeys) {
103
107
  var resultData = _mapInstanceProperty(selectedRowKeys).call(selectedRowKeys, function (key) {
104
108
  return findId(key);
105
109
  });
106
110
  rowOnChange(selectedRowKeys, resultData);
107
111
  }
108
- }, [selectedRowKeys, records, rowKey]);
112
+ }, [selectedRowKeys, records, rowKey, preserveSelectedRowKeys]);
109
113
  };
110
114
  var useAlwaysShowAlert = function useAlwaysShowAlert(selectedRowData, alwaysShowAlert) {
111
115
  var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
package/es/HTableBody/index.js CHANGED
@@ -62,7 +62,8 @@ var Body = (function (bodyProps) {
62
62
  props = _objectWithoutProperties(bodyProps, _excluded);
63
63
  var _ref = rowSelection || {},
64
64
  selectedRowKeys = _ref.selectedRowKeys,
65
- configAlwaysShowAlert = _ref.alwaysShowAlert;
65
+ configAlwaysShowAlert = _ref.alwaysShowAlert,
66
+ preserveSelectedRowKeys = _ref.preserveSelectedRowKeys;
66
67
  var _useHTableContext = useHTableContext(),
67
68
  contextTableInstance = _useHTableContext.tableInstance,
68
69
  contextConfigData = _useHTableContext.configData,
@@ -108,7 +109,8 @@ var Body = (function (bodyProps) {
108
109
  useSynchronousKeys({
109
110
  selectedRowKeys: selectedRowKeys,
110
111
  records: records,
111
- rowKey: rowKey
112
+ rowKey: rowKey,
113
+ preserveSelectedRowKeys: preserveSelectedRowKeys
112
114
  });
113
115
  var optionsNode = options && jsx(Options, _objectSpread(_objectSpread({
114
116
  reload: function reload() {
package/lib/HTableBody/hooks/useControl.d.ts CHANGED
@@ -12,7 +12,8 @@ interface FilterKeysModal {
12
12
  selectedRowKeys?: React.Key[];
13
13
  records?: any[];
14
14
  rowKey?: string | GetRowKey<any>;
15
+ preserveSelectedRowKeys?: boolean;
15
16
  }
16
- export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, }: FilterKeysModal) => void;
17
+ export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, preserveSelectedRowKeys }: FilterKeysModal) => void;
17
18
  export declare const useAlwaysShowAlert: (selectedRowData: RowObj, alwaysShowAlert?: boolean) => boolean | undefined;
18
19
  export {};
package/lib/HTableBody/hooks/useControl.js CHANGED
@@ -88,7 +88,8 @@ var useTableChange = function useTableChange(_ref) {
88
88
  var useSynchronousKeys = function useSynchronousKeys(_ref4) {
89
89
  var selectedRowKeys = _ref4.selectedRowKeys,
90
90
  records = _ref4.records,
91
- rowKey = _ref4.rowKey;
91
+ rowKey = _ref4.rowKey,
92
+ preserveSelectedRowKeys = _ref4.preserveSelectedRowKeys;
92
93
  var _useHTableContext = context.useHTableContext(),
93
94
  rowOnChange = _useHTableContext.rowOnChange;
94
95
  var findId = function findId(key) {
@@ -100,13 +101,16 @@ var useSynchronousKeys = function useSynchronousKeys(_ref4) {
100
101
  return msRecords[rowIndex];
101
102
  };
102
103
  React.useEffect(function () {
103
- if (selectedRowKeys && records && rowKey) {
104
+ if (!selectedRowKeys || !records || !rowKey) {
105
+ return;
106
+ }
107
+ if (!preserveSelectedRowKeys) {
104
108
  var resultData = _mapInstanceProperty(selectedRowKeys).call(selectedRowKeys, function (key) {
105
109
  return findId(key);
106
110
  });
107
111
  rowOnChange(selectedRowKeys, resultData);
108
112
  }
109
- }, [selectedRowKeys, records, rowKey]);
113
+ }, [selectedRowKeys, records, rowKey, preserveSelectedRowKeys]);
110
114
  };
111
115
  var useAlwaysShowAlert = function useAlwaysShowAlert(selectedRowData, alwaysShowAlert) {
112
116
  var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
package/lib/HTableBody/index.js CHANGED
@@ -65,7 +65,8 @@ var Body = (function (bodyProps) {
65
65
  props = _objectWithoutProperties(bodyProps, _excluded);
66
66
  var _ref = rowSelection || {},
67
67
  selectedRowKeys = _ref.selectedRowKeys,
68
- configAlwaysShowAlert = _ref.alwaysShowAlert;
68
+ configAlwaysShowAlert = _ref.alwaysShowAlert,
69
+ preserveSelectedRowKeys = _ref.preserveSelectedRowKeys;
69
70
  var _useHTableContext = context.useHTableContext(),
70
71
  contextTableInstance = _useHTableContext.tableInstance,
71
72
  contextConfigData = _useHTableContext.configData,
@@ -111,7 +112,8 @@ var Body = (function (bodyProps) {
111
112
  useControl.useSynchronousKeys({
112
113
  selectedRowKeys: selectedRowKeys,
113
114
  records: records,
114
- rowKey: rowKey
115
+ rowKey: rowKey,
116
+ preserveSelectedRowKeys: preserveSelectedRowKeys
115
117
  });
116
118
  var optionsNode = options && jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
117
119
  reload: function reload() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/table",
3
- "version": "1.10.46",
3
+ "version": "1.10.47",
4
4
  "description": "基于antd二次开发table组件",
5
5
  "keywords": [
6
6
  "table"
package/src/components/HTableBody/hooks/useControl.tsx CHANGED
@@ -78,12 +78,14 @@ interface FilterKeysModal {
78
78
  selectedRowKeys?: React.Key[];
79
79
  records?: any[];
80
80
  rowKey?: string | GetRowKey<any>;
81
+ preserveSelectedRowKeys?: boolean;
81
82
  }
82
83
 
83
84
  export const useSynchronousKeys = ({
84
85
  selectedRowKeys,
85
86
  records,
86
87
  rowKey,
88
+ preserveSelectedRowKeys
87
89
  }: FilterKeysModal) => {
88
90
  const { rowOnChange } = useHTableContext();
89
91
  const findId = (key) => {
@@ -98,13 +100,16 @@ export const useSynchronousKeys = ({
98
100
  return msRecords[rowIndex];
99
101
  };
100
102
  useEffect(() => {
101
- if (selectedRowKeys && records && rowKey) {
103
+ if (!selectedRowKeys||!records||!rowKey) {
104
+ return;
105
+ }
106
+ if (!preserveSelectedRowKeys) {
102
107
  const resultData = selectedRowKeys.map((key) => {
103
108
  return findId(key);
104
109
  });
105
110
  rowOnChange(selectedRowKeys, resultData);
106
111
  }
107
- }, [selectedRowKeys, records, rowKey]);
112
+ }, [selectedRowKeys, records, rowKey,preserveSelectedRowKeys]);
108
113
  };
109
114
 
110
115
  export const useAlwaysShowAlert = (
package/src/components/HTableBody/index.tsx CHANGED
@@ -50,7 +50,7 @@ export default (bodyProps: HTableBodyProps) => {
50
50
  ...props
51
51
  } = bodyProps;
52
52
 
53
- const { selectedRowKeys, alwaysShowAlert: configAlwaysShowAlert } =
53
+ const { selectedRowKeys, alwaysShowAlert: configAlwaysShowAlert,preserveSelectedRowKeys } =
54
54
  rowSelection || {};
55
55
 
56
56
  const {
@@ -90,7 +90,7 @@ export default (bodyProps: HTableBodyProps) => {
90
90
  columnsState,
91
91
  columns: cols,
92
92
  });
93
- useSynchronousKeys({ selectedRowKeys, records, rowKey });
93
+ useSynchronousKeys({ selectedRowKeys, records, rowKey,preserveSelectedRowKeys });
94
94
 
95
95
  const optionsNode = options && (
96
96
  <Options
package/src/components/Table.tsx CHANGED
@@ -31,7 +31,7 @@ export default ({
31
31
  loading: propsLoading,
32
32
  error: propsError,
33
33
  rowSelection,
34
- defaultHeaderOpen,
34
+ defaultHeaderOpen,
35
35
  ...props
36
36
  }: HTableProps) => {
37
37
  const { run, loading, data, error, saveParams } = useReq({