@hw-component/table 0.0.2-beta-v11 → 0.0.2-beta-v12

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.
@@ -9,7 +9,10 @@ import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/defi
9
9
  import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
10
10
  import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
11
11
  import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
12
+ import _keysInstanceProperty from '@babel/runtime-corejs3/core-js/instance/keys';
13
+ import _Number$parseInt from '@babel/runtime-corejs3/core-js/number/parse-int';
12
14
  import { jsx } from 'react/jsx-runtime';
15
+ import ProTable from '@ant-design/pro-table';
13
16
  import { useCols, useSynchronousKeys } from './hooks.js';
14
17
  import { useHTableContext } from '../context.js';
15
18
  import 'antd';
@@ -19,36 +22,43 @@ var _excluded = ["loading", "configData", "pagination", "onPageChange", "rowSele
19
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; }
20
23
  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; }
21
24
  var Body = (function (_ref) {
22
- _ref.loading;
23
- var configData = _ref.configData;
24
- _ref.pagination;
25
- _ref.onPageChange;
26
- var _ref$rowSelection = _ref.rowSelection,
25
+ var loading = _ref.loading,
26
+ configData = _ref.configData,
27
+ _ref$pagination = _ref.pagination,
28
+ pagination = _ref$pagination === void 0 ? {} : _ref$pagination,
29
+ onPageChange = _ref.onPageChange,
30
+ _ref$rowSelection = _ref.rowSelection,
27
31
  rowSelection = _ref$rowSelection === void 0 ? {} : _ref$rowSelection,
28
32
  _ref$rowKey = _ref.rowKey,
29
33
  rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
30
34
  emptyRender = _ref.emptyRender,
31
35
  errorRender = _ref.errorRender,
32
- tableStyle = _ref.tableStyle;
33
- _objectWithoutProperties(_ref, _excluded);
34
- var selectedRowKeys = rowSelection.selectedRowKeys;
35
- rowSelection.onChange;
36
+ tableStyle = _ref.tableStyle,
37
+ props = _objectWithoutProperties(_ref, _excluded);
38
+ var selectedRowKeys = rowSelection.selectedRowKeys,
39
+ onChange = rowSelection.onChange;
36
40
  var _useHTableContext = useHTableContext(),
37
41
  tableInstance = _useHTableContext.tableInstance,
38
- data = _useHTableContext.data;
39
- _useHTableContext.selectedRowData;
40
- _useHTableContext.rowOnChange;
42
+ data = _useHTableContext.data,
43
+ selectedRowData = _useHTableContext.selectedRowData,
44
+ rowOnChange = _useHTableContext.rowOnChange;
41
45
  _useHTableContext.error;
42
46
  useHTableConfigContext({
43
47
  emptyRender: emptyRender,
44
48
  errorRender: errorRender
45
49
  });
46
50
  var _ref2 = data || {},
47
- records = _ref2.records;
48
- _ref2.size;
49
- _ref2.current;
50
- _ref2.total;
51
- useCols(configData, tableInstance);
51
+ records = _ref2.records,
52
+ size = _ref2.size,
53
+ current = _ref2.current,
54
+ total = _ref2.total;
55
+ var cols = useCols(configData, tableInstance);
56
+ var change = function change(key, rowData) {
57
+ if (onChange) {
58
+ return onChange(key, rowData);
59
+ }
60
+ rowOnChange(key, rowData);
61
+ };
52
62
  useSynchronousKeys({
53
63
  selectedRowKeys: selectedRowKeys,
54
64
  records: records,
@@ -60,9 +70,32 @@ var Body = (function (_ref) {
60
70
  overflow: "hidden"
61
71
  }, tableStyle),
62
72
  className: "hw_table_body",
63
- children: jsx("div", {
64
- children: "ffff"
65
- })
73
+ children: jsx(ProTable, _objectSpread(_objectSpread({}, props), {}, {
74
+ columns: cols,
75
+ tableAlertRender: false,
76
+ search: false,
77
+ rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
78
+ selectedRowKeys: _keysInstanceProperty(selectedRowData),
79
+ onChange: change
80
+ }),
81
+ loading: loading,
82
+ rowKey: rowKey,
83
+ dataSource: records,
84
+ onChange: function onChange(paginationData) {
85
+ var ps = paginationData.pageSize,
86
+ pn = paginationData.current;
87
+ onPageChange === null || onPageChange === void 0 || onPageChange({
88
+ size: ps,
89
+ current: pn
90
+ });
91
+ },
92
+ pagination: pagination === false ? pagination : _objectSpread({
93
+ current: _Number$parseInt(current || "1", 10),
94
+ total: _Number$parseInt(total || "0", 10),
95
+ pageSize: _Number$parseInt(size || "10", 10),
96
+ showQuickJumper: true
97
+ }, pagination)
98
+ }))
66
99
  });
67
100
  });
68
101
 
@@ -12,7 +12,10 @@ var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/de
12
12
  var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
13
13
  var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
14
14
  var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
15
+ var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
16
+ var _Number$parseInt = require('@babel/runtime-corejs3/core-js/number/parse-int');
15
17
  var jsxRuntime = require('react/jsx-runtime');
18
+ var ProTable = require('@ant-design/pro-table');
16
19
  var hooks = require('./hooks.js');
17
20
  var context = require('../context.js');
18
21
  require('antd');
@@ -22,36 +25,43 @@ var _excluded = ["loading", "configData", "pagination", "onPageChange", "rowSele
22
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; }
23
26
  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; }
