@hw-component/table 1.10.48 → 1.10.51
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/README.md +0 -9
- package/es/DialogTable/Content.js +2 -1
- package/es/EditTable/hooks.d.ts +1 -1
- package/es/EditTable/hooks.js +36 -10
- package/es/EditTable/index.d.ts +1 -1
- package/es/EditTable/index.js +9 -1
- package/es/EditTable/modal.d.ts +3 -3
- package/es/HTableBody/AlertMsg.d.ts +1 -1
- package/es/HTableBody/hooks/useControl.d.ts +1 -1
- package/es/HTableBody/hooks/useControl.js +0 -1
- package/es/hooks/useRowObj.js +1 -0
- package/es/render/Text.d.ts +0 -1
- package/lib/DialogTable/Content.js +2 -1
- package/lib/EditTable/hooks.d.ts +1 -1
- package/lib/EditTable/hooks.js +36 -10
- package/lib/EditTable/index.d.ts +1 -1
- package/lib/EditTable/index.js +9 -1
- package/lib/EditTable/modal.d.ts +3 -3
- package/lib/HTableBody/AlertMsg.d.ts +1 -1
- package/lib/HTableBody/hooks/useControl.d.ts +1 -1
- package/lib/HTableBody/hooks/useControl.js +0 -1
- package/lib/hooks/useRowObj.js +1 -0
- package/lib/render/Text.d.ts +0 -1
- package/package.json +1 -1
- package/src/components/DialogTable/Content.tsx +1 -0
- package/src/components/EditTable/hooks.ts +27 -2
- package/src/components/EditTable/index.tsx +6 -0
- package/src/components/EditTable/modal.ts +3 -3
- package/src/components/HTableBody/AlertMsg.tsx +1 -1
- package/src/components/HTableBody/hooks/useControl.tsx +6 -12
- package/src/components/HTableBody/index.tsx +12 -3
- package/src/components/hooks/useRowObj.ts +14 -13
- package/src/components/modal.ts +1 -1
- package/src/pages/EditTable/index.tsx +22 -5
- package/src/pages/ModalEditTable/index.tsx +2 -2
- package/src/pages/Table/index.tsx +13 -4
- package/README.en.md +0 -36
package/es/EditTable/index.js
CHANGED
|
@@ -11,6 +11,7 @@ import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
|
|
|
11
11
|
import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
|
|
12
12
|
import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
|
|
13
13
|
import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
|
|
14
|
+
import _Promise from '@babel/runtime-corejs3/core-js-stable/promise';
|
|
14
15
|
import { jsxs, jsx } from 'react/jsx-runtime';
|
|
15
16
|
import { EditableProTable } from '@ant-design/pro-table';
|
|
16
17
|
import { useClassName } from '../hooks/index.js';
|
|
@@ -21,7 +22,7 @@ import { useHTableConfigContext } from '../TableConfig.js';
|
|
|
21
22
|
import { useCuEditTable, useListRequest, useEditTableInit, useColsMk } from './hooks.js';
|
|
22
23
|
import { useRef } from 'react';
|
|
23
24
|
|
|
24
|
-
var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "style", "table"],
|
|
25
|
+
var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "style", "table", "manualRequest"],
|
|
25
26
|
_excluded2 = ["index", "id"];
|
|
26
27
|
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; }
|
|
27
28
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -47,6 +48,8 @@ var EditTable = (function (_ref) {
|
|
|
47
48
|
onEdit = _ref.onEdit,
|
|
48
49
|
style = _ref.style,
|
|
49
50
|
table = _ref.table,
|
|
51
|
+
_ref$manualRequest = _ref.manualRequest,
|
|
52
|
+
manualRequest = _ref$manualRequest === void 0 ? true : _ref$manualRequest,
|
|
50
53
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
51
54
|
var cuTable = useCuEditTable({
|
|
52
55
|
table: table
|
|
@@ -101,6 +104,11 @@ var EditTable = (function (_ref) {
|
|
|
101
104
|
editableFormRef: defaultEditableFormRef,
|
|
102
105
|
actionRef: defaultActionRef,
|
|
103
106
|
value: data === null || data === void 0 ? void 0 : data.records,
|
|
107
|
+
manualRequest: manualRequest,
|
|
108
|
+
request: function request(params, sorter) {
|
|
109
|
+
run({}, sorter);
|
|
110
|
+
return _Promise.resolve({});
|
|
111
|
+
},
|
|
104
112
|
recordCreatorProps: recordCreatorProps === false ? recordCreatorProps : _objectSpread({
|
|
105
113
|
position: "bottom",
|
|
106
114
|
record: function record() {
|
package/es/EditTable/modal.d.ts
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { EditableFormInstance, EditableProTableProps } from "@ant-design/pro-table/lib/components/EditableTable";
|
|
2
2
|
import { ParamsType } from "@ant-design/pro-provider";
|
|
3
3
|
import { IPaginationProps } from "../HTablePagination";
|
|
4
|
-
import { EmptyPageRender, ErrorPageRender } from "../modal";
|
|
4
|
+
import { EmptyPageRender, ErrorPageRender, ResultModal } from "../modal";
|
|
5
5
|
import { ActionType, ProColumns } from "@ant-design/pro-table/lib/typing";
|
|
6
6
|
export interface EditTableInstance {
|
|
7
7
|
editableForm: EditableFormInstance | {};
|
|
8
8
|
action: ActionType | {};
|
|
9
9
|
reload: () => void;
|
|
10
10
|
}
|
|
11
|
-
export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination"> {
|
|
11
|
+
export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination" | "dataSource"> {
|
|
12
12
|
creatorButtonText?: string;
|
|
13
13
|
defaultRecordValue?: T;
|
|
14
14
|
recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
|
|
15
|
-
dataSource?: any[];
|
|
15
|
+
dataSource?: ResultModal | any[];
|
|
16
16
|
request?: (params: Record<string, any>) => Promise<T>;
|
|
17
17
|
pagination?: IPaginationProps | false;
|
|
18
18
|
manual?: boolean;
|
|
@@ -15,6 +15,6 @@ interface FilterKeysModal {
|
|
|
15
15
|
preserveSelectedRowKeys?: boolean;
|
|
16
16
|
selectedRowData?: Record<string, any>[];
|
|
17
17
|
}
|
|
18
|
-
export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, preserveSelectedRowKeys,
|
|
18
|
+
export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, preserveSelectedRowKeys, }: FilterKeysModal) => void;
|
|
19
19
|
export declare const useAlwaysShowAlert: (selectedRowData: RowObj, alwaysShowAlert?: boolean) => boolean | undefined;
|
|
20
20
|
export {};
|
|
@@ -91,7 +91,6 @@ var useSynchronousKeys = function useSynchronousKeys(_ref4) {
|
|
|
91
91
|
records = _ref4.records,
|
|
92
92
|
rowKey = _ref4.rowKey,
|
|
93
93
|
preserveSelectedRowKeys = _ref4.preserveSelectedRowKeys;
|
|
94
|
-
_ref4.selectedRowData;
|
|
95
94
|
var _useHTableContext = useHTableContext(),
|
|
96
95
|
rowOnChange = _useHTableContext.rowOnChange;
|
|
97
96
|
var findId = function findId(key) {
|
package/es/hooks/useRowObj.js
CHANGED
package/es/render/Text.d.ts
CHANGED
|
@@ -56,7 +56,8 @@ var EditTableContent = function EditTableContent(_ref2) {
|
|
|
56
56
|
configData: configData || [],
|
|
57
57
|
request: request,
|
|
58
58
|
pagination: cuPagination,
|
|
59
|
-
dataSource: dataSource
|
|
59
|
+
dataSource: dataSource,
|
|
60
|
+
manualRequest: false
|
|
60
61
|
}));
|
|
61
62
|
return jsxRuntime.jsx(jsxRuntime.Fragment, {
|
|
62
63
|
children: contentRender ? contentRender(node) : node
|
package/lib/EditTable/hooks.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import { ResultModal } from "../modal";
|
|
|
6
6
|
export declare const useListRequest: ({ request, dataSource, manual, }: HEditTableProps) => {
|
|
7
7
|
loading: boolean;
|
|
8
8
|
error: Error | undefined;
|
|
9
|
-
run: (params?: any) => Promise<void>;
|
|
9
|
+
run: (params?: any, sorter?: any) => Promise<void>;
|
|
10
10
|
data: ResultModal;
|
|
11
11
|
};
|
|
12
12
|
export declare const useEditTable: () => EditTableInstance;
|
package/lib/EditTable/hooks.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
|
|
4
3
|
var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
|
|
5
4
|
var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
|
|
6
5
|
var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
|
|
@@ -12,6 +11,7 @@ var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
|
12
11
|
var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
|
|
13
12
|
var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
|
|
14
13
|
var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
|
|
14
|
+
var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
|
|
15
15
|
var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
|
|
16
16
|
var _Promise = require('@babel/runtime-corejs3/core-js-stable/promise');
|
|
17
17
|
var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
|
|
@@ -39,42 +39,68 @@ var useListRequest = function useListRequest(_ref) {
|
|
|
39
39
|
params: {
|
|
40
40
|
current: 1,
|
|
41
41
|
pageSize: 10
|
|
42
|
-
}
|
|
42
|
+
},
|
|
43
|
+
sorter: {}
|
|
43
44
|
};
|
|
44
45
|
}, []);
|
|
46
|
+
var sorterParamsFn = function sorterParamsFn() {
|
|
47
|
+
var sorter = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
48
|
+
var keysLen = _Object$keys(sorter).length;
|
|
49
|
+
if (keysLen === 0) {
|
|
50
|
+
return saveParams.sorter;
|
|
51
|
+
}
|
|
52
|
+
return sorter;
|
|
53
|
+
};
|
|
54
|
+
var sorterMk = function sorterMk(sorter) {
|
|
55
|
+
var keys = _Object$keys(sorter);
|
|
56
|
+
if (keys.length === 0) {
|
|
57
|
+
return {};
|
|
58
|
+
}
|
|
59
|
+
var orderByField = keys[0];
|
|
60
|
+
var asc = sorter[orderByField];
|
|
61
|
+
return {
|
|
62
|
+
orderByField: orderByField,
|
|
63
|
+
asc: asc === "ascend"
|
|
64
|
+
};
|
|
65
|
+
};
|
|
45
66
|
var _useRequest = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
|
|
46
67
|
var params,
|
|
68
|
+
sorter,
|
|
47
69
|
newParams,
|
|
70
|
+
cuSorter,
|
|
48
71
|
result,
|
|
49
72
|
_args = arguments;
|
|
50
73
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
51
74
|
while (1) switch (_context.prev = _context.next) {
|
|
52
75
|
case 0:
|
|
53
76
|
params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
|
|
77
|
+
sorter = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
|
|
54
78
|
newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
|
|
79
|
+
cuSorter = sorterParamsFn(sorter);
|
|
80
|
+
saveParams.sorter = cuSorter;
|
|
55
81
|
saveParams.params = newParams;
|
|
56
82
|
if (!request) {
|
|
57
|
-
_context.next =
|
|
83
|
+
_context.next = 12;
|
|
58
84
|
break;
|
|
59
85
|
}
|
|
60
|
-
_context.next =
|
|
61
|
-
return request(newParams);
|
|
62
|
-
case
|
|
86
|
+
_context.next = 9;
|
|
87
|
+
return request(_objectSpread(_objectSpread({}, newParams), sorterMk(cuSorter)));
|
|
88
|
+
case 9:
|
|
63
89
|
result = _context.sent;
|
|
64
90
|
setTableDataSource(result);
|
|
65
91
|
return _context.abrupt("return");
|
|
66
|
-
case
|
|
92
|
+
case 12:
|
|
67
93
|
if (!_Array$isArray(dataSource)) {
|
|
68
|
-
_context.next =
|
|
94
|
+
_context.next = 15;
|
|
69
95
|
break;
|
|
70
96
|
}
|
|
71
97
|
setTableDataSource(_objectSpread(_objectSpread({}, tableDataSource), {}, {
|
|
72
98
|
records: dataSource
|
|
73
99
|
}));
|
|
74
100
|
return _context.abrupt("return");
|
|
75
|
-
case
|
|
101
|
+
case 15:
|
|
76
102
|
return _context.abrupt("return", setTableDataSource(dataSource || tableDataSource));
|
|
77
|
-
case
|
|
103
|
+
case 16:
|
|
78
104
|
case "end":
|
|
79
105
|
return _context.stop();
|
|
80
106
|
}
|
package/lib/EditTable/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { HEditTableProps } from "./modal";
|
|
3
|
-
declare const _default: ({ configData, rowKey, creatorButtonText, recordCreatorProps, defaultRecordValue, pagination, editable, dataSource, request, manual, emptyRender, errorRender, onAdd, onEdit, style, table, ...props }: HEditTableProps) => JSX.Element;
|
|
3
|
+
declare const _default: ({ configData, rowKey, creatorButtonText, recordCreatorProps, defaultRecordValue, pagination, editable, dataSource, request, manual, emptyRender, errorRender, onAdd, onEdit, style, table, manualRequest, ...props }: HEditTableProps) => JSX.Element;
|
|
4
4
|
export default _default;
|
package/lib/EditTable/index.js
CHANGED
|
@@ -14,6 +14,7 @@ var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator
|
|
|
14
14
|
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
15
15
|
var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
|
|
16
16
|
var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
|
|
17
|
+
var _Promise = require('@babel/runtime-corejs3/core-js-stable/promise');
|
|
17
18
|
var jsxRuntime = require('react/jsx-runtime');
|
|
18
19
|
var ProTable = require('@ant-design/pro-table');
|
|
19
20
|
var index = require('../hooks/index.js');
|
|
@@ -24,7 +25,7 @@ var TableConfig = require('../TableConfig.js');
|
|
|
24
25
|
var hooks = require('./hooks.js');
|
|
25
26
|
var React = require('react');
|
|
26
27
|
|
|
27
|
-
var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "style", "table"],
|
|
28
|
+
var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "style", "table", "manualRequest"],
|
|
28
29
|
_excluded2 = ["index", "id"];
|
|
29
30
|
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; }
|
|
30
31
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -50,6 +51,8 @@ var EditTable = (function (_ref) {
|
|
|
50
51
|
onEdit = _ref.onEdit,
|
|
51
52
|
style = _ref.style,
|
|
52
53
|
table = _ref.table,
|
|
54
|
+
_ref$manualRequest = _ref.manualRequest,
|
|
55
|
+
manualRequest = _ref$manualRequest === void 0 ? true : _ref$manualRequest,
|
|
53
56
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
54
57
|
var cuTable = hooks.useCuEditTable({
|
|
55
58
|
table: table
|
|
@@ -104,6 +107,11 @@ var EditTable = (function (_ref) {
|
|
|
104
107
|
editableFormRef: defaultEditableFormRef,
|
|
105
108
|
actionRef: defaultActionRef,
|
|
106
109
|
value: data === null || data === void 0 ? void 0 : data.records,
|
|
110
|
+
manualRequest: manualRequest,
|
|
111
|
+
request: function request(params, sorter) {
|
|
112
|
+
run({}, sorter);
|
|
113
|
+
return _Promise.resolve({});
|
|
114
|
+
},
|
|
107
115
|
recordCreatorProps: recordCreatorProps === false ? recordCreatorProps : _objectSpread({
|
|
108
116
|
position: "bottom",
|
|
109
117
|
record: function record() {
|
package/lib/EditTable/modal.d.ts
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { EditableFormInstance, EditableProTableProps } from "@ant-design/pro-table/lib/components/EditableTable";
|
|
2
2
|
import { ParamsType } from "@ant-design/pro-provider";
|
|
3
3
|
import { IPaginationProps } from "../HTablePagination";
|
|
4
|
-
import { EmptyPageRender, ErrorPageRender } from "../modal";
|
|
4
|
+
import { EmptyPageRender, ErrorPageRender, ResultModal } from "../modal";
|
|
5
5
|
import { ActionType, ProColumns } from "@ant-design/pro-table/lib/typing";
|
|
6
6
|
export interface EditTableInstance {
|
|
7
7
|
editableForm: EditableFormInstance | {};
|
|
8
8
|
action: ActionType | {};
|
|
9
9
|
reload: () => void;
|
|
10
10
|
}
|
|
11
|
-
export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination"> {
|
|
11
|
+
export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination" | "dataSource"> {
|
|
12
12
|
creatorButtonText?: string;
|
|
13
13
|
defaultRecordValue?: T;
|
|
14
14
|
recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
|
|
15
|
-
dataSource?: any[];
|
|
15
|
+
dataSource?: ResultModal | any[];
|
|
16
16
|
request?: (params: Record<string, any>) => Promise<T>;
|
|
17
17
|
pagination?: IPaginationProps | false;
|
|
18
18
|
manual?: boolean;
|
|
@@ -15,6 +15,6 @@ interface FilterKeysModal {
|
|
|
15
15
|
preserveSelectedRowKeys?: boolean;
|
|
16
16
|
selectedRowData?: Record<string, any>[];
|
|
17
17
|
}
|
|
18
|
-
export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, preserveSelectedRowKeys,
|
|
18
|
+
export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, preserveSelectedRowKeys, }: FilterKeysModal) => void;
|
|
19
19
|
export declare const useAlwaysShowAlert: (selectedRowData: RowObj, alwaysShowAlert?: boolean) => boolean | undefined;
|
|
20
20
|
export {};
|
|
@@ -92,7 +92,6 @@ var useSynchronousKeys = function useSynchronousKeys(_ref4) {
|
|
|
92
92
|
records = _ref4.records,
|
|
93
93
|
rowKey = _ref4.rowKey,
|
|
94
94
|
preserveSelectedRowKeys = _ref4.preserveSelectedRowKeys;
|
|
95
|
-
_ref4.selectedRowData;
|
|
96
95
|
var _useHTableContext = context.useHTableContext(),
|
|
97
96
|
rowOnChange = _useHTableContext.rowOnChange;
|
|
98
97
|
var findId = function findId(key) {
|
package/lib/hooks/useRowObj.js
CHANGED
package/lib/render/Text.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -23,17 +23,42 @@ export const useListRequest = ({
|
|
|
23
23
|
current: 1,
|
|
24
24
|
pageSize: 10,
|
|
25
25
|
},
|
|
26
|
+
sorter: {},
|
|
26
27
|
};
|
|
27
28
|
}, []);
|
|
29
|
+
const sorterParamsFn = (sorter = {}) => {
|
|
30
|
+
const keysLen = Object.keys(sorter).length;
|
|
31
|
+
if (keysLen === 0) {
|
|
32
|
+
return saveParams.sorter;
|
|
33
|
+
}
|
|
34
|
+
return sorter;
|
|
35
|
+
};
|
|
36
|
+
const sorterMk = (sorter) => {
|
|
37
|
+
const keys = Object.keys(sorter);
|
|
38
|
+
if (keys.length === 0) {
|
|
39
|
+
return {};
|
|
40
|
+
}
|
|
41
|
+
const orderByField = keys[0];
|
|
42
|
+
const asc = sorter[orderByField];
|
|
43
|
+
return {
|
|
44
|
+
orderByField,
|
|
45
|
+
asc: asc === "ascend",
|
|
46
|
+
};
|
|
47
|
+
};
|
|
28
48
|
const { loading, error, run } = useRequest(
|
|
29
|
-
async (params = {}) => {
|
|
49
|
+
async (params = {}, sorter = {}) => {
|
|
30
50
|
const newParams = {
|
|
31
51
|
...saveParams.params,
|
|
32
52
|
...params,
|
|
33
53
|
};
|
|
54
|
+
const cuSorter = sorterParamsFn(sorter);
|
|
55
|
+
saveParams.sorter = cuSorter;
|
|
34
56
|
saveParams.params = newParams;
|
|
35
57
|
if (request) {
|
|
36
|
-
const result = await request(
|
|
58
|
+
const result = await request({
|
|
59
|
+
...newParams,
|
|
60
|
+
...sorterMk(cuSorter),
|
|
61
|
+
});
|
|
37
62
|
setTableDataSource(result);
|
|
38
63
|
return;
|
|
39
64
|
}
|
|
@@ -34,6 +34,7 @@ export default ({
|
|
|
34
34
|
onEdit,
|
|
35
35
|
style,
|
|
36
36
|
table,
|
|
37
|
+
manualRequest=true,
|
|
37
38
|
...props
|
|
38
39
|
}: HEditTableProps) => {
|
|
39
40
|
const cuTable = useCuEditTable({ table });
|
|
@@ -77,6 +78,11 @@ export default ({
|
|
|
77
78
|
editableFormRef={defaultEditableFormRef}
|
|
78
79
|
actionRef={defaultActionRef}
|
|
79
80
|
value={data?.records}
|
|
81
|
+
manualRequest={manualRequest}
|
|
82
|
+
request={(params, sorter) => {
|
|
83
|
+
run({}, sorter);
|
|
84
|
+
return Promise.resolve({});
|
|
85
|
+
}}
|
|
80
86
|
recordCreatorProps={
|
|
81
87
|
recordCreatorProps === false
|
|
82
88
|
? recordCreatorProps
|
|
@@ -4,7 +4,7 @@ import {
|
|
|
4
4
|
} from "@ant-design/pro-table/lib/components/EditableTable";
|
|
5
5
|
import { ParamsType } from "@ant-design/pro-provider";
|
|
6
6
|
import { IPaginationProps } from "../HTablePagination";
|
|
7
|
-
import {
|
|
7
|
+
import {EmptyPageRender, ErrorPageRender, ResultModal} from "../modal";
|
|
8
8
|
import { ActionType, ProColumns } from "@ant-design/pro-table/lib/typing";
|
|
9
9
|
|
|
10
10
|
export interface EditTableInstance {
|
|
@@ -16,14 +16,14 @@ export interface EditTableInstance {
|
|
|
16
16
|
export interface HEditTableProps<T = any>
|
|
17
17
|
extends Omit<
|
|
18
18
|
EditableProTableProps<T, ParamsType>,
|
|
19
|
-
"recordCreatorProps" | "request" | "pagination"
|
|
19
|
+
"recordCreatorProps" | "request" | "pagination"|"dataSource"
|
|
20
20
|
> {
|
|
21
21
|
creatorButtonText?: string;
|
|
22
22
|
defaultRecordValue?: T;
|
|
23
23
|
recordCreatorProps?: Partial<
|
|
24
24
|
EditableProTableProps<T, ParamsType>["recordCreatorProps"]
|
|
25
25
|
>;
|
|
26
|
-
dataSource?: any[];
|
|
26
|
+
dataSource?: ResultModal | any[];
|
|
27
27
|
request?: (params: Record<string, any>) => Promise<T>;
|
|
28
28
|
pagination?: IPaginationProps | false;
|
|
29
29
|
manual?: boolean;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Button, Row, Typography } from "antd";
|
|
2
2
|
import React from "react";
|
|
3
3
|
import { useHTableContext } from "../context";
|
|
4
|
-
import type { ActionRenderFn } from "
|
|
4
|
+
import type { ActionRenderFn } from "../modal";
|
|
5
5
|
const { Text, Link } = Typography;
|
|
6
6
|
interface IProps {
|
|
7
7
|
actionRender?: ActionRenderFn;
|
|
@@ -79,7 +79,7 @@ interface FilterKeysModal {
|
|
|
79
79
|
records?: any[];
|
|
80
80
|
rowKey?: string | GetRowKey<any>;
|
|
81
81
|
preserveSelectedRowKeys?: boolean;
|
|
82
|
-
selectedRowData?:Record<string, any>[];
|
|
82
|
+
selectedRowData?: Record<string, any>[];
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
export const useSynchronousKeys = ({
|
|
@@ -87,12 +87,11 @@ export const useSynchronousKeys = ({
|
|
|
87
87
|
records,
|
|
88
88
|
rowKey,
|
|
89
89
|
preserveSelectedRowKeys,
|
|
90
|
-
selectedRowData
|
|
91
90
|
}: FilterKeysModal) => {
|
|
92
91
|
const { rowOnChange } = useHTableContext();
|
|
93
|
-
const findId = (key,mgArray:Record<string, any>[]=[]) => {
|
|
92
|
+
const findId = (key, mgArray: Record<string, any>[] = []) => {
|
|
94
93
|
const msRecords = records as any[];
|
|
95
|
-
const rowIndex = [...mgArray
|
|
94
|
+
const rowIndex = [...mgArray, ...msRecords].findIndex((item, index) => {
|
|
96
95
|
const id =
|
|
97
96
|
typeof rowKey === "function"
|
|
98
97
|
? rowKey(item, index)
|
|
@@ -101,12 +100,9 @@ export const useSynchronousKeys = ({
|
|
|
101
100
|
});
|
|
102
101
|
return msRecords[rowIndex];
|
|
103
102
|
};
|
|
104
|
-
const deduplication=(array)=>{
|
|
105
|
-
|
|
106
|
-
}
|
|
107
103
|
useEffect(() => {
|
|
108
|
-
if (!selectedRowKeys
|
|
109
|
-
|
|
104
|
+
if (!selectedRowKeys || !records || !rowKey) {
|
|
105
|
+
return;
|
|
110
106
|
}
|
|
111
107
|
if (!preserveSelectedRowKeys) {
|
|
112
108
|
const resultData = selectedRowKeys.map((key) => {
|
|
@@ -115,9 +111,7 @@ export const useSynchronousKeys = ({
|
|
|
115
111
|
rowOnChange(selectedRowKeys, resultData);
|
|
116
112
|
return;
|
|
117
113
|
}
|
|
118
|
-
}, [selectedRowKeys, records, rowKey,preserveSelectedRowKeys]);
|
|
119
|
-
|
|
120
|
-
|
|
114
|
+
}, [selectedRowKeys, records, rowKey, preserveSelectedRowKeys]);
|
|
121
115
|
};
|
|
122
116
|
|
|
123
117
|
export const useAlwaysShowAlert = (
|
|
@@ -50,8 +50,11 @@ export default (bodyProps: HTableBodyProps) => {
|
|
|
50
50
|
...props
|
|
51
51
|
} = bodyProps;
|
|
52
52
|
|
|
53
|
-
const {
|
|
54
|
-
|
|
53
|
+
const {
|
|
54
|
+
selectedRowKeys,
|
|
55
|
+
alwaysShowAlert: configAlwaysShowAlert,
|
|
56
|
+
preserveSelectedRowKeys,
|
|
57
|
+
} = rowSelection || {};
|
|
55
58
|
|
|
56
59
|
const {
|
|
57
60
|
tableInstance: contextTableInstance,
|
|
@@ -90,7 +93,13 @@ export default (bodyProps: HTableBodyProps) => {
|
|
|
90
93
|
columnsState,
|
|
91
94
|
columns: cols,
|
|
92
95
|
});
|
|
93
|
-
useSynchronousKeys({
|
|
96
|
+
useSynchronousKeys({
|
|
97
|
+
selectedRowKeys,
|
|
98
|
+
records,
|
|
99
|
+
rowKey,
|
|
100
|
+
preserveSelectedRowKeys,
|
|
101
|
+
selectedRowData: selectedRowData.rowData,
|
|
102
|
+
});
|
|
94
103
|
const optionsNode = options && (
|
|
95
104
|
<Options
|
|
96
105
|
reload={() => {
|
|
@@ -3,18 +3,16 @@ import { useState } from "react";
|
|
|
3
3
|
import type { RowObj } from "../modal";
|
|
4
4
|
import type { HRowSelection } from "../modal";
|
|
5
5
|
|
|
6
|
-
const initSelectedData=(rowSelection?: HRowSelection | false):RowObj=>{
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
}
|
|
6
|
+
const initSelectedData = (rowSelection?: HRowSelection | false): RowObj => {
|
|
7
|
+
if (!rowSelection) {
|
|
8
|
+
return {};
|
|
9
|
+
}
|
|
10
|
+
const { selectedRowKeys, selectedRowData } = rowSelection;
|
|
11
|
+
return {
|
|
12
|
+
keys: selectedRowKeys,
|
|
13
|
+
rowData: selectedRowData,
|
|
14
|
+
};
|
|
15
|
+
};
|
|
18
16
|
|
|
19
17
|
export default (rowSelection?: HRowSelection | false) => {
|
|
20
18
|
const change = (keys: React.Key[], rowData: any[]) => {
|
|
@@ -24,7 +22,9 @@ export default (rowSelection?: HRowSelection | false) => {
|
|
|
24
22
|
const { onChange } = rowSelection || {};
|
|
25
23
|
onChange?.(keys, rowData);
|
|
26
24
|
};
|
|
27
|
-
const [selectedRowData, setSelectedRowData] = useState<RowObj>(
|
|
25
|
+
const [selectedRowData, setSelectedRowData] = useState<RowObj>(
|
|
26
|
+
initSelectedData(rowSelection)
|
|
27
|
+
);
|
|
28
28
|
const { selectAll = false } = selectedRowData;
|
|
29
29
|
const rowOnChange = (keys: React.Key[], rowData: any[]) => {
|
|
30
30
|
setSelectedRowData({
|
|
@@ -44,6 +44,7 @@ export default (rowSelection?: HRowSelection | false) => {
|
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
46
|
const { preserveSelectedRowKeys } = rowSelection || {};
|
|
47
|
+
console.log(preserveSelectedRowKeys, "preserveSelectedRowKeys");
|
|
47
48
|
if (preserveSelectedRowKeys) {
|
|
48
49
|
return;
|
|
49
50
|
}
|
package/src/components/modal.ts
CHANGED
|
@@ -81,7 +81,7 @@ export type HRowSelection = RowSelectionOuter &
|
|
|
81
81
|
(TableProps<any>["rowSelection"] & {
|
|
82
82
|
alwaysShowAlert?: boolean;
|
|
83
83
|
allCheckType?: "batch" | "single";
|
|
84
|
-
selectedRowData?:Record<string, any>
|
|
84
|
+
selectedRowData?: Record<string, any>[];
|
|
85
85
|
});
|
|
86
86
|
export interface HTableProps
|
|
87
87
|
extends Omit<
|
|
@@ -33,13 +33,23 @@ export default () => {
|
|
|
33
33
|
}}
|
|
34
34
|
pagination={false}
|
|
35
35
|
onEdit={async (data) => {}}
|
|
36
|
-
request={() => {
|
|
37
|
-
|
|
38
|
-
return {
|
|
36
|
+
request={async () => {
|
|
37
|
+
alert("request")
|
|
38
|
+
return {
|
|
39
|
+
records: [{ title: "1", id: 1 }],
|
|
40
|
+
size: 10,
|
|
41
|
+
total: 1,
|
|
42
|
+
current: 1,
|
|
43
|
+
};
|
|
39
44
|
}}
|
|
40
45
|
configData={[
|
|
41
|
-
{ title: "标题", dataIndex: "title" },
|
|
42
|
-
{
|
|
46
|
+
{ title: "标题", sorter: true, dataIndex: "title" },
|
|
47
|
+
{
|
|
48
|
+
title: "标题2",
|
|
49
|
+
dataIndex: "time",
|
|
50
|
+
valueType: "date",
|
|
51
|
+
sorter: true,
|
|
52
|
+
},
|
|
43
53
|
{
|
|
44
54
|
title: "操作",
|
|
45
55
|
valueType: "option",
|
|
@@ -54,6 +64,13 @@ export default () => {
|
|
|
54
64
|
>
|
|
55
65
|
编辑
|
|
56
66
|
</a>,
|
|
67
|
+
<a
|
|
68
|
+
onClick={() => {
|
|
69
|
+
action.reloadAndRest();
|
|
70
|
+
}}
|
|
71
|
+
>
|
|
72
|
+
删除
|
|
73
|
+
</a>,
|
|
57
74
|
],
|
|
58
75
|
},
|
|
59
76
|
]}
|
|
@@ -58,7 +58,7 @@ export default () => {
|
|
|
58
58
|
</>
|
|
59
59
|
);
|
|
60
60
|
}}
|
|
61
|
-
request={() => {
|
|
61
|
+
request={(params) => {
|
|
62
62
|
return new Promise((resolve) => {
|
|
63
63
|
setTimeout(() => {
|
|
64
64
|
resolve({
|
|
@@ -81,7 +81,7 @@ export default () => {
|
|
|
81
81
|
}}
|
|
82
82
|
editDialogTable={dialogTable}
|
|
83
83
|
configData={[
|
|
84
|
-
{ title: "标题", dataIndex: "title" },
|
|
84
|
+
{ title: "标题", dataIndex: "title" ,sorter:true},
|
|
85
85
|
{ title: "标题2", dataIndex: "time", valueType: "date" },
|
|
86
86
|
{
|
|
87
87
|
title: "操作",
|