@hw-component/table 1.10.17 → 1.10.19
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/HTableBody/Options/Content.js +4 -1
- package/es/HTableBody/Options/Title.js +8 -2
- package/es/HTableBody/Options/hooks.d.ts +1 -1
- package/es/HTableBody/hooks/useColData.d.ts +2 -1
- package/es/HTableBody/hooks/useColData.js +20 -4
- package/es/HTableBody/hooks/useControl.js +4 -12
- package/es/HTableBody/utils.d.ts +0 -1
- package/es/HTableBody/utils.js +0 -2
- package/es/Table.js +18 -8
- package/es/TableCustomize.js +17 -7
- package/es/hooks/useReq.d.ts +15 -6
- package/es/hooks/useReq.js +34 -37
- package/es/modal.d.ts +1 -1
- package/lib/HTableBody/Options/Content.js +4 -1
- package/lib/HTableBody/Options/Title.js +8 -2
- package/lib/HTableBody/Options/hooks.d.ts +1 -1
- package/lib/HTableBody/hooks/useColData.d.ts +2 -1
- package/lib/HTableBody/hooks/useColData.js +19 -3
- package/lib/HTableBody/hooks/useControl.js +4 -12
- package/lib/HTableBody/utils.d.ts +0 -1
- package/lib/HTableBody/utils.js +0 -2
- package/lib/Table.js +18 -8
- package/lib/TableCustomize.js +17 -7
- package/lib/hooks/useReq.d.ts +15 -6
- package/lib/hooks/useReq.js +34 -37
- package/lib/modal.d.ts +1 -1
- package/package.json +1 -1
- package/src/components/DialogTable/Content.tsx +1 -1
- package/src/components/EditTable/hooks.ts +28 -28
- package/src/components/EditTable/index.tsx +5 -3
- package/src/components/EditTable/modal.ts +1 -1
- package/src/components/HTableBody/Options/Content.tsx +4 -1
- package/src/components/HTableBody/Options/Title.tsx +8 -2
- package/src/components/HTableBody/Options/hooks.tsx +23 -22
- package/src/components/HTableBody/Options/index.tsx +2 -2
- package/src/components/HTableBody/Options/modal.d.ts +7 -2
- package/src/components/HTableBody/hooks/useColData.tsx +43 -30
- package/src/components/HTableBody/hooks/useColMk.ts +79 -74
- package/src/components/HTableBody/hooks/useControl.tsx +1 -4
- package/src/components/HTableBody/index.tsx +3 -2
- package/src/components/HTableBody/utils.ts +1 -7
- package/src/components/Table.tsx +18 -6
- package/src/components/TableCustomize.tsx +19 -6
- package/src/components/hooks/useReq.ts +23 -9
- package/src/components/modal.ts +1 -1
- package/src/pages/EditTable/index.tsx +1 -7
- package/src/pages/ModalEditTable/index.tsx +29 -27
- package/src/pages/Table/index.tsx +60 -52
package/es/Table.js
CHANGED
|
@@ -79,17 +79,25 @@ var Table = (function (_ref) {
|
|
|
79
79
|
table: table,
|
|
80
80
|
reload: function reload(params) {
|
|
81
81
|
rowSelectionReload();
|
|
82
|
-
return run(
|
|
82
|
+
return run({
|
|
83
|
+
params: params
|
|
84
|
+
});
|
|
83
85
|
},
|
|
84
86
|
changeRowData: rowOnChange,
|
|
85
87
|
dispatch: dispatch,
|
|
86
88
|
reloadWithParams: function reloadWithParams() {
|
|
87
89
|
var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
90
|
+
var filters = arguments.length > 1 ? arguments[1] : undefined;
|
|
91
|
+
var sorter = arguments.length > 2 ? arguments[2] : undefined;
|
|
88
92
|
rowSelectionReload();
|
|
89
|
-
return run(
|
|
93
|
+
return run({
|
|
94
|
+
params: reloadParams,
|
|
95
|
+
filters: filters,
|
|
96
|
+
sorter: sorter
|
|
97
|
+
});
|
|
90
98
|
},
|
|
91
99
|
getTableParams: function getTableParams() {
|
|
92
|
-
return saveParams.
|
|
100
|
+
return _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), saveParams.filters), saveParams.sorter);
|
|
93
101
|
},
|
|
94
102
|
selectedRowData: selectedRowData,
|
|
95
103
|
dataSource: data
|
|
@@ -99,11 +107,13 @@ var Table = (function (_ref) {
|
|
|
99
107
|
tableInstance: tableInstance,
|
|
100
108
|
onFinish: function onFinish(value) {
|
|
101
109
|
rowSelectionReload();
|
|
102
|
-
var size = saveParams.
|
|
103
|
-
return run(
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
110
|
+
var size = saveParams.oldParams.size;
|
|
111
|
+
return run({
|
|
112
|
+
params: _objectSpread(_objectSpread({}, value), {}, {
|
|
113
|
+
current: 1,
|
|
114
|
+
size: size
|
|
115
|
+
})
|
|
116
|
+
});
|
|
107
117
|
},
|
|
108
118
|
selectedRowData: selectedRowData,
|
|
109
119
|
rowOnChange: rowOnChange,
|
package/es/TableCustomize.js
CHANGED
|
@@ -55,17 +55,25 @@ var Index = function Index(_ref) {
|
|
|
55
55
|
table: table,
|
|
56
56
|
reload: function reload(params) {
|
|
57
57
|
rowOnChange([], []);
|
|
58
|
-
return run(
|
|
58
|
+
return run({
|
|
59
|
+
params: params
|
|
60
|
+
});
|
|
59
61
|
},
|
|
60
62
|
changeRowData: rowOnChange,
|
|
61
63
|
dispatch: dispatch,
|
|
62
64
|
reloadWithParams: function reloadWithParams() {
|
|
63
65
|
var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
66
|
+
var filters = arguments.length > 1 ? arguments[1] : undefined;
|
|
67
|
+
var sorter = arguments.length > 2 ? arguments[2] : undefined;
|
|
64
68
|
rowOnChange([], []);
|
|
65
|
-
return run(
|
|
69
|
+
return run({
|
|
70
|
+
params: _objectSpread(_objectSpread({}, saveParams.oldParams), reloadParams),
|
|
71
|
+
filters: filters,
|
|
72
|
+
sorter: sorter
|
|
73
|
+
});
|
|
66
74
|
},
|
|
67
75
|
getTableParams: function getTableParams() {
|
|
68
|
-
return saveParams.
|
|
76
|
+
return _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), saveParams.filters), saveParams.sorter);
|
|
69
77
|
},
|
|
70
78
|
selectedRowData: selectedRowData,
|
|
71
79
|
dataSource: data
|
|
@@ -81,12 +89,14 @@ var Index = function Index(_ref) {
|
|
|
81
89
|
allSelectChange: allSelectChange,
|
|
82
90
|
action: action,
|
|
83
91
|
configData: configData,
|
|
84
|
-
params: saveParams.
|
|
92
|
+
params: saveParams.oldParams,
|
|
85
93
|
onFinish: function onFinish(value) {
|
|
86
94
|
rowOnChange([], []);
|
|
87
|
-
return run(
|
|
88
|
-
|
|
89
|
-
|
|
95
|
+
return run({
|
|
96
|
+
params: _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), value), {}, {
|
|
97
|
+
current: 1
|
|
98
|
+
})
|
|
99
|
+
});
|
|
90
100
|
},
|
|
91
101
|
onPageChange: tableInstance.table.reloadWithParams,
|
|
92
102
|
setSelectedRowData: setSelectedRowData,
|
package/es/hooks/useReq.d.ts
CHANGED
|
@@ -8,30 +8,39 @@ export interface IParamsModal {
|
|
|
8
8
|
manual?: boolean;
|
|
9
9
|
formInitValues?: Record<string, any>;
|
|
10
10
|
}
|
|
11
|
+
interface RequestParams {
|
|
12
|
+
params?: Record<string, any>;
|
|
13
|
+
filters?: any;
|
|
14
|
+
sorter?: any;
|
|
15
|
+
}
|
|
11
16
|
declare const _default: ({ request, loading, error, reload, dataSource, manual, formInitValues, }: IParamsModal) => {
|
|
12
17
|
saveParams: {
|
|
13
|
-
|
|
18
|
+
oldParams: {};
|
|
19
|
+
filters: {};
|
|
20
|
+
sorter: {};
|
|
14
21
|
};
|
|
15
22
|
reset: () => void;
|
|
16
23
|
fetches: {
|
|
17
|
-
[x: string]: import("@ahooksjs/use-request/lib/types").FetchResult<ResultModal, [
|
|
24
|
+
[x: string]: import("@ahooksjs/use-request/lib/types").FetchResult<ResultModal, [reqParams?: RequestParams | undefined]>;
|
|
18
25
|
};
|
|
19
26
|
loading: boolean;
|
|
20
27
|
data: ResultModal | undefined;
|
|
21
28
|
error: Error | undefined;
|
|
22
|
-
params: [
|
|
29
|
+
params: [reqParams?: RequestParams | undefined];
|
|
23
30
|
cancel: import("@ahooksjs/use-request/lib/types").noop;
|
|
24
31
|
refresh: () => Promise<ResultModal>;
|
|
25
32
|
mutate: import("@ahooksjs/use-request/lib/types").Mutate<ResultModal>;
|
|
26
|
-
run: (
|
|
33
|
+
run: (reqParams?: RequestParams | undefined) => Promise<ResultModal>;
|
|
27
34
|
unmount: () => void;
|
|
28
35
|
} | {
|
|
29
36
|
loading: boolean | undefined;
|
|
30
37
|
error: Error | undefined;
|
|
31
38
|
data: ResultModal;
|
|
32
|
-
run: (
|
|
39
|
+
run: (reqParams?: RequestParams) => Promise<void>;
|
|
33
40
|
saveParams: {
|
|
34
|
-
|
|
41
|
+
oldParams: {};
|
|
42
|
+
filters: {};
|
|
43
|
+
sorter: {};
|
|
35
44
|
};
|
|
36
45
|
};
|
|
37
46
|
export default _default;
|
package/es/hooks/useReq.js
CHANGED
|
@@ -7,8 +7,8 @@ import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/inst
|
|
|
7
7
|
import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors';
|
|
8
8
|
import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/object/define-properties';
|
|
9
9
|
import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
|
|
10
|
-
import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
|
|
11
10
|
import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
|
|
11
|
+
import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
|
|
12
12
|
import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
|
|
13
13
|
import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
|
|
14
14
|
import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
|
|
@@ -18,8 +18,7 @@ import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array
|
|
|
18
18
|
import { useMemo, useEffect, useState } from 'react';
|
|
19
19
|
import { useRequest } from 'ahooks';
|
|
20
20
|
|
|
21
|
-
var _excluded = ["size", "current"]
|
|
22
|
-
_excluded2 = ["size", "current"];
|
|
21
|
+
var _excluded = ["size", "current"];
|
|
23
22
|
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; }
|
|
24
23
|
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; }
|
|
25
24
|
var defaultDataSource = {
|
|
@@ -85,7 +84,9 @@ var useReq = (function (_ref2) {
|
|
|
85
84
|
formInitValues = _ref2$formInitValues === void 0 ? {} : _ref2$formInitValues;
|
|
86
85
|
var saveParams = useMemo(function () {
|
|
87
86
|
return {
|
|
88
|
-
|
|
87
|
+
oldParams: {},
|
|
88
|
+
filters: {},
|
|
89
|
+
sorter: {}
|
|
89
90
|
};
|
|
90
91
|
}, []);
|
|
91
92
|
var _useDataSource = useDataSource({
|
|
@@ -94,50 +95,46 @@ var useReq = (function (_ref2) {
|
|
|
94
95
|
}),
|
|
95
96
|
localReload = _useDataSource.reload,
|
|
96
97
|
localDataSource = _useDataSource.dataSource;
|
|
98
|
+
var getReqParams = function getReqParams(reqParams) {
|
|
99
|
+
var _ref3 = reqParams || {},
|
|
100
|
+
_ref3$params = _ref3.params,
|
|
101
|
+
params = _ref3$params === void 0 ? {} : _ref3$params,
|
|
102
|
+
filters = _ref3.filters,
|
|
103
|
+
sorter = _ref3.sorter;
|
|
104
|
+
var _params$size = params.size,
|
|
105
|
+
size = _params$size === void 0 ? "10" : _params$size,
|
|
106
|
+
_params$current = params.current,
|
|
107
|
+
current = _params$current === void 0 ? "1" : _params$current,
|
|
108
|
+
oParams = _objectWithoutProperties(params, _excluded);
|
|
109
|
+
var requestParams = _objectSpread({
|
|
110
|
+
size: size,
|
|
111
|
+
current: current
|
|
112
|
+
}, oParams);
|
|
113
|
+
var cuFilters = filters || saveParams.filters;
|
|
114
|
+
var cuSorter = sorter || saveParams.sorter;
|
|
115
|
+
saveParams.oldParams = requestParams;
|
|
116
|
+
saveParams.filters = cuFilters;
|
|
117
|
+
saveParams.sorter = cuSorter;
|
|
118
|
+
return _objectSpread(_objectSpread(_objectSpread({}, requestParams), cuFilters), cuSorter);
|
|
119
|
+
};
|
|
97
120
|
var reloadFn = /*#__PURE__*/function () {
|
|
98
|
-
var
|
|
99
|
-
var params,
|
|
100
|
-
_params$size,
|
|
101
|
-
size,
|
|
102
|
-
_params$current,
|
|
103
|
-
current,
|
|
104
|
-
oParams,
|
|
105
|
-
requestParams,
|
|
106
|
-
_args = arguments;
|
|
121
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(reqParams) {
|
|
107
122
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
108
123
|
while (1) switch (_context.prev = _context.next) {
|
|
109
124
|
case 0:
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
requestParams = _objectSpread({
|
|
113
|
-
size: size,
|
|
114
|
-
current: current
|
|
115
|
-
}, oParams);
|
|
116
|
-
saveParams.old = requestParams;
|
|
117
|
-
return _context.abrupt("return", localReload(requestParams));
|
|
118
|
-
case 5:
|
|
125
|
+
return _context.abrupt("return", localReload(getReqParams(reqParams)));
|
|
126
|
+
case 1:
|
|
119
127
|
case "end":
|
|
120
128
|
return _context.stop();
|
|
121
129
|
}
|
|
122
130
|
}, _callee);
|
|
123
131
|
}));
|
|
124
|
-
return function reloadFn() {
|
|
125
|
-
return
|
|
132
|
+
return function reloadFn(_x) {
|
|
133
|
+
return _ref4.apply(this, arguments);
|
|
126
134
|
};
|
|
127
135
|
}();
|
|
128
|
-
var resultAction = useRequest(function () {
|
|
129
|
-
|
|
130
|
-
var _params$size2 = params.size,
|
|
131
|
-
size = _params$size2 === void 0 ? "10" : _params$size2,
|
|
132
|
-
_params$current2 = params.current,
|
|
133
|
-
current = _params$current2 === void 0 ? "1" : _params$current2,
|
|
134
|
-
oParams = _objectWithoutProperties(params, _excluded2);
|
|
135
|
-
var reqParams = _objectSpread({
|
|
136
|
-
size: size,
|
|
137
|
-
current: current
|
|
138
|
-
}, oParams);
|
|
139
|
-
saveParams.old = reqParams;
|
|
140
|
-
return request === null || request === void 0 ? void 0 : request(reqParams);
|
|
136
|
+
var resultAction = useRequest(function (reqParams) {
|
|
137
|
+
return request === null || request === void 0 ? void 0 : request(getReqParams(reqParams));
|
|
141
138
|
}, {
|
|
142
139
|
manual: true
|
|
143
140
|
});
|
package/es/modal.d.ts
CHANGED
|
@@ -96,7 +96,7 @@ export interface TableInstance {
|
|
|
96
96
|
reload: (params?: ParamsModal) => Promise<any>;
|
|
97
97
|
setSelectedRowData: (keys: React.Key[], data: any) => void;
|
|
98
98
|
dispatch: (key: string, params: any) => void;
|
|
99
|
-
reloadWithParams: (params?: ParamsModal) => Promise<any>;
|
|
99
|
+
reloadWithParams: (params?: ParamsModal, filters?: any, sorter?: any) => Promise<any>;
|
|
100
100
|
getParams: () => any;
|
|
101
101
|
getSelectedRowData: () => RowObj;
|
|
102
102
|
getTableSourceData: (full?: boolean) => any;
|
|
@@ -52,7 +52,10 @@ var ColsSettingContent = function ColsSettingContent(_ref) {
|
|
|
52
52
|
notCheck.push(cuKey);
|
|
53
53
|
}
|
|
54
54
|
});
|
|
55
|
-
onCheck(
|
|
55
|
+
onCheck({
|
|
56
|
+
keys: keys,
|
|
57
|
+
notCheck: notCheck
|
|
58
|
+
});
|
|
56
59
|
};
|
|
57
60
|
var onDropEnd = function onDropEnd(_ref3) {
|
|
58
61
|
var _context2;
|
|
@@ -27,10 +27,16 @@ var Title = function Title(_ref) {
|
|
|
27
27
|
return keys;
|
|
28
28
|
}, [columns]);
|
|
29
29
|
var allCheck = function allCheck() {
|
|
30
|
-
onCheck(
|
|
30
|
+
onCheck({
|
|
31
|
+
keys: relArrayKeys,
|
|
32
|
+
notCheck: []
|
|
33
|
+
});
|
|
31
34
|
};
|
|
32
35
|
var allNotCheck = function allNotCheck() {
|
|
33
|
-
onCheck(
|
|
36
|
+
onCheck({
|
|
37
|
+
notCheck: relArrayKeys,
|
|
38
|
+
keys: []
|
|
39
|
+
});
|
|
34
40
|
};
|
|
35
41
|
var relLen = relArrayKeys.length;
|
|
36
42
|
var indeterminate = relLen !== checkKeys.length && checkKeys.length > 0;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import type { IProps } from "../Options/modal";
|
|
3
3
|
import type { ConfigDataModal } from "../../modal";
|
|
4
|
-
export declare const useTreeValue: ({ columns, colStatusValue }: Pick<IProps, "colStatusValue" | "columns">) => {
|
|
4
|
+
export declare const useTreeValue: ({ columns, colStatusValue, }: Pick<IProps, "colStatusValue" | "columns">) => {
|
|
5
5
|
checkKeys: string[];
|
|
6
6
|
cols: ConfigDataModal;
|
|
7
7
|
};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ConfigDataModal } from "../../modal";
|
|
2
2
|
import type { ColumnsState } from "@ant-design/pro-table/es/container";
|
|
3
3
|
import type { ColumnsStateType } from "@ant-design/pro-table/es/typing";
|
|
4
|
+
import { CheckModal } from "../Options/modal";
|
|
4
5
|
interface useColumnsStateTypeModal {
|
|
5
6
|
columnsState?: ColumnsStateType;
|
|
6
7
|
columns: ConfigDataModal;
|
|
@@ -9,7 +10,7 @@ export declare const useColumnsStateType: ({ columnsState, columns, }: useColumn
|
|
|
9
10
|
persistenceType: "localStorage" | "sessionStorage" | undefined;
|
|
10
11
|
persistenceKey: string | undefined;
|
|
11
12
|
value: Record<string, ColumnsState> | undefined;
|
|
12
|
-
onChange: (keys
|
|
13
|
+
onChange: ({ keys, notCheck }: CheckModal) => void;
|
|
13
14
|
resetCol: () => void;
|
|
14
15
|
dropChange: (list: ConfigDataModal) => void;
|
|
15
16
|
};
|
|
@@ -10,6 +10,7 @@ var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/obje
|
|
|
10
10
|
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
11
11
|
var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
|
|
12
12
|
var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
|
|
13
|
+
var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/keys');
|
|
13
14
|
var context = require('../../context.js');
|
|
14
15
|
var React = require('react');
|
|
15
16
|
var utils = require('../utils.js');
|
|
@@ -27,6 +28,17 @@ var useColumnsStateType = function useColumnsStateType(_ref) {
|
|
|
27
28
|
value = _ref2.value,
|
|
28
29
|
defaultValue = _ref2.defaultValue,
|
|
29
30
|
onChange = _ref2.onChange;
|
|
31
|
+
var columnsObj = React.useMemo(function () {
|
|
32
|
+
var colsObj = {};
|
|
33
|
+
_forEachInstanceProperty(columns).call(columns, function (item) {
|
|
34
|
+
var dataIndex = item.dataIndex;
|
|
35
|
+
if (!dataIndex) {
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
colsObj[dataIndex] = item;
|
|
39
|
+
});
|
|
40
|
+
return colsObj;
|
|
41
|
+
}, [columns]);
|
|
30
42
|
var _useState = React.useState(defaultValue),
|
|
31
43
|
_useState2 = _slicedToArray(_useState, 2),
|
|
32
44
|
selfValue = _useState2[0],
|
|
@@ -46,7 +58,6 @@ var useColumnsStateType = function useColumnsStateType(_ref) {
|
|
|
46
58
|
setSelfValue(function (oldVal) {
|
|
47
59
|
var newValue = _objectSpread({}, oldVal);
|
|
48
60
|
var notMatchNum = 0;
|
|
49
|
-
console.log(list, "li");
|
|
50
61
|
_forEachInstanceProperty(list).call(list, function (item, index) {
|
|
51
62
|
var dataIndex = item.dataIndex;
|
|
52
63
|
if (!dataIndex) {
|
|
@@ -63,13 +74,18 @@ var useColumnsStateType = function useColumnsStateType(_ref) {
|
|
|
63
74
|
return newValue;
|
|
64
75
|
});
|
|
65
76
|
};
|
|
66
|
-
var change = function change(
|
|
77
|
+
var change = function change(_ref3) {
|
|
78
|
+
var keys = _keysInstanceProperty(_ref3),
|
|
79
|
+
notCheck = _ref3.notCheck;
|
|
67
80
|
var newObj = {};
|
|
68
81
|
var newValue = _objectSpread({}, selfValue);
|
|
69
82
|
_forEachInstanceProperty(keys).call(keys, function (key) {
|
|
70
83
|
var oldItem = newValue[key];
|
|
84
|
+
var _ref4 = columnsObj[key] || {},
|
|
85
|
+
fixed = _ref4.fixed;
|
|
71
86
|
newObj[key] = _objectSpread(_objectSpread({}, oldItem), {}, {
|
|
72
|
-
show: true
|
|
87
|
+
show: true,
|
|
88
|
+
fixed: fixed
|
|
73
89
|
});
|
|
74
90
|
});
|
|
75
91
|
_forEachInstanceProperty(notCheck).call(notCheck, function (key) {
|
|
@@ -1,12 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
|
|
4
|
-
var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
|
|
5
|
-
var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
|
|
6
|
-
var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
|
|
7
|
-
var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
|
|
8
|
-
var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
|
|
9
|
-
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
10
3
|
var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
|
|
11
4
|
var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
|
|
12
5
|
var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
|
|
@@ -17,8 +10,6 @@ var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/insta
|
|
|
17
10
|
var React = require('react');
|
|
18
11
|
var context = require('../../context.js');
|
|
19
12
|
|
|
20
|
-
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; }
|
|
21
|
-
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; }
|
|
22
13
|
var useSize = function useSize(size) {
|
|
23
14
|
var _useState = React.useState(size),
|
|
24
15
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -86,11 +77,12 @@ var useTableChange = function useTableChange(_ref) {
|
|
|
86
77
|
}
|
|
87
78
|
var orderByField = typeof order === "undefined" ? undefined : field;
|
|
88
79
|
var asc = typeof order === "undefined" ? undefined : order === "ascend";
|
|
89
|
-
tableInstance === null || tableInstance === void 0 || tableInstance.table.reloadWithParams(
|
|
90
|
-
current: 1
|
|
80
|
+
tableInstance === null || tableInstance === void 0 || tableInstance.table.reloadWithParams({
|
|
81
|
+
current: 1
|
|
82
|
+
}, filtersMk(filters), {
|
|
91
83
|
orderByField: orderByField,
|
|
92
84
|
asc: asc
|
|
93
|
-
}
|
|
85
|
+
});
|
|
94
86
|
};
|
|
95
87
|
};
|
|
96
88
|
var useSynchronousKeys = function useSynchronousKeys(_ref4) {
|
package/lib/HTableBody/utils.js
CHANGED
package/lib/Table.js
CHANGED
|
@@ -82,17 +82,25 @@ var Table = (function (_ref) {
|
|
|
82
82
|
table: table,
|
|
83
83
|
reload: function reload(params) {
|
|
84
84
|
rowSelectionReload();
|
|
85
|
-
return run(
|
|
85
|
+
return run({
|
|
86
|
+
params: params
|
|
87
|
+
});
|
|
86
88
|
},
|
|
87
89
|
changeRowData: rowOnChange,
|
|
88
90
|
dispatch: dispatch,
|
|
89
91
|
reloadWithParams: function reloadWithParams() {
|
|
90
92
|
var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
93
|
+
var filters = arguments.length > 1 ? arguments[1] : undefined;
|
|
94
|
+
var sorter = arguments.length > 2 ? arguments[2] : undefined;
|
|
91
95
|
rowSelectionReload();
|
|
92
|
-
return run(
|
|
96
|
+
return run({
|
|
97
|
+
params: reloadParams,
|
|
98
|
+
filters: filters,
|
|
99
|
+
sorter: sorter
|
|
100
|
+
});
|
|
93
101
|
},
|
|
94
102
|
getTableParams: function getTableParams() {
|
|
95
|
-
return saveParams.
|
|
103
|
+
return _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), saveParams.filters), saveParams.sorter);
|
|
96
104
|
},
|
|
97
105
|
selectedRowData: selectedRowData,
|
|
98
106
|
dataSource: data
|
|
@@ -102,11 +110,13 @@ var Table = (function (_ref) {
|
|
|
102
110
|
tableInstance: tableInstance,
|
|
103
111
|
onFinish: function onFinish(value) {
|
|
104
112
|
rowSelectionReload();
|
|
105
|
-
var size = saveParams.
|
|
106
|
-
return run(
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
113
|
+
var size = saveParams.oldParams.size;
|
|
114
|
+
return run({
|
|
115
|
+
params: _objectSpread(_objectSpread({}, value), {}, {
|
|
116
|
+
current: 1,
|
|
117
|
+
size: size
|
|
118
|
+
})
|
|
119
|
+
});
|
|
110
120
|
},
|
|
111
121
|
selectedRowData: selectedRowData,
|
|
112
122
|
rowOnChange: rowOnChange,
|
package/lib/TableCustomize.js
CHANGED
|
@@ -58,17 +58,25 @@ var Index = function Index(_ref) {
|
|
|
58
58
|
table: table,
|
|
59
59
|
reload: function reload(params) {
|
|
60
60
|
rowOnChange([], []);
|
|
61
|
-
return run(
|
|
61
|
+
return run({
|
|
62
|
+
params: params
|
|
63
|
+
});
|
|
62
64
|
},
|
|
63
65
|
changeRowData: rowOnChange,
|
|
64
66
|
dispatch: dispatch,
|
|
65
67
|
reloadWithParams: function reloadWithParams() {
|
|
66
68
|
var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
69
|
+
var filters = arguments.length > 1 ? arguments[1] : undefined;
|
|
70
|
+
var sorter = arguments.length > 2 ? arguments[2] : undefined;
|
|
67
71
|
rowOnChange([], []);
|
|
68
|
-
return run(
|
|
72
|
+
return run({
|
|
73
|
+
params: _objectSpread(_objectSpread({}, saveParams.oldParams), reloadParams),
|
|
74
|
+
filters: filters,
|
|
75
|
+
sorter: sorter
|
|
76
|
+
});
|
|
69
77
|
},
|
|
70
78
|
getTableParams: function getTableParams() {
|
|
71
|
-
return saveParams.
|
|
79
|
+
return _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), saveParams.filters), saveParams.sorter);
|
|
72
80
|
},
|
|
73
81
|
selectedRowData: selectedRowData,
|
|
74
82
|
dataSource: data
|
|
@@ -84,12 +92,14 @@ var Index = function Index(_ref) {
|
|
|
84
92
|
allSelectChange: allSelectChange,
|
|
85
93
|
action: action,
|
|
86
94
|
configData: configData,
|
|
87
|
-
params: saveParams.
|
|
95
|
+
params: saveParams.oldParams,
|
|
88
96
|
onFinish: function onFinish(value) {
|
|
89
97
|
rowOnChange([], []);
|
|
90
|
-
return run(
|
|
91
|
-
|
|
92
|
-
|
|
98
|
+
return run({
|
|
99
|
+
params: _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), value), {}, {
|
|
100
|
+
current: 1
|
|
101
|
+
})
|
|
102
|
+
});
|
|
93
103
|
},
|
|
94
104
|
onPageChange: tableInstance.table.reloadWithParams,
|
|
95
105
|
setSelectedRowData: setSelectedRowData,
|
package/lib/hooks/useReq.d.ts
CHANGED
|
@@ -8,30 +8,39 @@ export interface IParamsModal {
|
|
|
8
8
|
manual?: boolean;
|
|
9
9
|
formInitValues?: Record<string, any>;
|
|
10
10
|
}
|
|
11
|
+
interface RequestParams {
|
|
12
|
+
params?: Record<string, any>;
|
|
13
|
+
filters?: any;
|
|
14
|
+
sorter?: any;
|
|
15
|
+
}
|
|
11
16
|
declare const _default: ({ request, loading, error, reload, dataSource, manual, formInitValues, }: IParamsModal) => {
|
|
12
17
|
saveParams: {
|
|
13
|
-
|
|
18
|
+
oldParams: {};
|
|
19
|
+
filters: {};
|
|
20
|
+
sorter: {};
|
|
14
21
|
};
|
|
15
22
|
reset: () => void;
|
|
16
23
|
fetches: {
|
|
17
|
-
[x: string]: import("@ahooksjs/use-request/lib/types").FetchResult<ResultModal, [
|
|
24
|
+
[x: string]: import("@ahooksjs/use-request/lib/types").FetchResult<ResultModal, [reqParams?: RequestParams | undefined]>;
|
|
18
25
|
};
|
|
19
26
|
loading: boolean;
|
|
20
27
|
data: ResultModal | undefined;
|
|
21
28
|
error: Error | undefined;
|
|
22
|
-
params: [
|
|
29
|
+
params: [reqParams?: RequestParams | undefined];
|
|
23
30
|
cancel: import("@ahooksjs/use-request/lib/types").noop;
|
|
24
31
|
refresh: () => Promise<ResultModal>;
|
|
25
32
|
mutate: import("@ahooksjs/use-request/lib/types").Mutate<ResultModal>;
|
|
26
|
-
run: (
|
|
33
|
+
run: (reqParams?: RequestParams | undefined) => Promise<ResultModal>;
|
|
27
34
|
unmount: () => void;
|
|
28
35
|
} | {
|
|
29
36
|
loading: boolean | undefined;
|
|
30
37
|
error: Error | undefined;
|
|
31
38
|
data: ResultModal;
|
|
32
|
-
run: (
|
|
39
|
+
run: (reqParams?: RequestParams) => Promise<void>;
|
|
33
40
|
saveParams: {
|
|
34
|
-
|
|
41
|
+
oldParams: {};
|
|
42
|
+
filters: {};
|
|
43
|
+
sorter: {};
|
|
35
44
|
};
|
|
36
45
|
};
|
|
37
46
|
export default _default;
|