@hw-component/table 1.10.6 → 1.10.7
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.
- package/.eslintcache +1 -1
- package/es/DialogTable/Content.js +1 -0
- package/es/HTableBody/RowCheckBox/hooks.js +110 -11
- package/es/Table.js +1 -0
- package/es/TableConfig.d.ts +1 -1
- package/es/TableProvider.js +4 -2
- package/es/modal.d.ts +1 -0
- package/lib/DialogTable/Content.js +1 -0
- package/lib/HTableBody/RowCheckBox/hooks.js +110 -11
- package/lib/Table.js +1 -0
- package/lib/TableConfig.d.ts +1 -1
- package/lib/TableProvider.js +4 -2
- package/lib/modal.d.ts +1 -0
- package/package.json +1 -1
- package/src/components/EditTable/modal.ts +5 -6
- package/src/components/HTableBody/RowCheckBox/hooks.ts +77 -8
- package/src/components/HTableBody/hooks/useColData.tsx +2 -4
- package/src/components/HTableBody/index.tsx +9 -4
- package/src/components/HTableBody/modal.ts +3 -2
- package/src/components/Table.tsx +5 -4
- package/src/components/TableConfig.tsx +4 -4
- package/src/components/TableProvider.tsx +34 -29
- package/src/components/modal.ts +2 -1
- package/src/components/render/TagsComponent.tsx +10 -7
- package/src/pages/Table/index.tsx +30 -15
package/es/TableProvider.js
CHANGED
|
@@ -25,7 +25,8 @@ var Index = function Index(_ref) {
|
|
|
25
25
|
onFinish = props.onFinish,
|
|
26
26
|
setSelectedRowData = props.setSelectedRowData,
|
|
27
27
|
headerOpen = props.headerOpen,
|
|
28
|
-
setHeaderOpen = props.setHeaderOpen
|
|
28
|
+
setHeaderOpen = props.setHeaderOpen,
|
|
29
|
+
rowSelection = props.rowSelection;
|
|
29
30
|
return jsx(HTableContext.Provider, {
|
|
30
31
|
value: {
|
|
31
32
|
selectedRowData: selectedRowData,
|
|
@@ -45,7 +46,8 @@ var Index = function Index(_ref) {
|
|
|
45
46
|
hideLabel: hideLabel,
|
|
46
47
|
labelWidth: labelWidth,
|
|
47
48
|
configItemRender: configItemRender,
|
|
48
|
-
tableInstance: tableInstance
|
|
49
|
+
tableInstance: tableInstance,
|
|
50
|
+
rowSelection: rowSelection
|
|
49
51
|
},
|
|
50
52
|
children: children
|
|
51
53
|
});
|
package/es/modal.d.ts
CHANGED
|
@@ -50,6 +50,7 @@ export interface RowSelectionOuter {
|
|
|
50
50
|
}
|
|
51
51
|
export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
|
|
52
52
|
alwaysShowAlert?: boolean;
|
|
53
|
+
allCheckType?: "batch" | "single";
|
|
53
54
|
});
|
|
54
55
|
export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowSelection" | "pagination"> {
|
|
55
56
|
request?: (params: ParamsModal) => Promise<ResultModal>;
|
|
@@ -35,6 +35,7 @@ require('@babel/runtime-corejs3/helpers/toConsumableArray');
|
|
|
35
35
|
require('@babel/runtime-corejs3/helpers/typeof');
|
|
36
36
|
require('antd');
|
|
37
37
|
require('@babel/runtime-corejs3/core-js-stable/instance/every');
|
|
38
|
+
require('@babel/runtime-corejs3/core-js-stable/set');
|
|
38
39
|
require('../HTableBody/AlertMsg.js');
|
|
39
40
|
require('@ant-design/icons');
|
|
40
41
|
require('../HTableBody/Options/Title.js');
|
|
@@ -1,13 +1,52 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
|
|
4
|
+
var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
|
|
5
|
+
var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
|
|
6
|
+
var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
|
|
7
|
+
var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
|
|
8
|
+
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
9
|
+
var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
|
|
10
|
+
var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
|
|
11
|
+
var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
|
|
12
|
+
var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
|
|
3
13
|
var _everyInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/every');
|
|
4
14
|
var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
|
|
5
|
-
var
|
|
15
|
+
var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/keys');
|
|
16
|
+
var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
|
|
17
|
+
var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
|
|
18
|
+
var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
|
|
6
19
|
var context = require('../../context.js');
|
|
7
20
|
|
|
21
|
+
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; }
|
|
22
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
8
23
|
var getRowKey = function getRowKey(item, index, rowKey) {
|
|
9
24
|
return typeof rowKey === "function" ? rowKey(item, index) : item[rowKey];
|
|
10
25
|
};
|
|
26
|
+
var getCuData = function getCuData(data, rowKey) {
|
|
27
|
+
var rowKeys = [];
|
|
28
|
+
var rowObjs = {};
|
|
29
|
+
_forEachInstanceProperty(data).call(data, function (item, index) {
|
|
30
|
+
var key = getRowKey(item, index, rowKey);
|
|
31
|
+
rowKeys.push(key);
|
|
32
|
+
rowObjs[key] = item;
|
|
33
|
+
});
|
|
34
|
+
return {
|
|
35
|
+
rowKeys: rowKeys,
|
|
36
|
+
rowObjs: rowObjs
|
|
37
|
+
};
|
|
38
|
+
};
|
|
39
|
+
var newRowDataMr = function newRowDataMr(data, rowObj) {
|
|
40
|
+
return _mapInstanceProperty(data).call(data, function (item) {
|
|
41
|
+
return rowObj[item];
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
var mkRowObj = function mkRowObj(rowObj) {
|
|
45
|
+
var keys = _Object$keys(rowObj);
|
|
46
|
+
return _mapInstanceProperty(keys).call(keys, function (key) {
|
|
47
|
+
return rowObj[key];
|
|
48
|
+
});
|
|
49
|
+
};
|
|
11
50
|
var useAllChecked = function useAllChecked() {
|
|
12
51
|
var keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
13
52
|
var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
@@ -30,17 +69,77 @@ var useCheckControl = function useCheckControl() {
|
|
|
30
69
|
rowOnChange = _useHTableContext2.rowOnChange,
|
|
31
70
|
_useHTableContext2$ro = _useHTableContext2.rowKey,
|
|
32
71
|
rowKey = _useHTableContext2$ro === void 0 ? "id" : _useHTableContext2$ro,
|
|
33
|
-
allSelectChange = _useHTableContext2.allSelectChange
|
|
72
|
+
allSelectChange = _useHTableContext2.allSelectChange,
|
|
73
|
+
rowSelection = _useHTableContext2.rowSelection,
|
|
74
|
+
selectedRowData = _useHTableContext2.selectedRowData;
|
|
75
|
+
var getPreKeys = function getPreKeys() {
|
|
76
|
+
var _context;
|
|
77
|
+
if (rowSelection === false) {
|
|
78
|
+
return {
|
|
79
|
+
rowKeys: [],
|
|
80
|
+
rowObjs: []
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
var _ref = rowSelection || {},
|
|
84
|
+
_ref$allCheckType = _ref.allCheckType,
|
|
85
|
+
allCheckType = _ref$allCheckType === void 0 ? "single" : _ref$allCheckType;
|
|
86
|
+
var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
|
|
87
|
+
keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys,
|
|
88
|
+
_selectedRowData$rowD = selectedRowData.rowData,
|
|
89
|
+
rowData = _selectedRowData$rowD === void 0 ? [] : _selectedRowData$rowD;
|
|
90
|
+
if (allCheckType === "single") {
|
|
91
|
+
var _getCuData = getCuData(data, rowKey),
|
|
92
|
+
_rowKeys = _getCuData.rowKeys,
|
|
93
|
+
_rowObjs = _getCuData.rowObjs;
|
|
94
|
+
return {
|
|
95
|
+
rowKeys: _rowKeys,
|
|
96
|
+
rowObjs: mkRowObj(_rowObjs)
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
var _getCuData2 = getCuData(data, rowKey),
|
|
100
|
+
rowKeys = _getCuData2.rowKeys,
|
|
101
|
+
rowObjs = _getCuData2.rowObjs;
|
|
102
|
+
var _getCuData3 = getCuData(rowData, rowKey),
|
|
103
|
+
oldRowObjs = _getCuData3.rowObjs;
|
|
104
|
+
var newKeys = new _Set(_concatInstanceProperty(_context = []).call(_context, _toConsumableArray(keys), _toConsumableArray(rowKeys)));
|
|
105
|
+
return {
|
|
106
|
+
rowKeys: _toConsumableArray(newKeys),
|
|
107
|
+
rowObjs: mkRowObj(_objectSpread(_objectSpread({}, oldRowObjs), rowObjs))
|
|
108
|
+
};
|
|
109
|
+
};
|
|
34
110
|
var allCheck = function allCheck() {
|
|
35
|
-
var
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
rowOnChange(
|
|
39
|
-
onChange === null || onChange === void 0 || onChange(
|
|
111
|
+
var _getPreKeys = getPreKeys(),
|
|
112
|
+
rowKeys = _getPreKeys.rowKeys,
|
|
113
|
+
rowObjs = _getPreKeys.rowObjs;
|
|
114
|
+
rowOnChange(rowKeys, rowObjs);
|
|
115
|
+
onChange === null || onChange === void 0 || onChange(rowKeys, rowObjs);
|
|
40
116
|
};
|
|
41
117
|
var allCancel = function allCancel() {
|
|
42
|
-
|
|
43
|
-
|
|
118
|
+
if (rowSelection === false) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
var _ref2 = rowSelection || {},
|
|
122
|
+
_ref2$allCheckType = _ref2.allCheckType,
|
|
123
|
+
allCheckType = _ref2$allCheckType === void 0 ? "single" : _ref2$allCheckType;
|
|
124
|
+
if (allCheckType === "single") {
|
|
125
|
+
rowOnChange([], []);
|
|
126
|
+
onChange === null || onChange === void 0 || onChange([], []);
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
var _getCuData4 = getCuData(data, rowKey),
|
|
130
|
+
rowKeys = _getCuData4.rowKeys;
|
|
131
|
+
var _selectedRowData$keys2 = _keysInstanceProperty(selectedRowData),
|
|
132
|
+
keys = _selectedRowData$keys2 === void 0 ? [] : _selectedRowData$keys2,
|
|
133
|
+
_selectedRowData$rowD2 = selectedRowData.rowData,
|
|
134
|
+
rowData = _selectedRowData$rowD2 === void 0 ? [] : _selectedRowData$rowD2;
|
|
135
|
+
var newKeys = _filterInstanceProperty(keys).call(keys, function (item) {
|
|
136
|
+
return _indexOfInstanceProperty(rowKeys).call(rowKeys, item) === -1;
|
|
137
|
+
});
|
|
138
|
+
var _getCuData5 = getCuData(rowData, rowKey),
|
|
139
|
+
oldRowObjs = _getCuData5.rowObjs;
|
|
140
|
+
var newRow = newRowDataMr(newKeys, oldRowObjs);
|
|
141
|
+
rowOnChange(newKeys, newRow);
|
|
142
|
+
onChange === null || onChange === void 0 || onChange(newKeys, newRow);
|
|
44
143
|
};
|
|
45
144
|
var checkChange = function checkChange(e) {
|
|
46
145
|
var checked = e.target.checked;
|
|
@@ -50,8 +149,8 @@ var useCheckControl = function useCheckControl() {
|
|
|
50
149
|
}
|
|
51
150
|
allCancel();
|
|
52
151
|
};
|
|
53
|
-
var menuClick = function menuClick(
|
|
54
|
-
var key =
|
|
152
|
+
var menuClick = function menuClick(_ref3) {
|
|
153
|
+
var key = _ref3.key;
|
|
55
154
|
if (key === "check") {
|
|
56
155
|
allCheck();
|
|
57
156
|
return;
|
package/lib/Table.js
CHANGED
|
@@ -117,6 +117,7 @@ var Table = (function (_ref) {
|
|
|
117
117
|
rowKey: rowKey,
|
|
118
118
|
headerOpen: open,
|
|
119
119
|
setHeaderOpen: setOpen,
|
|
120
|
+
rowSelection: rowSelection,
|
|
120
121
|
children: jsxRuntime.jsxs("div", {
|
|
121
122
|
style: _objectSpread({}, style),
|
|
122
123
|
className: _concatInstanceProperty(_context = "".concat(contentClassName, " ")).call(_context, className),
|
package/lib/TableConfig.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ interface HTableConfigContextModal {
|
|
|
11
11
|
configItemRender?: (data: ConfigItemModal) => ConfigItemModal;
|
|
12
12
|
}
|
|
13
13
|
export declare const HTableConfigContext: React.Context<HTableConfigContextModal | null>;
|
|
14
|
-
export declare const useHTableConfigContext: ({ emptyRender, errorRender, headerStyle, tableStyle, paginationStyle, configItemRender }: HTableConfigContextModal) => {
|
|
14
|
+
export declare const useHTableConfigContext: ({ emptyRender, errorRender, headerStyle, tableStyle, paginationStyle, configItemRender, }: HTableConfigContextModal) => {
|
|
15
15
|
errorRender: ErrorPageRender | undefined;
|
|
16
16
|
emptyRender: EmptyPageRender | undefined;
|
|
17
17
|
headerStyle: React.CSSProperties | undefined;
|
package/lib/TableProvider.js
CHANGED
|
@@ -28,7 +28,8 @@ var Index = function Index(_ref) {
|
|
|
28
28
|
onFinish = props.onFinish,
|
|
29
29
|
setSelectedRowData = props.setSelectedRowData,
|
|
30
30
|
headerOpen = props.headerOpen,
|
|
31
|
-
setHeaderOpen = props.setHeaderOpen
|
|
31
|
+
setHeaderOpen = props.setHeaderOpen,
|
|
32
|
+
rowSelection = props.rowSelection;
|
|
32
33
|
return jsxRuntime.jsx(context.HTableContext.Provider, {
|
|
33
34
|
value: {
|
|
34
35
|
selectedRowData: selectedRowData,
|
|
@@ -48,7 +49,8 @@ var Index = function Index(_ref) {
|
|
|
48
49
|
hideLabel: hideLabel,
|
|
49
50
|
labelWidth: labelWidth,
|
|
50
51
|
configItemRender: configItemRender,
|
|
51
|
-
tableInstance: tableInstance
|
|
52
|
+
tableInstance: tableInstance,
|
|
53
|
+
rowSelection: rowSelection
|
|
52
54
|
},
|
|
53
55
|
children: children
|
|
54
56
|
});
|
package/lib/modal.d.ts
CHANGED
|
@@ -50,6 +50,7 @@ export interface RowSelectionOuter {
|
|
|
50
50
|
}
|
|
51
51
|
export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
|
|
52
52
|
alwaysShowAlert?: boolean;
|
|
53
|
+
allCheckType?: "batch" | "single";
|
|
53
54
|
});
|
|
54
55
|
export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowSelection" | "pagination"> {
|
|
55
56
|
request?: (params: ParamsModal) => Promise<ResultModal>;
|
package/package.json
CHANGED
|
@@ -4,16 +4,15 @@ import { IPaginationProps } from "../HTablePagination";
|
|
|
4
4
|
import { EmptyPageRender, ErrorPageRender } from "../modal";
|
|
5
5
|
import { ProColumns } from "@ant-design/pro-table/lib/typing";
|
|
6
6
|
|
|
7
|
-
|
|
8
7
|
export interface HEditTableProps<T = any>
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
extends Omit<
|
|
9
|
+
EditableProTableProps<T, ParamsType>,
|
|
10
|
+
"recordCreatorProps" | "request" | "pagination"
|
|
11
|
+
> {
|
|
13
12
|
creatorButtonText?: string;
|
|
14
13
|
defaultRecordValue?: T;
|
|
15
14
|
recordCreatorProps?: Partial<
|
|
16
|
-
|
|
15
|
+
EditableProTableProps<T, ParamsType>["recordCreatorProps"]
|
|
17
16
|
>;
|
|
18
17
|
dataSource?: any[];
|
|
19
18
|
request?: (params: Record<string, any>) => Promise<T>;
|
|
@@ -8,6 +8,31 @@ const getRowKey = (item: any, index: number, rowKey: HTableProps["rowKey"]) => {
|
|
|
8
8
|
? rowKey(item, index)
|
|
9
9
|
: item[rowKey as string];
|
|
10
10
|
};
|
|
11
|
+
const getCuData=(data,rowKey)=>{
|
|
12
|
+
const rowKeys:Key[]=[];
|
|
13
|
+
const rowObjs:Record<string, any>={};
|
|
14
|
+
data.forEach((item,index) => {
|
|
15
|
+
const key=getRowKey(item, index, rowKey);
|
|
16
|
+
rowKeys.push(key);
|
|
17
|
+
rowObjs[key]=item;
|
|
18
|
+
});
|
|
19
|
+
return {
|
|
20
|
+
rowKeys,
|
|
21
|
+
rowObjs
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
const newRowDataMr=(data,rowObj)=>{
|
|
25
|
+
return data.map((item)=>{
|
|
26
|
+
return rowObj[item];
|
|
27
|
+
})
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
const mkRowObj=(rowObj:Record<string, any>)=>{
|
|
31
|
+
const keys=Object.keys(rowObj);
|
|
32
|
+
return keys.map((key)=>{
|
|
33
|
+
return rowObj[key];
|
|
34
|
+
})
|
|
35
|
+
}
|
|
11
36
|
export const useAllChecked = (keys: Key[] = [], data: any[] = []) => {
|
|
12
37
|
const { rowKey = "id" } = useHTableContext();
|
|
13
38
|
const len = data?.length;
|
|
@@ -24,17 +49,61 @@ export const useCheckControl = (
|
|
|
24
49
|
data: any[] = [],
|
|
25
50
|
onChange: RowRadioSelectionProps["onChange"]
|
|
26
51
|
) => {
|
|
27
|
-
const {
|
|
52
|
+
const {
|
|
53
|
+
rowOnChange,
|
|
54
|
+
rowKey = "id",
|
|
55
|
+
allSelectChange,
|
|
56
|
+
rowSelection,
|
|
57
|
+
selectedRowData,
|
|
58
|
+
} = useHTableContext();
|
|
59
|
+
const getPreKeys = () => {
|
|
60
|
+
if (rowSelection === false) {
|
|
61
|
+
return {
|
|
62
|
+
rowKeys:[],
|
|
63
|
+
rowObjs:[]
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
const { allCheckType = "single" } = rowSelection || {};
|
|
67
|
+
const { keys = [],rowData=[] } = selectedRowData;
|
|
68
|
+
if (allCheckType === "single") {
|
|
69
|
+
const {rowKeys,rowObjs}=getCuData(data,rowKey);
|
|
70
|
+
return {
|
|
71
|
+
rowKeys,
|
|
72
|
+
rowObjs:mkRowObj(rowObjs)
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
const {rowKeys,rowObjs} = getCuData(data, rowKey);
|
|
76
|
+
const {rowObjs:oldRowObjs}=getCuData(rowData,rowKey);
|
|
77
|
+
const newKeys = new Set([...keys, ...rowKeys]);
|
|
78
|
+
return {
|
|
79
|
+
rowKeys:[...newKeys],
|
|
80
|
+
rowObjs:mkRowObj({...oldRowObjs,...rowObjs}),
|
|
81
|
+
}
|
|
82
|
+
};
|
|
28
83
|
const allCheck = () => {
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
rowOnChange(setKeys, data);
|
|
33
|
-
onChange?.(setKeys, data);
|
|
84
|
+
const {rowKeys,rowObjs} = getPreKeys();
|
|
85
|
+
rowOnChange(rowKeys, rowObjs);
|
|
86
|
+
onChange?.(rowKeys, rowObjs);
|
|
34
87
|
};
|
|
35
88
|
const allCancel = () => {
|
|
36
|
-
|
|
37
|
-
|
|
89
|
+
if (rowSelection === false) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
const { allCheckType = "single" } = rowSelection || {};
|
|
93
|
+
if (allCheckType === "single") {
|
|
94
|
+
rowOnChange([], []);
|
|
95
|
+
onChange?.([], []);
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
const {rowKeys} = getCuData(data, rowKey);
|
|
99
|
+
const { keys = [] ,rowData=[]} = selectedRowData;
|
|
100
|
+
const newKeys = keys.filter((item) => {
|
|
101
|
+
return rowKeys.indexOf(item) === -1;
|
|
102
|
+
});
|
|
103
|
+
const {rowObjs:oldRowObjs}=getCuData(rowData,rowKey);
|
|
104
|
+
const newRow = newRowDataMr(newKeys,oldRowObjs);
|
|
105
|
+
rowOnChange(newKeys, newRow);
|
|
106
|
+
onChange?.(newKeys, newRow);
|
|
38
107
|
};
|
|
39
108
|
|
|
40
109
|
const checkChange = (e) => {
|
|
@@ -41,7 +41,6 @@ export const useCols = ({
|
|
|
41
41
|
};
|
|
42
42
|
|
|
43
43
|
const itemProvider = (item: ConfigItemModal, lastItem?: ConfigItemModal) => {
|
|
44
|
-
|
|
45
44
|
const { children: lastChildren = [] } = lastItem || {};
|
|
46
45
|
|
|
47
46
|
const {
|
|
@@ -71,7 +70,6 @@ export const useCols = ({
|
|
|
71
70
|
className: `${className} ${trClassName}`,
|
|
72
71
|
render: configRender(item, table as HTableInstance, valueTypeConfig),
|
|
73
72
|
};
|
|
74
|
-
|
|
75
73
|
};
|
|
76
74
|
|
|
77
75
|
const changeConfigData = (data: ConfigDataModal) => {
|
|
@@ -83,8 +81,8 @@ export const useCols = ({
|
|
|
83
81
|
}
|
|
84
82
|
return colsArray.map((item, index) => {
|
|
85
83
|
const lastItem = colsArray[index - 1];
|
|
86
|
-
const resultItem=itemProvider(item, lastItem);
|
|
87
|
-
return configItemRender?configItemRender(resultItem):resultItem;
|
|
84
|
+
const resultItem = itemProvider(item, lastItem);
|
|
85
|
+
return configItemRender ? configItemRender(resultItem) : resultItem;
|
|
88
86
|
});
|
|
89
87
|
};
|
|
90
88
|
useEffect(() => {
|
|
@@ -49,7 +49,8 @@ export default (bodyProps: HTableBodyProps) => {
|
|
|
49
49
|
...props
|
|
50
50
|
} = bodyProps;
|
|
51
51
|
|
|
52
|
-
const { selectedRowKeys, alwaysShowAlert: configAlwaysShowAlert } =
|
|
52
|
+
const { selectedRowKeys, alwaysShowAlert: configAlwaysShowAlert } =
|
|
53
|
+
rowSelection || {};
|
|
53
54
|
|
|
54
55
|
const {
|
|
55
56
|
tableInstance: contextTableInstance,
|
|
@@ -58,14 +59,18 @@ export default (bodyProps: HTableBodyProps) => {
|
|
|
58
59
|
selectedRowData,
|
|
59
60
|
error,
|
|
60
61
|
loading,
|
|
61
|
-
configItemRender: contextConfigItemRender=configItemRender,
|
|
62
|
+
configItemRender: contextConfigItemRender = configItemRender,
|
|
62
63
|
} = useHTableContext();
|
|
63
64
|
|
|
64
65
|
const {
|
|
65
66
|
emptyRender: tableEmptyRender = emptyDefaultRender,
|
|
66
67
|
errorRender: tableErrorRender = errorDefaultRender,
|
|
67
68
|
configItemRender: tableConfigItemRender,
|
|
68
|
-
} = useHTableConfigContext({
|
|
69
|
+
} = useHTableConfigContext({
|
|
70
|
+
emptyRender,
|
|
71
|
+
errorRender,
|
|
72
|
+
configItemRender: contextConfigItemRender,
|
|
73
|
+
});
|
|
69
74
|
|
|
70
75
|
const { cuSize, setCuSize } = useSize(size);
|
|
71
76
|
const bodyConfigData = configData || contextConfigData;
|
|
@@ -77,7 +82,7 @@ export default (bodyProps: HTableBodyProps) => {
|
|
|
77
82
|
table: tableInstance,
|
|
78
83
|
rowSelection,
|
|
79
84
|
bordered,
|
|
80
|
-
configItemRender:tableConfigItemRender
|
|
85
|
+
configItemRender: tableConfigItemRender,
|
|
81
86
|
});
|
|
82
87
|
const { value, onChange, resetCheckCol, ...selfColStatus } =
|
|
83
88
|
useColumnsStateType({
|
|
@@ -4,7 +4,8 @@ import type React from "react";
|
|
|
4
4
|
import type { ProTableProps } from "@ant-design/pro-table";
|
|
5
5
|
import {
|
|
6
6
|
ActionRenderFn,
|
|
7
|
-
ConfigDataModal,
|
|
7
|
+
ConfigDataModal,
|
|
8
|
+
ConfigItemModal,
|
|
8
9
|
EmptyPageRender,
|
|
9
10
|
ErrorPageRender,
|
|
10
11
|
HRowSelection,
|
|
@@ -38,7 +39,7 @@ export interface HTableBodyProps
|
|
|
38
39
|
options?: OptionModal | false;
|
|
39
40
|
table?: HTableInstance;
|
|
40
41
|
pagination?: IPaginationProps | false;
|
|
41
|
-
configItemRender?: (data:ConfigItemModal) =>ConfigItemModal;
|
|
42
|
+
configItemRender?: (data: ConfigItemModal) => ConfigItemModal;
|
|
42
43
|
}
|
|
43
44
|
|
|
44
45
|
export interface RowRadioSelectionProps {
|
package/src/components/Table.tsx
CHANGED
|
@@ -7,7 +7,7 @@ import useReq from "./hooks/useReq";
|
|
|
7
7
|
import useDispatch from "./hooks/useDispatch";
|
|
8
8
|
import { useState } from "react";
|
|
9
9
|
import { useClassName } from "./hooks";
|
|
10
|
-
import TableProvider from
|
|
10
|
+
import TableProvider from "./TableProvider";
|
|
11
11
|
|
|
12
12
|
export default ({
|
|
13
13
|
request,
|
|
@@ -72,9 +72,9 @@ export default ({
|
|
|
72
72
|
<TableProvider
|
|
73
73
|
{...props}
|
|
74
74
|
tableInstance={tableInstance}
|
|
75
|
-
onFinish={(value)=>{
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
onFinish={(value) => {
|
|
76
|
+
rowSelectionReload();
|
|
77
|
+
return run({ ...value, current: 1 });
|
|
78
78
|
}}
|
|
79
79
|
selectedRowData={selectedRowData}
|
|
80
80
|
rowOnChange={rowOnChange}
|
|
@@ -87,6 +87,7 @@ export default ({
|
|
|
87
87
|
rowKey={rowKey}
|
|
88
88
|
headerOpen={open}
|
|
89
89
|
setHeaderOpen={setOpen}
|
|
90
|
+
rowSelection={rowSelection}
|
|
90
91
|
>
|
|
91
92
|
<div style={{ ...style }} className={`${contentClassName} ${className}`}>
|
|
92
93
|
{!hideHeader && (
|
|
@@ -14,7 +14,7 @@ interface HTableConfigContextModal {
|
|
|
14
14
|
paginationStyle?: React.CSSProperties;
|
|
15
15
|
valueTypeConfig?: ValueTypeConfigModal;
|
|
16
16
|
defaultSelectedRowClassName?: string | null;
|
|
17
|
-
configItemRender?:(data:ConfigItemModal)=>ConfigItemModal;
|
|
17
|
+
configItemRender?: (data: ConfigItemModal) => ConfigItemModal;
|
|
18
18
|
}
|
|
19
19
|
export const HTableConfigContext =
|
|
20
20
|
React.createContext<HTableConfigContextModal | null>(null);
|
|
@@ -25,7 +25,7 @@ export const useHTableConfigContext = ({
|
|
|
25
25
|
headerStyle,
|
|
26
26
|
tableStyle,
|
|
27
27
|
paginationStyle,
|
|
28
|
-
configItemRender
|
|
28
|
+
configItemRender,
|
|
29
29
|
}: HTableConfigContextModal) => {
|
|
30
30
|
const {
|
|
31
31
|
errorRender: configErrorRender,
|
|
@@ -35,7 +35,7 @@ export const useHTableConfigContext = ({
|
|
|
35
35
|
paginationStyle: configPaginationStyle,
|
|
36
36
|
valueTypeConfig = {},
|
|
37
37
|
defaultSelectedRowClassName,
|
|
38
|
-
configItemRender:contextConfigItemRender,
|
|
38
|
+
configItemRender: contextConfigItemRender,
|
|
39
39
|
} = useContext(HTableConfigContext) || {};
|
|
40
40
|
|
|
41
41
|
return {
|
|
@@ -46,7 +46,7 @@ export const useHTableConfigContext = ({
|
|
|
46
46
|
paginationStyle: paginationStyle || configPaginationStyle,
|
|
47
47
|
valueTypeConfig,
|
|
48
48
|
defaultSelectedRowClassName,
|
|
49
|
-
configItemRender:configItemRender||contextConfigItemRender
|
|
49
|
+
configItemRender: configItemRender || contextConfigItemRender,
|
|
50
50
|
};
|
|
51
51
|
};
|
|
52
52
|
const Index: React.FC<HTableConfigContextModal> = ({ children, ...props }) => {
|
|
@@ -1,29 +1,32 @@
|
|
|
1
|
-
import {HContextModal, HTableContext} from "./context";
|
|
2
|
-
import type {HTableProps} from "./modal";
|
|
1
|
+
import { HContextModal, HTableContext } from "./context";
|
|
2
|
+
import type { HTableProps } from "./modal";
|
|
3
3
|
import React from "react";
|
|
4
|
-
type ProviderProps=HTableProps&Omit<HContextModal, "onPageChange">;
|
|
4
|
+
type ProviderProps = HTableProps & Omit<HContextModal, "onPageChange">;
|
|
5
5
|
|
|
6
|
-
const Index:React.FC<ProviderProps
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
6
|
+
const Index: React.FC<ProviderProps> = ({ children, ...props }) => {
|
|
7
|
+
const {
|
|
8
|
+
configData,
|
|
9
|
+
action = {},
|
|
10
|
+
rowKey = "id",
|
|
11
|
+
hideLabel,
|
|
12
|
+
labelWidth,
|
|
13
|
+
configItemRender,
|
|
14
|
+
tableInstance,
|
|
15
|
+
selectedRowData,
|
|
16
|
+
rowOnChange,
|
|
17
|
+
data,
|
|
18
|
+
error,
|
|
19
|
+
loading,
|
|
20
|
+
allSelectChange,
|
|
21
|
+
onFinish,
|
|
22
|
+
setSelectedRowData,
|
|
23
|
+
headerOpen,
|
|
24
|
+
setHeaderOpen,
|
|
25
|
+
rowSelection,
|
|
26
|
+
} = props;
|
|
27
|
+
return (
|
|
28
|
+
<HTableContext.Provider
|
|
29
|
+
value={{
|
|
27
30
|
selectedRowData,
|
|
28
31
|
rowOnChange,
|
|
29
32
|
data,
|
|
@@ -42,9 +45,11 @@ const Index:React.FC<ProviderProps>=({children,...props})=>{
|
|
|
42
45
|
labelWidth,
|
|
43
46
|
configItemRender,
|
|
44
47
|
tableInstance,
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
+
rowSelection,
|
|
49
|
+
}}
|
|
50
|
+
>
|
|
51
|
+
{children}
|
|
48
52
|
</HTableContext.Provider>
|
|
49
|
-
|
|
50
|
-
|
|
53
|
+
);
|
|
54
|
+
};
|
|
55
|
+
export default Index;
|
package/src/components/modal.ts
CHANGED
|
@@ -79,6 +79,7 @@ export interface RowSelectionOuter {
|
|
|
79
79
|
export type HRowSelection = RowSelectionOuter &
|
|
80
80
|
(TableProps<any>["rowSelection"] & {
|
|
81
81
|
alwaysShowAlert?: boolean;
|
|
82
|
+
allCheckType?: "batch" | "single";
|
|
82
83
|
});
|
|
83
84
|
export interface HTableProps
|
|
84
85
|
extends Omit<
|
|
@@ -87,7 +88,7 @@ export interface HTableProps
|
|
|
87
88
|
> {
|
|
88
89
|
request?: (params: ParamsModal) => Promise<ResultModal>;
|
|
89
90
|
configData: ConfigDataModal;
|
|
90
|
-
configItemRender?:(data:ConfigItemModal)=>ConfigItemModal;
|
|
91
|
+
configItemRender?: (data: ConfigItemModal) => ConfigItemModal;
|
|
91
92
|
searchSpan?: ColProps;
|
|
92
93
|
table?: HTableInstance;
|
|
93
94
|
actionRender?: ActionRenderFn;
|