@hw-component/table 1.9.59 → 1.9.61

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 (33) hide show
  1. package/.eslintcache +1 -1
  2. package/es/HTableBody/HeaderTitle/index.d.ts +1 -1
  3. package/es/HTableBody/{hooks.d.ts → hooks/useColData.d.ts} +3 -16
  4. package/es/HTableBody/{hooks.js → hooks/useColData.js} +21 -58
  5. package/es/HTableBody/hooks/useControl.d.ts +16 -0
  6. package/es/HTableBody/hooks/useControl.js +119 -0
  7. package/es/HTableBody/index.d.ts +2 -27
  8. package/es/HTableBody/index.js +9 -21
  9. package/es/HTableBody/modal.d.ts +27 -0
  10. package/es/Table.js +2 -1
  11. package/es/modal.d.ts +1 -1
  12. package/lib/HTableBody/HeaderTitle/index.d.ts +1 -1
  13. package/lib/HTableBody/{hooks.d.ts → hooks/useColData.d.ts} +3 -16
  14. package/lib/HTableBody/{hooks.js → hooks/useColData.js} +20 -59
  15. package/lib/HTableBody/hooks/useControl.d.ts +16 -0
  16. package/lib/HTableBody/hooks/useControl.js +122 -0
  17. package/lib/HTableBody/index.d.ts +2 -27
  18. package/lib/HTableBody/index.js +13 -25
  19. package/lib/HTableBody/modal.d.ts +27 -0
  20. package/lib/Table.js +2 -1
  21. package/lib/modal.d.ts +1 -1
  22. package/package.json +1 -1
  23. package/src/components/HTableBody/HeaderTitle/index.tsx +1 -1
  24. package/src/components/HTableBody/{hooks.tsx → hooks/useColData.tsx} +27 -61
  25. package/src/components/HTableBody/hooks/useControl.tsx +106 -0
  26. package/src/components/HTableBody/index.tsx +13 -62
  27. package/src/components/HTableBody/modal.ts +41 -0
  28. package/src/components/Table.tsx +1 -1
  29. package/src/components/index.less +1 -1
  30. package/src/components/modal.ts +1 -1
  31. package/src/components/render/config.tsx +1 -1
  32. package/src/components/styles/local.less +1 -0
  33. package/src/pages/Table/index.tsx +16 -14
@@ -12,7 +12,8 @@ import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWitho
12
12
  import _keysInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/keys';
13
13
  import { jsx, jsxs } from 'react/jsx-runtime';
14
14
  import ProTable from '@ant-design/pro-table';
15
- import { useSize, useCols, useColumnsStateType, useSynchronousKeys } from './hooks.js';
15
+ import { useSize, useSynchronousKeys, useTableChange } from './hooks/useControl.js';
16
+ import { useCols, useColumnsStateType } from './hooks/useColData.js';
16
17
  import { useHTableContext } from '../context.js';
17
18
  import { Space, Alert, ConfigProvider } from 'antd';
18
19
  import { useHTableConfigContext } from '../TableConfig.js';
@@ -123,6 +124,12 @@ var Body = (function (bodyProps) {
123
124
  tableStyle: tableStyle
124
125
  }),
125
126
  defaultTableStyle = _useHTableConfigConte4.tableStyle;