24
27
  var Body = (function (_ref) {
25
- _ref.loading;
26
- var configData = _ref.configData;
27
- _ref.pagination;
28
- _ref.onPageChange;
29
- var _ref$rowSelection = _ref.rowSelection,
28
+ var loading = _ref.loading,
29
+ configData = _ref.configData,
30
+ _ref$pagination = _ref.pagination,
31
+ pagination = _ref$pagination === void 0 ? {} : _ref$pagination,
32
+ onPageChange = _ref.onPageChange,
33
+ _ref$rowSelection = _ref.rowSelection,
30
34
  rowSelection = _ref$rowSelection === void 0 ? {} : _ref$rowSelection,
31
35
  _ref$rowKey = _ref.rowKey,
32
36
  rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
33
37
  emptyRender = _ref.emptyRender,
34
38
  errorRender = _ref.errorRender,
35
- tableStyle = _ref.tableStyle;
36
- _objectWithoutProperties(_ref, _excluded);
37
- var selectedRowKeys = rowSelection.selectedRowKeys;
38
- rowSelection.onChange;
39
+ tableStyle = _ref.tableStyle,
40
+ props = _objectWithoutProperties(_ref, _excluded);
41
+ var selectedRowKeys = rowSelection.selectedRowKeys,
42
+ onChange = rowSelection.onChange;
39
43
  var _useHTableContext = context.useHTableContext(),
40
44
  tableInstance = _useHTableContext.tableInstance,
41
- data = _useHTableContext.data;
42
- _useHTableContext.selectedRowData;
43
- _useHTableContext.rowOnChange;
45
+ data = _useHTableContext.data,
46
+ selectedRowData = _useHTableContext.selectedRowData,
47
+ rowOnChange = _useHTableContext.rowOnChange;
44
48
  _useHTableContext.error;
45
49
  TableConfig.useHTableConfigContext({
46
50
  emptyRender: emptyRender,
47
51
  errorRender: errorRender
48
52
  });
49
53
  var _ref2 = data || {},
50
- records = _ref2.records;
51
- _ref2.size;
52
- _ref2.current;
53
- _ref2.total;
54
- hooks.useCols(configData, tableInstance);
54
+ records = _ref2.records,
55
+ size = _ref2.size,
56
+ current = _ref2.current,
57
+ total = _ref2.total;
58
+ var cols = hooks.useCols(configData, tableInstance);
59
+ var change = function change(key, rowData) {
60
+ if (onChange) {
61
+ return onChange(key, rowData);
62
+ }
63
+ rowOnChange(key, rowData);
64
+ };
55
65
  hooks.useSynchronousKeys({
56
66
  selectedRowKeys: selectedRowKeys,
57
67
  records: records,
@@ -63,9 +73,32 @@ var Body = (function (_ref) {
63
73
  overflow: "hidden"
64
74
  }, tableStyle),
65
75
  className: "hw_table_body",
66
- children: jsxRuntime.jsx("div", {
67
- children: "ffff"
68
- })
76
+ children: jsxRuntime.jsx(ProTable, _objectSpread(_objectSpread({}, props), {}, {
77
+ columns: cols,
78
+ tableAlertRender: false,
79
+ search: false,
80
+ rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
81
+ selectedRowKeys: _keysInstanceProperty(selectedRowData),
82
+ onChange: change
83
+ }),
84
+ loading: loading,
85
+ rowKey: rowKey,
86
+ dataSource: records,
87
+ onChange: function onChange(paginationData) {
88
+ var ps = paginationData.pageSize,
89
+ pn = paginationData.current;
90
+ onPageChange === null || onPageChange === void 0 || onPageChange({
91
+ size: ps,
92
+ current: pn
93
+ });
94
+ },
95
+ pagination: pagination === false ? pagination : _objectSpread({
96
+ current: _Number$parseInt(current || "1", 10),
97
+ total: _Number$parseInt(total || "0", 10),
98
+ pageSize: _Number$parseInt(size || "10", 10),
99
+ showQuickJumper: true
100
+ }, pagination)
101
+ }))
69
102
  });
70
103
  });
71
104
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/table",
3
- "version": "0.0.2-beta-v11",
3
+ "version": "0.0.2-beta-v12",
4
4
  "description": "基于antd二次开发table组件",
5
5
  "keywords": [
6
6
  "table"
@@ -55,7 +55,31 @@ export default ({
55
55
  style={{ borderRadius: 4, overflow: "hidden", ...tableStyle }}
56
56
  className="hw_table_body"
57
57
  >
58
- <div>ffff</div>
58
+ <ProTable
59
+ {...props}
60
+ columns={cols}
61
+ tableAlertRender={false}
62
+ search={false}
63
+ rowSelection={{
64
+ ...rowSelection,
65
+ selectedRowKeys: selectedRowData.keys,
66
+ onChange: change,
67
+ }}
68
+ loading={loading}
69
+ rowKey={rowKey}
70
+ dataSource={records}
71
+ onChange={(paginationData) => {
72
+ const { pageSize: ps, current: pn } = paginationData;
73
+ onPageChange?.({ size: ps, current: pn });
74
+ }}
75
+ pagination={pagination===false?pagination:{
76
+ current: Number.parseInt(current || "1", 10),
77
+ total: Number.parseInt(total || "0", 10),
78
+ pageSize: Number.parseInt(size || "10", 10),
79
+ showQuickJumper: true,
80
+ ...pagination,
81
+ }}
82
+ />
59
83
  </div>
60
84
  );
61
85
  };