@hw-component/table 1.10.13 → 1.10.16

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 (18) hide show
  1. package/.eslintcache +1 -1
  2. package/es/DialogTable/Content.js +2 -33
  3. package/es/EditTable/hooks.d.ts +12 -2
  4. package/es/EditTable/hooks.js +88 -45
  5. package/es/EditTable/index.js +16 -20
  6. package/es/EditTable/modal.d.ts +1 -1
  7. package/lib/DialogTable/Content.js +0 -31
  8. package/lib/EditTable/hooks.d.ts +12 -2
  9. package/lib/EditTable/hooks.js +87 -44
  10. package/lib/EditTable/index.js +16 -20
  11. package/lib/EditTable/modal.d.ts +1 -1
  12. package/package.json +1 -1
  13. package/src/components/DialogTable/Content.tsx +3 -3
  14. package/src/components/EditTable/hooks.ts +59 -21
  15. package/src/components/EditTable/index.tsx +15 -19
  16. package/src/components/EditTable/modal.ts +1 -1
  17. package/src/pages/EditTable/index.tsx +52 -48
  18. package/src/pages/ModalEditTable/index.tsx +38 -26
package/es/EditTable/hooks.js CHANGED
@@ -9,11 +9,12 @@ import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/obje
9
9
  import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
10
10
  import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
11
11
  import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
12
+ import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
12
13
  import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
13
14
  import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
14
15
  import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
15
16
  import { useRequest } from 'ahooks';
16
- import { useMemo, useRef } from 'react';
17
+ import { useState, useMemo, useEffect, useRef } from 'react';
17
18
  import config from '../render/config.js';
18
19
 
19
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; }
@@ -22,7 +23,15 @@ var useListRequest = function useListRequest(_ref) {
22
23
  var request = _ref.request,
23
24
  dataSource = _ref.dataSource,
24
25
  manual = _ref.manual;
25
- var relManual = request ? manual : false;
26
+ var _useState = useState({
27
+ records: [],
28
+ total: "0",
29
+ size: "10",
30
+ current: "1"
31
+ }),
32
+ _useState2 = _slicedToArray(_useState, 2),
33
+ tableDataSource = _useState2[0],
34
+ setTableDataSource = _useState2[1];
26
35
  var saveParams = useMemo(function () {
27
36
  return {
28
37
  params: {
@@ -31,38 +40,60 @@ var useListRequest = function useListRequest(_ref) {
31
40
  }
32
41
  };
33
42
  }, []);
34
- return useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
35
- var params,
36
- newParams,
37
- _args = arguments;
38
- return _regeneratorRuntime.wrap(function _callee$(_context) {
39
- while (1) switch (_context.prev = _context.next) {
40
- case 0:
41
- params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
42
- newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
43
- saveParams.params = newParams;
44
- if (!request) {
45
- _context.next = 5;
46
- break;
47
- }
48
- return _context.abrupt("return", request(newParams));
49
- case 5:
50
- if (!_Array$isArray(dataSource)) {
51
- _context.next = 7;
52
- break;
53
- }
54
- return _context.abrupt("return", dataSource);
55
- case 7:
56
- return _context.abrupt("return", dataSource);
57
- case 8:
58
- case "end":
59
- return _context.stop();
60
- }
61
- }, _callee);
62
- })), {
63
- manual: relManual,
64
- refreshDeps: [dataSource]
65
- });
43
+ var _useRequest = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
44
+ var params,
45
+ newParams,
46
+ result,
47
+ _args = arguments;
48
+ return _regeneratorRuntime.wrap(function _callee$(_context) {
49
+ while (1) switch (_context.prev = _context.next) {
50
+ case 0:
51
+ params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
52
+ newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
53
+ saveParams.params = newParams;
54
+ if (!request) {
55
+ _context.next = 9;
56
+ break;
57
+ }
58
+ _context.next = 6;
59
+ return request(newParams);
60
+ case 6:
61
+ result = _context.sent;
62
+ setTableDataSource(result);
63
+ return _context.abrupt("return");
64
+ case 9:
65
+ if (!_Array$isArray(dataSource)) {
66
+ _context.next = 12;
67
+ break;
68
+ }
69
+ setTableDataSource(_objectSpread(_objectSpread({}, tableDataSource), {}, {
70
+ records: dataSource
71
+ }));
72
+ return _context.abrupt("return");
73
+ case 12:
74
+ return _context.abrupt("return", setTableDataSource(dataSource || tableDataSource));
75
+ case 13:
76
+ case "end":
77
+ return _context.stop();
78
+ }
79
+ }, _callee);
80
+ })), {
81
+ manual: true
82
+ }),
83
+ loading = _useRequest.loading,
84
+ error = _useRequest.error,
85
+ run = _useRequest.run;
86
+ useEffect(function () {
87
+ if (!manual) {
88
+ run();
89
+ }
90
+ }, [dataSource]);
91
+ return {
92
+ loading: loading,
93
+ error: error,
94
+ run: run,
95
+ data: tableDataSource
96
+ };
66
97
  };