127
+ var change = useTableChange({
128
+ columns: cols,
129
+ onChange: tableOnchange,
130
+ table: tableInstance,
131
+ localSorter: localSorter
132
+ });
126
133
  return jsx("div", {
127
134
  style: defaultTableStyle,
128
135
  className: "hw_table_body ".concat(className),
@@ -155,26 +162,7 @@ var Body = (function (bodyProps) {
155
162
  columns: cols,
156
163
  size: cuSize,
157
164
  search: false,
158
- onChange: function onChange(page, filters, sorter, extra) {
159
- if (tableOnchange) {
160
- return tableOnchange(page, filters, sorter, extra);
161
- }
162
- var field = sorter.field,
163
- order = sorter.order,
164
- column = sorter.column;
165
- var _ref3 = column || {},
166
- colSorter = _ref3.sorter;
167
- if (localSorter || typeof colSorter === "function") {
168
- return;
169
- }
170
- var orderByField = typeof order === "undefined" ? undefined : field;
171
- var asc = typeof order === "undefined" ? undefined : order === "ascend";
172
- tableInstance.table.reloadWithParams({
173
- current: 1,
174
- orderByField: orderByField,
175
- asc: asc
176
- });
177
- },
165
+ onChange: change,
178
166
  tableStyle: {
179
167
  paddingBottom: 0
180
168
  },
@@ -0,0 +1,27 @@
1
+ import type { OptionConfig } from "@ant-design/pro-table/lib/components/ToolBar";
2
+ import type React from "react";
3
+ import type { ProTableProps } from "@ant-design/pro-table";
4
+ import type { ActionRenderFn, ConfigDataModal, HRowSelection, HTableInstance, ParamsModal } from "@/components/modal";
5
+ import type { AffixProps } from "antd/lib/affix";
6
+ import type { IPaginationProps } from "@/components/HTablePagination";
7
+ export interface OptionModal extends OptionConfig {
8
+ settingRender?: () => React.ReactNode;
9
+ }
10
+ export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection" | "options" | "pagination"> {
11
+ configData?: ConfigDataModal;
12
+ onPageChange?: (params: ParamsModal) => void;
13
+ emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
14
+ errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
15
+ tableStyle?: React.CSSProperties;
16
+ paginationStyle?: React.CSSProperties;
17
+ actionRender?: ActionRenderFn;
18
+ rowSelection?: HRowSelection | false;
19
+ affixProps?: AffixProps | false;
20
+ goTop?: boolean;
21
+ optionsRender?: (node: React.ReactNode) => React.ReactNode;
22
+ paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
23
+ localSorter?: boolean;
24
+ options?: OptionModal | false;
25
+ table?: HTableInstance;
26
+ pagination?: IPaginationProps | false;
27
+ }
package/es/Table.js CHANGED
@@ -37,7 +37,8 @@ var Table = (function (_ref) {
37
37
  _ref$action = _ref.action,
38
38
  action = _ref$action === void 0 ? {} : _ref$action;
39
39
  _ref.spaceSize;
40
- var className = _ref.className,
40
+ var _ref$className = _ref.className,
41
+ className = _ref$className === void 0 ? "" : _ref$className,
41
42
  paginationStyle = _ref.paginationStyle,
42
43
  _ref$rowKey = _ref.rowKey,
43
44
  rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
package/es/modal.d.ts CHANGED
@@ -6,7 +6,7 @@ import type React from "react";
6
6
  import type { ModalProps } from "antd";
7
7
  import type { TableProps } from "antd/lib/table";
8
8
  import type { AffixProps } from "antd/lib/affix";
9
- import type { OptionModal } from "./HTableBody";
9
+ import type { OptionModal } from "./HTableBody/modal";
10
10
  import type { DrawerProps } from "antd";
11
11
  import type { IPaginationProps } from "@/components/HTablePagination";
12
12
  export interface RowObj {
@@ -1,4 +1,4 @@
1
- import type { HTableBodyProps } from "../index";
1
+ import type { HTableBodyProps } from "../modal";
2
2
  import React from "react";
3
3
  interface IProps {
4
4
  headerTitle: HTableBodyProps["headerTitle"];
@@ -1,22 +1,9 @@
1
- import type { HTableProps, ConfigDataModal } from "../modal";
2
- import React from "react";
3
- import type { GetRowKey } from "rc-table/lib/interface";
4
- import type { SizeType } from "antd/lib/config-provider/SizeContext";
5
- import type { ColumnsStateType } from "@ant-design/pro-table/es/typing";
1
+ import type { ConfigDataModal, HTableProps } from "@/components/modal";
6
2
  import type { ColumnsState } from "@ant-design/pro-table/es/container";
7
- export declare const useCols: ({ configData, rowSelection, table, bordered }: HTableProps) => {
3
+ import type { ColumnsStateType } from "@ant-design/pro-table/es/typing";
4
+ export declare const useCols: ({ configData, rowSelection, table, bordered, }: HTableProps) => {
8
5
  cols: ConfigDataModal;
9
6
  };
10
- interface FilterKeysModal {
11
- selectedRowKeys?: React.Key[];
12
- records?: any[];
13
- rowKey?: string | GetRowKey<any>;
14
- }
15
- export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, }: FilterKeysModal) => void;
16
- export declare const useSize: (size: SizeType) => {
17
- cuSize: "small" | "middle" | "large" | undefined;
18
- setCuSize: React.Dispatch<React.SetStateAction<"small" | "middle" | "large" | undefined>>;
19
- };
20
7
  interface useColumnsStateTypeModal {
21
8
  columnsState?: ColumnsStateType;
22
9
  columns: ConfigDataModal;
@@ -13,17 +13,16 @@ var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/ins
13
13
  var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
14
14
  var _spliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/splice');
15
15
  var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
16
- var _findIndexInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find-index');
17
16
  var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
18
17
  var jsxRuntime = require('react/jsx-runtime');
18
+ var context = require('../../context.js');
19
19
  var React = require('react');
20
- var context = require('../context.js');
21
- var RowSelection = require('./RowSelection.js');
22
- var utils = require('./utils.js');
23
- var index$1 = require('../render/index.js');
24
- var TableConfig = require('../TableConfig.js');
25
- var config = require('../render/config.js');
26
- var index = require('../hooks/index.js');
20
+ var index = require('../../hooks/index.js');
21
+ var TableConfig = require('../../TableConfig.js');
22
+ var config = require('../../render/config.js');
23
+ var index$1 = require('../../render/index.js');
24
+ var RowSelection = require('../RowSelection.js');
25
+ var utils = require('../utils.js');
27
26
 
28
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; }
29
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; }
@@ -117,57 +116,21 @@ var useCols = function useCols(_ref2) {
117
116
  cols: cols
118
117
  };
119
118
  };
120
- var useSynchronousKeys = function useSynchronousKeys(_ref4) {
121
- var selectedRowKeys = _ref4.selectedRowKeys,
122
- records = _ref4.records,
123
- rowKey = _ref4.rowKey;
119
+ var useColumnsStateType = function useColumnsStateType(_ref4) {
120
+ var columnsState = _ref4.columnsState,
121
+ columns = _ref4.columns;
124
122
  var _useHTableContext = context.useHTableContext(),
125
- rowOnChange = _useHTableContext.rowOnChange;
126
- var findId = function findId(key) {
127
- var msRecords = records;
128
- var rowIndex = _findIndexInstanceProperty(msRecords).call(msRecords, function (item, index) {
129
- var id = typeof rowKey === "function" ? rowKey(item, index) : item[rowKey];
130
- return id === key;
131
- });
132
- return msRecords[rowIndex];
133
- };
134
- React.useEffect(function () {
135
- if (selectedRowKeys && records && rowKey) {
136
- var resultData = _mapInstanceProperty(selectedRowKeys).call(selectedRowKeys, function (key) {
137
- return findId(key);
138
- });
139
- rowOnChange(selectedRowKeys, resultData);
140
- }
141
- }, [selectedRowKeys, records, rowKey]);
142
- };
143
- var useSize = function useSize(size) {
144
- var _useState3 = React.useState(size),
123
+ tableInstance = _useHTableContext.tableInstance;
124
+ var _ref5 = columnsState || {},
125
+ persistenceType = _ref5.persistenceType,
126
+ persistenceKey = _ref5.persistenceKey,
127
+ value = _ref5.value,
128
+ defaultValue = _ref5.defaultValue,
129
+ onChange = _ref5.onChange;
130
+ var _useState3 = React.useState(defaultValue),
145
131
  _useState4 = _slicedToArray(_useState3, 2),
146
- cuSize = _useState4[0],
147
- setCuSize = _useState4[1];
148
- React.useEffect(function () {
149
- setCuSize(size);
150
- }, [size]);
151
- return {
152
- cuSize: cuSize,
153
- setCuSize: setCuSize
154
- };
155
- };
156
- var useColumnsStateType = function useColumnsStateType(_ref5) {
157
- var columnsState = _ref5.columnsState,
158
- columns = _ref5.columns;
159
- var _useHTableContext2 = context.useHTableContext(),
160
- tableInstance = _useHTableContext2.tableInstance;
161
- var _ref6 = columnsState || {},
162
- persistenceType = _ref6.persistenceType,
163
- persistenceKey = _ref6.persistenceKey,
164
- value = _ref6.value,
165
- defaultValue = _ref6.defaultValue,
166
- onChange = _ref6.onChange;
167
- var _useState5 = React.useState(defaultValue),
168
- _useState6 = _slicedToArray(_useState5, 2),
169
- selfValue = _useState6[0],
170
- setSelfValue = _useState6[1];
132
+ selfValue = _useState4[0],
133
+ setSelfValue = _useState4[1];
171
134
  var initTableColsVal = React.useMemo(function () {
172
135
  return selfValue || {};
173
136
  }, []);
@@ -203,6 +166,4 @@ var useColumnsStateType = function useColumnsStateType(_ref5) {
203
166
 
204
167
  exports.useCols = useCols;
205
168
  exports.useColumnsStateType = useColumnsStateType;
206
- exports.useSize = useSize;
207
- exports.useSynchronousKeys = useSynchronousKeys;
208
169
  // powered by h
@@ -0,0 +1,16 @@
1
+ import type React from "react";
2
+ import type { SizeType } from "antd/lib/config-provider/SizeContext";
3
+ import type { HTableBodyProps } from "../modal";
4
+ import type { GetRowKey } from "rc-table/lib/interface";
5
+ export declare const useSize: (size: SizeType) => {
6
+ cuSize: "small" | "middle" | "large" | undefined;
7
+ setCuSize: React.Dispatch<React.SetStateAction<"small" | "middle" | "large" | undefined>>;
8
+ };
9
+ export declare const useTableChange: ({ columns, onChange, localSorter, table: tableInstance, }: HTableBodyProps) => (page: any, filters: any, sorter: any, extra: any) => void;
10
+ interface FilterKeysModal {
11
+ selectedRowKeys?: React.Key[];
12
+ records?: any[];
13
+ rowKey?: string | GetRowKey<any>;
14
+ }
15
+ export declare const useSynchronousKeys: ({ selectedRowKeys, records, rowKey, }: FilterKeysModal) => void;
16
+ export {};
@@ -0,0 +1,122 @@
1
+ 'use strict';
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
+ var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
11
+ var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
12
+ var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
13
+ var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
14
+ var _findIndexInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find-index');
15
+ var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
16
+ var React = require('react');
17
+ var context = require('../../context.js');
18
+
19
+ 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
+ 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
+ var useSize = function useSize(size) {
22
+ var _useState = React.useState(size),
23
+ _useState2 = _slicedToArray(_useState, 2),
24
+ cuSize = _useState2[0],
25
+ setCuSize = _useState2[1];
26
+ React.useEffect(function () {
27
+ setCuSize(size);
28
+ }, [size]);
29
+ return {
30
+ cuSize: cuSize,
31
+ setCuSize: setCuSize
32
+ };
33
+ };
34
+ var useTableChange = function useTableChange(_ref) {
35
+ var columns = _ref.columns,
36
+ onChange = _ref.onChange,
37
+ localSorter = _ref.localSorter,
38
+ tableInstance = _ref.table;
39
+ var filtersObj = React.useMemo(function () {
40
+ var obj = {};
41
+ columns === null || columns === void 0 || _forEachInstanceProperty(columns).call(columns, function (_ref2) {
42
+ var _ref2$filterMultiple = _ref2.filterMultiple,
43
+ filterMultiple = _ref2$filterMultiple === void 0 ? true : _ref2$filterMultiple,
44
+ filters = _ref2.filters,
45
+ dataIndex = _ref2.dataIndex;
46
+ if (!filters || !dataIndex) {
47
+ return;
48
+ }
49
+ if (_Array$isArray(dataIndex)) {
50
+ obj[dataIndex.join(",")] = filterMultiple;
51
+ return;
52
+ }
53
+ obj[dataIndex] = filterMultiple;
54
+ });
55
+ return obj;
56
+ }, [columns]);
57
+ var filtersMk = function filtersMk(filters) {
58
+ var keys = _Object$keys(filters);
59
+ var len = keys.length;
60
+ if (!len) {
61
+ return {};
62
+ }
63
+ var paramsObj = {};
64
+ _forEachInstanceProperty(keys).call(keys, function (key) {
65
+ var _filters$key;
66
+ if (filtersObj[key]) {
67
+ paramsObj[key] = filters[key];
68
+ return;
69
+ }
70
+ paramsObj[key] = (_filters$key = filters[key]) === null || _filters$key === void 0 ? void 0 : _filters$key[0];
71
+ });
72
+ return paramsObj;
73
+ };
74
+ return function (page, filters, sorter, extra) {
75
+ if (onChange) {
76
+ return onChange(page, filters, sorter, extra);
77
+ }
78
+ var field = sorter.field,
79
+ order = sorter.order,
80
+ column = sorter.column;
81
+ var _ref3 = column || {},
82
+ colSorter = _ref3.sorter;
83
+ if (localSorter || typeof colSorter === "function") {
84
+ return;
85
+ }
86
+ var orderByField = typeof order === "undefined" ? undefined : field;
87
+ var asc = typeof order === "undefined" ? undefined : order === "ascend";
88
+ tableInstance === null || tableInstance === void 0 || tableInstance.table.reloadWithParams(_objectSpread({
89
+ current: 1,
90
+ orderByField: orderByField,
91
+ asc: asc
92
+ }, filtersMk(filters)));
93
+ };
94
+ };
95
+ var useSynchronousKeys = function useSynchronousKeys(_ref4) {
96
+ var selectedRowKeys = _ref4.selectedRowKeys,
97
+ records = _ref4.records,
98
+ rowKey = _ref4.rowKey;
99
+ var _useHTableContext = context.useHTableContext(),
100
+ rowOnChange = _useHTableContext.rowOnChange;
101
+ var findId = function findId(key) {
102
+ var msRecords = records;
103
+ var rowIndex = _findIndexInstanceProperty(msRecords).call(msRecords, function (item, index) {
104
+ var id = typeof rowKey === "function" ? rowKey(item, index) : item[rowKey];
105
+ return id === key;
106
+ });
107
+ return msRecords[rowIndex];
108
+ };
109
+ React.useEffect(function () {
110
+ if (selectedRowKeys && records && rowKey) {
111
+ var resultData = _mapInstanceProperty(selectedRowKeys).call(selectedRowKeys, function (key) {
112
+ return findId(key);
113
+ });
114
+ rowOnChange(selectedRowKeys, resultData);
115
+ }
116
+ }, [selectedRowKeys, records, rowKey]);
117
+ };
118
+
119
+ exports.useSize = useSize;
120
+ exports.useSynchronousKeys = useSynchronousKeys;
121
+ exports.useTableChange = useTableChange;
122
+ // powered by h
@@ -1,29 +1,4 @@
1
- import type { ProTableProps } from "@ant-design/pro-table";
2
- import type { ActionRenderFn, ConfigDataModal, ParamsModal, HTableInstance, HRowSelection } from "../modal";
3
- import React from "react";
4
- import type { IPaginationProps } from "../HTablePagination";
5
- import type { AffixProps } from "antd/lib/affix";
6
- import type { OptionConfig } from "@ant-design/pro-table/lib/components/ToolBar";
7
- export interface OptionModal extends OptionConfig {
8
- settingRender?: () => React.ReactNode;
9
- }
10
- export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection" | "options" | "pagination"> {
11
- configData?: ConfigDataModal;
12
- onPageChange?: (params: ParamsModal) => void;
13
- emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
14
- errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
15
- tableStyle?: React.CSSProperties;
16
- paginationStyle?: React.CSSProperties;
17
- actionRender?: ActionRenderFn;
18
- rowSelection?: HRowSelection | false;
19
- affixProps?: AffixProps | false;
20
- goTop?: boolean;
21
- optionsRender?: (node: React.ReactNode) => React.ReactNode;
22
- paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
23
- localSorter?: boolean;
24
- options?: OptionModal | false;
25
- table?: HTableInstance;
26
- pagination?: IPaginationProps | false;
27
- }
1
+ /// <reference types="react" />
2
+ import type { HTableBodyProps } from "./modal";
28
3
  declare const _default: (bodyProps: HTableBodyProps) => JSX.Element;
29
4
  export default _default;
@@ -15,7 +15,8 @@ var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWit
15
15
  var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/keys');
16
16
  var jsxRuntime = require('react/jsx-runtime');
17
17
  var ProTable = require('@ant-design/pro-table');
18
- var hooks = require('./hooks.js');
18
+ var useControl = require('./hooks/useControl.js');
19
+ var useColData = require('./hooks/useColData.js');
19
20
  var context = require('../context.js');
20
21
  var antd = require('antd');
21
22
  var TableConfig = require('../TableConfig.js');
@@ -77,21 +78,21 @@ var Body = (function (bodyProps) {
77
78
  tableEmptyRender = _useHTableConfigConte2 === void 0 ? defaultRender.emptyDefaultRender : _useHTableConfigConte2,
78
79
  _useHTableConfigConte3 = _useHTableConfigConte.errorRender,
79
80
  tableErrorRender = _useHTableConfigConte3 === void 0 ? defaultRender.errorDefaultRender : _useHTableConfigConte3;
80
- var _useSize = hooks.useSize(size),
81
+ var _useSize = useControl.useSize(size),
81
82
  cuSize = _useSize.cuSize,
82
83
  setCuSize = _useSize.setCuSize;
83
84
  var bodyConfigData = configData || contextConfigData;
84
85
  var _ref2 = data || {},
85
86
  records = _ref2.records;
86
87
  var tableInstance = table || contextTableInstance;
87
- var _useCols = hooks.useCols({
88
+ var _useCols = useColData.useCols({
88
89
  configData: bodyConfigData,
89
90
  table: tableInstance,
90
91
  rowSelection: rowSelection,
91
92
  bordered: bordered
92
93
  }),
93
94
  cols = _useCols.cols;
94
- var _useColumnsStateType = hooks.useColumnsStateType({
95
+ var _useColumnsStateType = useColData.useColumnsStateType({
95
96
  columnsState: columnsState,
96
97
  columns: cols
97
98
  }),
@@ -99,7 +100,7 @@ var Body = (function (bodyProps) {
99
100
  onChange = _useColumnsStateType.onChange,
100
101
  reset = _useColumnsStateType.reset,
101
102
  selfColStatus = _objectWithoutProperties(_useColumnsStateType, _excluded2);
102
- hooks.useSynchronousKeys({
103
+ useControl.useSynchronousKeys({
103
104
  selectedRowKeys: selectedRowKeys,
104
105
  records: records,
105
106
  rowKey: rowKey
@@ -126,6 +127,12 @@ var Body = (function (bodyProps) {
126
127
  tableStyle: tableStyle
127
128
  }),
128
129
  defaultTableStyle = _useHTableConfigConte4.tableStyle;
130
+ var change = useControl.useTableChange({
131
+ columns: cols,
132
+ onChange: tableOnchange,
133
+ table: tableInstance,
134
+ localSorter: localSorter
135
+ });
129
136
  return jsxRuntime.jsx("div", {
130
137
  style: defaultTableStyle,
131
138
  className: "hw_table_body ".concat(className),
@@ -158,26 +165,7 @@ var Body = (function (bodyProps) {
158
165
  columns: cols,
159
166
  size: cuSize,
160
167
  search: false,
161
- onChange: function onChange(page, filters, sorter, extra) {
162
- if (tableOnchange) {
163
- return tableOnchange(page, filters, sorter, extra);
164
- }
165
- var field = sorter.field,
166
- order = sorter.order,
167
- column = sorter.column;
168
- var _ref3 = column || {},
169
- colSorter = _ref3.sorter;
170
- if (localSorter || typeof colSorter === "function") {
171
- return;
172
- }
173
- var orderByField = typeof order === "undefined" ? undefined : field;
174
- var asc = typeof order === "undefined" ? undefined : order === "ascend";
175
- tableInstance.table.reloadWithParams({
176
- current: 1,
177
- orderByField: orderByField,
178
- asc: asc
179
- });
180
- },
168
+ onChange: change,
181
169
  tableStyle: {
182
170
  paddingBottom: 0
183
171
  },
@@ -0,0 +1,27 @@
1
+ import type { OptionConfig } from "@ant-design/pro-table/lib/components/ToolBar";
2
+ import type React from "react";
3
+ import type { ProTableProps } from "@ant-design/pro-table";
4
+ import type { ActionRenderFn, ConfigDataModal, HRowSelection, HTableInstance, ParamsModal } from "@/components/modal";
5
+ import type { AffixProps } from "antd/lib/affix";
6
+ import type { IPaginationProps } from "@/components/HTablePagination";
7
+ export interface OptionModal extends OptionConfig {
8
+ settingRender?: () => React.ReactNode;
9
+ }
10
+ export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection" | "options" | "pagination"> {
11
+ configData?: ConfigDataModal;
12
+ onPageChange?: (params: ParamsModal) => void;
13
+ emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
14
+ errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
15
+ tableStyle?: React.CSSProperties;
16
+ paginationStyle?: React.CSSProperties;
17
+ actionRender?: ActionRenderFn;
18
+ rowSelection?: HRowSelection | false;
19
+ affixProps?: AffixProps | false;
20
+ goTop?: boolean;
21
+ optionsRender?: (node: React.ReactNode) => React.ReactNode;
22
+ paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
23
+ localSorter?: boolean;
24
+ options?: OptionModal | false;
25
+ table?: HTableInstance;
26
+ pagination?: IPaginationProps | false;
27
+ }
package/lib/Table.js CHANGED
@@ -40,7 +40,8 @@ var Table = (function (_ref) {
40
40
  _ref$action = _ref.action,
41
41
  action = _ref$action === void 0 ? {} : _ref$action;
42
42
  _ref.spaceSize;
43
- var className = _ref.className,
43
+ var _ref$className = _ref.className,
44
+ className = _ref$className === void 0 ? "" : _ref$className,
44
45
  paginationStyle = _ref.paginationStyle,
45
46
  _ref$rowKey = _ref.rowKey,
46
47
  rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
package/lib/modal.d.ts CHANGED
@@ -6,7 +6,7 @@ import type React from "react";
6
6
  import type { ModalProps } from "antd";
7
7
  import type { TableProps } from "antd/lib/table";
8
8
  import type { AffixProps } from "antd/lib/affix";
9
- import type { OptionModal } from "./HTableBody";
9
+ import type { OptionModal } from "./HTableBody/modal";
10
10
  import type { DrawerProps } from "antd";
11
11
  import type { IPaginationProps } from "@/components/HTablePagination";
12
12
  export interface RowObj {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/table",
3
- "version": "1.9.59",
3
+ "version": "1.9.61",
4
4
  "description": "基于antd二次开发table组件",
5
5
  "keywords": [
6
6
  "table"
@@ -1,5 +1,5 @@
1
1
  import { Row } from "antd";
2
- import type { HTableBodyProps } from "../index";
2
+ import type { HTableBodyProps } from "../modal";
3
3
  import type { DetailedReactHTMLElement } from "react";
4
4
  import React from "react";
5
5
  import { useHTableContext } from "../../context";