67
98
  var useCuRef = function useCuRef(_ref3) {
68
99
  var actionRef = _ref3.actionRef,
@@ -77,23 +108,35 @@ var useCuRef = function useCuRef(_ref3) {
77
108
  };
78
109
  };
79
110
  var useColsMk = function useColsMk(_ref4) {
80
- var configData = _ref4.configData;
111
+ var configData = _ref4.configData,
112
+ reload = _ref4.reload;
81
113
  return configData === null || configData === void 0 ? void 0 : _mapInstanceProperty(configData).call(configData, function (item) {
82
114
  var valueType = item.valueType,
83
115
  _render = item.render;
84
116
  var configType = valueType;
85
- if (!config[configType]) {
86
- return item;
117
+ if (config[configType]) {
118
+ return _objectSpread(_objectSpread({}, item), {}, {
119
+ render: function render(dom, entity, index, action, schema) {
120
+ var node = config[configType](item, entity, index);
121
+ if (_render) {
122
+ return _render(node, entity, index, _objectSpread(_objectSpread({}, action), {}, {
123
+ reload: reload
124
+ }), schema);
125
+ }
126
+ return node;
127
+ }
128
+ });
87
129
  }
88
- return _objectSpread(_objectSpread({}, item), {}, {
89
- render: function render(dom, entity, index, action, schema) {
90
- var node = config[configType](item, entity, index);
91
- if (_render) {
92
- return _render(node, entity, index, action, schema);
130
+ if (_render) {
131
+ return _objectSpread(_objectSpread({}, item), {}, {
132
+ render: function render(dom, entity, index, action, schema) {
133
+ return _render(dom, entity, index, _objectSpread(_objectSpread({}, action), {}, {
134
+ reload: reload
135
+ }), schema);
93
136
  }
94
- return node;
95
- }
96
- });
137
+ });
138
+ }
139
+ return item;
97
140
  });
98
141
  };
99
142
 
package/es/EditTable/index.js CHANGED
@@ -1,9 +1,4 @@
1
1
  // welcome to hoo hoo hoo
2
- import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
3
- import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
4
- import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
5
- import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
6
- import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
7
2
  import _Object$keys from '@babel/runtime-corejs3/core-js-stable/object/keys';
8
3
  import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols';
9
4
  import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
@@ -12,6 +7,10 @@ import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/inst
12
7
  import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors';
13
8
  import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/object/define-properties';
14
9
  import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
10
+ import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
11
+ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
12
+ import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
13
+ import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
15
14
  import { jsxs, jsx } from 'react/jsx-runtime';
16
15
  import { EditableProTable } from '@ant-design/pro-table';
17
16
  import { useClassName } from '../hooks/index.js';
@@ -25,7 +24,7 @@ var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProp
25
24
  _excluded2 = ["index", "id"];
26
25
  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
26
  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; }
28
- var HEditTable = (function (_ref) {
27
+ var EditTable = (function (_ref) {
29
28
  var configData = _ref.configData,
30
29
  _ref$rowKey = _ref.rowKey,
31
30
  rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
@@ -66,8 +65,6 @@ var HEditTable = (function (_ref) {
66
65
  tableEmptyRender = _useHTableConfigConte2 === void 0 ? emptyDefaultRender : _useHTableConfigConte2,
67
66
  _useHTableConfigConte3 = _useHTableConfigConte.errorRender,
68
67
  tableErrorRender = _useHTableConfigConte3 === void 0 ? errorDefaultRender : _useHTableConfigConte3;
69
- var isLocalData = _Array$isArray(data);
70
- var values = isLocalData ? data : data === null || data === void 0 ? void 0 : data.records;
71
68
  var _useCuRef = useCuRef({
72
69
  actionRef: actionRef,
73
70
  editableFormRef: editableFormRef
@@ -75,7 +72,8 @@ var HEditTable = (function (_ref) {
75
72
  cuActionRef = _useCuRef.cuActionRef,
76
73
  cuEditableFormRef = _useCuRef.cuEditableFormRef;
77
74
  var columns = useColsMk({
78
- configData: configData
75
+ configData: configData,
76
+ reload: run
79
77
  });
80
78
  return jsxs("div", {
81
79
  className: tableBody,
@@ -83,7 +81,7 @@ var HEditTable = (function (_ref) {
83
81
  renderEmpty: function renderEmpty() {
84
82
  if (error) {
85
83
  return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender({
86
- reload: cuActionRef.current.reload,
84
+ reload: run,
87
85
  error: error
88
86
  });
89
87
  }
@@ -94,10 +92,8 @@ var HEditTable = (function (_ref) {
94
92
  loading: loading,
95
93
  rowKey: rowKey,
96
94
  editableFormRef: cuEditableFormRef,
97
- manualRequest: true,
98
- request: run,
99
95
  actionRef: cuActionRef,
100
- value: values,
96
+ value: data === null || data === void 0 ? void 0 : data.records,
101
97
  recordCreatorProps: _objectSpread({
102
98
  position: "bottom",
103
99
  record: function record() {
@@ -132,8 +128,8 @@ var HEditTable = (function (_ref) {
132
128
  },
133
129
  onSave: function () {
134
130
  var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(key, row) {
135
- var _cuEditableFormRef$cu3, _cuActionRef$current2;
136
- var id, oRow, _cuEditableFormRef$cu2, _cuActionRef$current;
131
+ var _cuEditableFormRef$cu3;
132
+ var id, oRow, _cuEditableFormRef$cu2;
137
133
  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
138
134
  while (1) switch (_context2.prev = _context2.next) {
139
135
  case 0:
@@ -146,7 +142,7 @@ var HEditTable = (function (_ref) {
146
142
  return onAdd === null || onAdd === void 0 ? void 0 : onAdd(oRow);
147
143
  case 4:
148
144
  (_cuEditableFormRef$cu2 = cuEditableFormRef.current) === null || _cuEditableFormRef$cu2 === void 0 || _cuEditableFormRef$cu2.resetFields(["add"]);
149
- (_cuActionRef$current = cuActionRef.current) === null || _cuActionRef$current === void 0 || _cuActionRef$current.reload();
145
+ run();
150
146
  return _context2.abrupt("return");
151
147
  case 7:
152
148
  _context2.next = 9;
@@ -155,7 +151,7 @@ var HEditTable = (function (_ref) {
155
151
  }, oRow));
156
152
  case 9:
157
153
  (_cuEditableFormRef$cu3 = cuEditableFormRef.current) === null || _cuEditableFormRef$cu3 === void 0 || _cuEditableFormRef$cu3.resetFields([key]);
158
- (_cuActionRef$current2 = cuActionRef.current) === null || _cuActionRef$current2 === void 0 || _cuActionRef$current2.reload();
154
+ run();
159
155
  case 11:
160
156
  case "end":
161
157
  return _context2.stop();
@@ -169,8 +165,8 @@ var HEditTable = (function (_ref) {
169
165
  }()
170
166
  }, editable)
171
167
  }, props))
172
- }), jsx(HTablePagination, _objectSpread(_objectSpread({
173
- data: isLocalData ? null : data
168
+ }), pagination === false ? null : jsx(HTablePagination, _objectSpread(_objectSpread({
169
+ data: data
174
170
  }, pagination), {}, {
175
171
  onChange: function onChange(page, pageSize) {
176
172
  run({
@@ -182,5 +178,5 @@ var HEditTable = (function (_ref) {
182
178
  });
183
179
  });
184
180
 
185
- export { HEditTable as default };
181
+ export { EditTable as default };
186
182
  // powered by hdj
package/es/EditTable/modal.d.ts CHANGED
@@ -9,7 +9,7 @@ export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T,
9
9
  recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
10
10
  dataSource?: any[];
11
11
  request?: (params: Record<string, any>) => Promise<T>;
12
- pagination?: IPaginationProps;
12
+ pagination?: IPaginationProps | false;
13
13
  manual?: boolean;
14
14
  emptyRender?: EmptyPageRender;
15
15
  errorRender?: ErrorPageRender;
package/lib/DialogTable/Content.js CHANGED
@@ -11,37 +11,6 @@ var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/obje
11
11
  var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
12
12
  var jsxRuntime = require('react/jsx-runtime');
13
13
  var Table = require('../Table.js');
14
- require('@babel/runtime-corejs3/core-js-stable/promise');
15
- require('react');
16
- require('@hw-component/form');
17
- require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
18
- require('@babel/runtime-corejs3/helpers/slicedToArray');
19
- require('@babel/runtime-corejs3/helpers/asyncToGenerator');
20
- require('@babel/runtime-corejs3/regenerator');
21
- require('@babel/runtime-corejs3/core-js-stable/number/parse-int');
22
- require('@babel/runtime-corejs3/core-js-stable/instance/slice');
23
- require('@babel/runtime-corejs3/core-js-stable/array/is-array');
24
- require('ahooks');
25
- require('@ant-design/pro-table');
26
- require('@babel/runtime-corejs3/core-js-stable/instance/find-index');
27
- require('@babel/runtime-corejs3/core-js-stable/instance/map');
28
- require('@babel/runtime-corejs3/core-js-stable/instance/keys');
29
- require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
30
- require('@babel/runtime-corejs3/core-js-stable/instance/concat');
31
- require('@babel/runtime-corejs3/core-js-stable/instance/splice');
32
- require('antd/es/config-provider');
33
- require('../render/config.js');
34
- require('@babel/runtime-corejs3/helpers/toConsumableArray');
35
- require('@babel/runtime-corejs3/helpers/typeof');
36
- require('antd');
37
- require('@babel/runtime-corejs3/core-js-stable/instance/every');
38
- require('@babel/runtime-corejs3/core-js-stable/set');
39
- require('../HTableBody/AlertMsg.js');
40
- require('@ant-design/icons');
41
- require('../HTableBody/Options/Title.js');
42
- require('../HTableFooter/index.js');
43
- require('../HTableHeader/Context.js');
44
- require('../HTableHeader/RangePickerSearch.js');
45
14
  var index = require('../EditTable/index.js');
46
15
 
47
16
  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; }
package/lib/EditTable/hooks.d.ts CHANGED
@@ -2,12 +2,21 @@ import { HEditTableProps } from "./modal";
2
2
  import { MutableRefObject } from "react";
3
3
  import type { ActionType } from "@ant-design/pro-table";
4
4
  import { EditableFormInstance } from "@ant-design/pro-table/lib/components/EditableTable";
5
- export declare const useListRequest: ({ request, dataSource, manual }: HEditTableProps) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [params?: any]>;
5
+ import { ResultModal } from "../modal";
6
+ export declare const useListRequest: ({ request, dataSource, manual, }: HEditTableProps) => {
7
+ loading: boolean;
8
+ error: Error | undefined;
9
+ run: (params?: any) => Promise<void>;
10
+ data: ResultModal;
11
+ };
6
12
  export declare const useCuRef: ({ actionRef, editableFormRef }: HEditTableProps) => {
7
13
  cuActionRef: MutableRefObject<ActionType>;
8
14
  cuEditableFormRef: MutableRefObject<EditableFormInstance>;
9
15
  };
10
- export declare const useColsMk: ({ configData }: HEditTableProps) => (import("@ant-design/pro-table").ProColumnType<any, "text"> | {
16
+ interface ColProps extends HEditTableProps {
17
+ reload: VoidFunction;
18
+ }
19
+ export declare const useColsMk: ({ configData, reload }: ColProps) => (import("@ant-design/pro-table").ProColumnType<any, "text"> | {
11
20
  render: (dom: any, entity: any, index: any, action: any, schema: any) => any;
12
21
  children: import("@ant-design/pro-table").ProColumns<any, "text">[];
13
22
  key?: import("react").Key | undefined;
@@ -1555,3 +1564,4 @@ export declare const useColsMk: ({ configData }: HEditTableProps) => (import("@a
1555
1564
  } | undefined) | undefined;
1556
1565
  fieldProps?: any;
1557
1566
  })[] | undefined;
1567
+ export {};
package/lib/EditTable/hooks.js CHANGED
@@ -10,6 +10,7 @@ var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/ob
10
10
  var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
11
11
  var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
12
12
  var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
13
+ var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
13
14
  var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
14
15
  var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
15
16
  var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
@@ -23,7 +24,15 @@ var useListRequest = function useListRequest(_ref) {
23
24
  var request = _ref.request,
24
25
  dataSource = _ref.dataSource,
25
26
  manual = _ref.manual;
26
- var relManual = request ? manual : false;
27
+ var _useState = React.useState({
28
+ records: [],
29
+ total: "0",
30
+ size: "10",
31
+ current: "1"
32
+ }),
33
+ _useState2 = _slicedToArray(_useState, 2),
34
+ tableDataSource = _useState2[0],
35
+ setTableDataSource = _useState2[1];
27
36
  var saveParams = React.useMemo(function () {
28
37
  return {
29
38
  params: {
@@ -32,38 +41,60 @@ var useListRequest = function useListRequest(_ref) {
32
41
  }
33
42
  };
34
43
  }, []);
35
- return ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
36
- var params,
37
- newParams,
38
- _args = arguments;
39
- return _regeneratorRuntime.wrap(function _callee$(_context) {
40
- while (1) switch (_context.prev = _context.next) {
41
- case 0:
42
- params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
43
- newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
44
- saveParams.params = newParams;
45
- if (!request) {
46
- _context.next = 5;
47
- break;
48
- }
49
- return _context.abrupt("return", request(newParams));
50
- case 5:
51
- if (!_Array$isArray(dataSource)) {
52
- _context.next = 7;
53
- break;
54
- }
55
- return _context.abrupt("return", dataSource);
56
- case 7:
57
- return _context.abrupt("return", dataSource);
58
- case 8:
59
- case "end":
60
- return _context.stop();
61
- }
62
- }, _callee);
63
- })), {
64
- manual: relManual,
65
- refreshDeps: [dataSource]
66
- });
44
+ var _useRequest = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
45
+ var params,
46
+ newParams,
47
+ result,
48
+ _args = arguments;
49
+ return _regeneratorRuntime.wrap(function _callee$(_context) {
50
+ while (1) switch (_context.prev = _context.next) {
51
+ case 0:
52
+ params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
53
+ newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
54
+ saveParams.params = newParams;
55
+ if (!request) {
56
+ _context.next = 9;
57
+ break;
58
+ }
59
+ _context.next = 6;
60
+ return request(newParams);
61
+ case 6:
62
+ result = _context.sent;
63
+ setTableDataSource(result);
64
+ return _context.abrupt("return");
65
+ case 9:
66
+ if (!_Array$isArray(dataSource)) {
67
+ _context.next = 12;
68
+ break;
69
+ }
70
+ setTableDataSource(_objectSpread(_objectSpread({}, tableDataSource), {}, {
71
+ records: dataSource
72
+ }));
73
+ return _context.abrupt("return");
74
+ case 12:
75
+ return _context.abrupt("return", setTableDataSource(dataSource || tableDataSource));
76
+ case 13:
77
+ case "end":
78
+ return _context.stop();
79
+ }
80
+ }, _callee);
81
+ })), {
82
+ manual: true
83
+ }),
84
+ loading = _useRequest.loading,
85
+ error = _useRequest.error,
86
+ run = _useRequest.run;
87
+ React.useEffect(function () {
88
+ if (!manual) {
89
+ run();
90
+ }
91
+ }, [dataSource]);
92
+ return {
93
+ loading: loading,
94
+ error: error,
95
+ run: run,
96
+ data: tableDataSource
97
+ };
67
98
  };
68
99
  var useCuRef = function useCuRef(_ref3) {
69
100
  var actionRef = _ref3.actionRef,
@@ -78,23 +109,35 @@ var useCuRef = function useCuRef(_ref3) {
78
109
  };
79
110
  };
80
111
  var useColsMk = function useColsMk(_ref4) {
81
- var configData = _ref4.configData;
112
+ var configData = _ref4.configData,
113
+ reload = _ref4.reload;
82
114
  return configData === null || configData === void 0 ? void 0 : _mapInstanceProperty(configData).call(configData, function (item) {
83
115
  var valueType = item.valueType,
84
116
  _render = item.render;
85
117
  var configType = valueType;
86
- if (!config.default[configType]) {
87
- return item;
118
+ if (config.default[configType]) {
119
+ return _objectSpread(_objectSpread({}, item), {}, {
120
+ render: function render(dom, entity, index, action, schema) {
121
+ var node = config.default[configType](item, entity, index);
122
+ if (_render) {
123
+ return _render(node, entity, index, _objectSpread(_objectSpread({}, action), {}, {
124
+ reload: reload
125
+ }), schema);
126
+ }
127
+ return node;
128
+ }
129
+ });
88
130
  }
89
- return _objectSpread(_objectSpread({}, item), {}, {
90
- render: function render(dom, entity, index, action, schema) {
91
- var node = config.default[configType](item, entity, index);
92
- if (_render) {
93
- return _render(node, entity, index, action, schema);
131
+ if (_render) {
132
+ return _objectSpread(_objectSpread({}, item), {}, {
133
+ render: function render(dom, entity, index, action, schema) {
134
+ return _render(dom, entity, index, _objectSpread(_objectSpread({}, action), {}, {
135
+ reload: reload
136
+ }), schema);
94
137
  }
95
- return node;
96
- }
97
- });
138
+ });
139
+ }
140
+ return item;
98
141
  });
99
142
  };
100
143
 
package/lib/EditTable/index.js CHANGED
@@ -2,11 +2,6 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
6
- var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
7
- var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
8
- var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
9
- var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
10
5
  var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
11
6
  var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
12
7
  var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
@@ -15,6 +10,10 @@ var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/in
15
10
  var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
16
11
  var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
17
12
  var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
13
+ var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
14
+ var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
15
+ var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
16
+ var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
18
17
  var jsxRuntime = require('react/jsx-runtime');
19
18
  var ProTable = require('@ant-design/pro-table');
20
19
  var index = require('../hooks/index.js');
@@ -28,7 +27,7 @@ var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProp
28
27
  _excluded2 = ["index", "id"];
29
28
  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
29
  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; }
31
- var HEditTable = (function (_ref) {
30
+ var EditTable = (function (_ref) {
32
31
  var configData = _ref.configData,
33
32
  _ref$rowKey = _ref.rowKey,
34
33
  rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
@@ -69,8 +68,6 @@ var HEditTable = (function (_ref) {
69
68
  tableEmptyRender = _useHTableConfigConte2 === void 0 ? defaultRender.emptyDefaultRender : _useHTableConfigConte2,
70
69
  _useHTableConfigConte3 = _useHTableConfigConte.errorRender,
71
70
  tableErrorRender = _useHTableConfigConte3 === void 0 ? defaultRender.errorDefaultRender : _useHTableConfigConte3;
72
- var isLocalData = _Array$isArray(data);
73
- var values = isLocalData ? data : data === null || data === void 0 ? void 0 : data.records;
74
71
  var _useCuRef = hooks.useCuRef({
75
72
  actionRef: actionRef,
76
73
  editableFormRef: editableFormRef
@@ -78,7 +75,8 @@ var HEditTable = (function (_ref) {
78
75
  cuActionRef = _useCuRef.cuActionRef,
79
76
  cuEditableFormRef = _useCuRef.cuEditableFormRef;
80
77
  var columns = hooks.useColsMk({
81
- configData: configData
78
+ configData: configData,
79
+ reload: run
82
80
  });
83
81
  return jsxRuntime.jsxs("div", {
84
82
  className: tableBody,
@@ -86,7 +84,7 @@ var HEditTable = (function (_ref) {
86
84
  renderEmpty: function renderEmpty() {
87
85
  if (error) {
88
86
  return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender({
89
- reload: cuActionRef.current.reload,
87
+ reload: run,
90
88
  error: error
91
89
  });
92
90
  }
@@ -97,10 +95,8 @@ var HEditTable = (function (_ref) {
97
95
  loading: loading,
98
96
  rowKey: rowKey,
99
97
  editableFormRef: cuEditableFormRef,
100
- manualRequest: true,
101
- request: run,
102
98
  actionRef: cuActionRef,
103
- value: values,
99
+ value: data === null || data === void 0 ? void 0 : data.records,
104
100
  recordCreatorProps: _objectSpread({
105
101
  position: "bottom",
106
102
  record: function record() {
@@ -135,8 +131,8 @@ var HEditTable = (function (_ref) {
135
131
  },
136
132
  onSave: function () {
137
133
  var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(key, row) {
138
- var _cuEditableFormRef$cu3, _cuActionRef$current2;
139
- var id, oRow, _cuEditableFormRef$cu2, _cuActionRef$current;
134
+ var _cuEditableFormRef$cu3;
135
+ var id, oRow, _cuEditableFormRef$cu2;
140
136
  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
141
137
  while (1) switch (_context2.prev = _context2.next) {
142
138
  case 0:
@@ -149,7 +145,7 @@ var HEditTable = (function (_ref) {
149
145
  return onAdd === null || onAdd === void 0 ? void 0 : onAdd(oRow);
150
146
  case 4:
151
147
  (_cuEditableFormRef$cu2 = cuEditableFormRef.current) === null || _cuEditableFormRef$cu2 === void 0 || _cuEditableFormRef$cu2.resetFields(["add"]);
152
- (_cuActionRef$current = cuActionRef.current) === null || _cuActionRef$current === void 0 || _cuActionRef$current.reload();
148
+ run();
153
149
  return _context2.abrupt("return");
154
150
  case 7:
155
151
  _context2.next = 9;
@@ -158,7 +154,7 @@ var HEditTable = (function (_ref) {
158
154
  }, oRow));
159
155
  case 9:
160
156
  (_cuEditableFormRef$cu3 = cuEditableFormRef.current) === null || _cuEditableFormRef$cu3 === void 0 || _cuEditableFormRef$cu3.resetFields([key]);
161
- (_cuActionRef$current2 = cuActionRef.current) === null || _cuActionRef$current2 === void 0 || _cuActionRef$current2.reload();
157
+ run();
162
158
  case 11:
163
159
  case "end":
164
160
  return _context2.stop();
@@ -172,8 +168,8 @@ var HEditTable = (function (_ref) {
172
168
  }()
173
169
  }, editable)
174
170
  }, props))
175
- }), jsxRuntime.jsx(index$1.default, _objectSpread(_objectSpread({
176
- data: isLocalData ? null : data
171
+ }), pagination === false ? null : jsxRuntime.jsx(index$1.default, _objectSpread(_objectSpread({
172
+ data: data
177
173
  }, pagination), {}, {
178
174
  onChange: function onChange(page, pageSize) {
179
175
  run({
@@ -185,5 +181,5 @@ var HEditTable = (function (_ref) {
185
181
  });
186
182
  });
187
183
 
188
- exports.default = HEditTable;
184
+ exports.default = EditTable;
189
185
  // powered by h
package/lib/EditTable/modal.d.ts CHANGED
@@ -9,7 +9,7 @@ export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T,
9
9
  recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
10
10
  dataSource?: any[];
11
11
  request?: (params: Record<string, any>) => Promise<T>;
12
- pagination?: IPaginationProps;
12
+ pagination?: IPaginationProps | false;
13
13
  manual?: boolean;
14
14
  emptyRender?: EmptyPageRender;
15
15
  errorRender?: ErrorPageRender;