@hw-component/table 1.9.38 → 1.9.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintcache +1 -1
- package/es/HTableBody/index.d.ts +1 -1
- package/es/HTableHeader/hooks/config.d.ts +37 -0
- package/es/HTableHeader/hooks/config.js +46 -0
- package/es/HTableHeader/hooks/useHeaderDefaultProps.d.ts +10 -0
- package/es/HTableHeader/hooks/useHeaderDefaultProps.js +37 -0
- package/es/HTableHeader/hooks/useHideMoreTitle.d.ts +4 -0
- package/es/HTableHeader/{hooks.js → hooks/useHideMoreTitle.js} +56 -112
- package/es/HTableHeader/index.js +2 -1
- package/es/hooks/useCurrentTable.js +4 -1
- package/es/modal.d.ts +1 -1
- package/lib/HTableBody/index.d.ts +1 -1
- package/lib/HTableHeader/hooks/config.d.ts +37 -0
- package/lib/HTableHeader/hooks/config.js +48 -0
- package/lib/HTableHeader/hooks/useHeaderDefaultProps.d.ts +10 -0
- package/lib/HTableHeader/hooks/useHeaderDefaultProps.js +40 -0
- package/lib/HTableHeader/hooks/useHideMoreTitle.d.ts +4 -0
- package/lib/HTableHeader/{hooks.js → hooks/useHideMoreTitle.js} +58 -113
- package/lib/HTableHeader/index.js +4 -3
- package/lib/hooks/useCurrentTable.js +4 -1
- package/lib/modal.d.ts +1 -1
- package/package.json +1 -1
- package/src/components/DialogTable/hooks.ts +10 -10
- package/src/components/HTableBody/index.tsx +4 -3
- package/src/components/HTableHeader/hooks/config.tsx +42 -0
- package/src/components/HTableHeader/hooks/useHeaderDefaultProps.ts +37 -0
- package/src/components/HTableHeader/{hooks.tsx → hooks/useHideMoreTitle.tsx} +34 -89
- package/src/components/HTableHeader/index.tsx +22 -6
- package/src/components/hooks/useCurrentTable.ts +4 -1
- package/src/components/modal.ts +1 -2
- package/src/components/render/config.tsx +3 -3
- package/src/pages/DwTable/index.tsx +7 -5
- package/src/pages/Table/index.tsx +2 -3
- package/es/HTableHeader/hooks.d.ts +0 -12
- package/lib/HTableHeader/hooks.d.ts +0 -12
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
5
|
+
var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
|
|
6
|
+
var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
|
|
7
|
+
var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
|
|
8
|
+
var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
|
|
9
|
+
var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
|
|
10
|
+
var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
|
|
3
11
|
var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
|
|
4
12
|
var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
|
|
5
13
|
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
@@ -10,80 +18,15 @@ var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/in
|
|
|
10
18
|
var _sliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/slice');
|
|
11
19
|
var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
|
|
12
20
|
var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
|
|
13
|
-
var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
|
|
14
|
-
var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
|
|
15
|
-
var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
|
|
16
|
-
var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
|
|
17
|
-
var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
|
|
18
|
-
var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
|
|
19
|
-
var jsxRuntime = require('react/jsx-runtime');
|
|
20
21
|
var React = require('react');
|
|
21
|
-
var
|
|
22
|
-
var
|
|
23
|
-
var
|
|
24
|
-
var defaultFormRender = require('
|
|
25
|
-
var useHTable = require('../hooks/useHTable.js');
|
|
22
|
+
var config = require('./config.js');
|
|
23
|
+
var context = require('../../context.js');
|
|
24
|
+
var index = require('../../hooks/index.js');
|
|
25
|
+
var defaultFormRender = require('../defaultFormRender.js');
|
|
26
26
|
|
|
27
27
|
var _excluded = ["searchType", "title", "name", "dataIndex", "itemProps", "searchRender", "childrenDataIndex", "showSearch", "hideInTable", "align", "searchLabel", "titleStr"];
|
|
28
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; }
|
|
29
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; }
|
|
30
|
-
var sizeObj = {
|
|
31
|
-
xl: {
|
|
32
|
-
min: 1200,
|
|
33
|
-
max: 1600
|
|
34
|
-
},
|
|
35
|
-
xxl: {
|
|
36
|
-
min: 1600
|
|
37
|
-
},
|
|
38
|
-
lg: {
|
|
39
|
-
min: 992,
|
|
40
|
-
max: 1200
|
|
41
|
-
},
|
|
42
|
-
md: {
|
|
43
|
-
min: 768,
|
|
44
|
-
max: 992
|
|
45
|
-
},
|
|
46
|
-
sm: {
|
|
47
|
-
min: 576,
|
|
48
|
-
max: 768
|
|
49
|
-
},
|
|
50
|
-
xs: {
|
|
51
|
-
max: 576
|
|
52
|
-
}
|
|
53
|
-
};
|
|
54
|
-
var defaultSubItem = {
|
|
55
|
-
type: "submit",
|
|
56
|
-
itemProps: {
|
|
57
|
-
position: "end"
|
|
58
|
-
},
|
|
59
|
-
style: {
|
|
60
|
-
padding: 0,
|
|
61
|
-
marginLeft: -20
|
|
62
|
-
},
|
|
63
|
-
render: function render(item, node, form) {
|
|
64
|
-
return jsxRuntime.jsx(defaultSubComponent.DefaultSubComponent, {
|
|
65
|
-
form: form
|
|
66
|
-
});
|
|
67
|
-
}
|
|
68
|
-
};
|
|
69
|
-
var getCuSpanMaxNum = function getCuSpanMaxNum() {
|
|
70
|
-
var searchSpan = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
|
|
71
|
-
span: 6
|
|
72
|
-
};
|
|
73
|
-
var clientWidth = document.documentElement.clientWidth;
|
|
74
|
-
var keys = _Object$keys(sizeObj);
|
|
75
|
-
var index = _findIndexInstanceProperty(keys).call(keys, function (value) {
|
|
76
|
-
var _sizeObj$value = sizeObj[value],
|
|
77
|
-
_sizeObj$value$min = _sizeObj$value.min,
|
|
78
|
-
min = _sizeObj$value$min === void 0 ? 0 : _sizeObj$value$min,
|
|
79
|
-
_sizeObj$value$max = _sizeObj$value.max,
|
|
80
|
-
max = _sizeObj$value$max === void 0 ? Number.MAX_VALUE : _sizeObj$value$max;
|
|
81
|
-
return clientWidth >= min && clientWidth < max;
|
|
82
|
-
});
|
|
83
|
-
var cuKey = keys[index];
|
|
84
|
-
var cuSpan = searchSpan[cuKey] || searchSpan.span;
|
|
85
|
-
return 24 / cuSpan;
|
|
86
|
-
};
|
|
87
30
|
var formConfigDataItemProvider = function formConfigDataItemProvider(_ref, table) {
|
|
88
31
|
var searchType = _ref.searchType,
|
|
89
32
|
title = _ref.title,
|
|
@@ -117,6 +60,24 @@ var formConfigDataItemProvider = function formConfigDataItemProvider(_ref, table
|
|
|
117
60
|
}
|
|
118
61
|
});
|
|
119
62
|
};
|
|
63
|
+
var getCuSpanMaxNum = function getCuSpanMaxNum() {
|
|
64
|
+
var searchSpan = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
|
|
65
|
+
span: 6
|
|
66
|
+
};
|
|
67
|
+
var clientWidth = document.documentElement.clientWidth;
|
|
68
|
+
var keys = _Object$keys(config.sizeObj);
|
|
69
|
+
var index = _findIndexInstanceProperty(keys).call(keys, function (value) {
|
|
70
|
+
var _sizeObj$value = config.sizeObj[value],
|
|
71
|
+
_sizeObj$value$min = _sizeObj$value.min,
|
|
72
|
+
min = _sizeObj$value$min === void 0 ? 0 : _sizeObj$value$min,
|
|
73
|
+
_sizeObj$value$max = _sizeObj$value.max,
|
|
74
|
+
max = _sizeObj$value$max === void 0 ? Number.MAX_VALUE : _sizeObj$value$max;
|
|
75
|
+
return clientWidth >= min && clientWidth < max;
|
|
76
|
+
});
|
|
77
|
+
var cuKey = keys[index];
|
|
78
|
+
var cuSpan = searchSpan[cuKey] || searchSpan.span;
|
|
79
|
+
return 24 / cuSpan;
|
|
80
|
+
};
|
|
120
81
|
var mkNewConfig = function mkNewConfig(_ref2) {
|
|
121
82
|
var _ref2$configData = _ref2.configData,
|
|
122
83
|
configData = _ref2$configData === void 0 ? [] : _ref2$configData,
|
|
@@ -163,22 +124,37 @@ var filterHideFormItem = function filterHideFormItem(configData, className, sear
|
|
|
163
124
|
hideData: hideData
|
|
164
125
|
};
|
|
165
126
|
};
|
|
166
|
-
var
|
|
127
|
+
var useDefaultOpen = function useDefaultOpen() {
|
|
128
|
+
var _useState = React.useState(false),
|
|
129
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
130
|
+
open = _useState2[0],
|
|
131
|
+
setOpen = _useState2[1];
|
|
132
|
+
var _useHTableContext = context.useHTableContext(),
|
|
133
|
+
_useHTableContext$hea = _useHTableContext.headerOpen,
|
|
134
|
+
headerOpen = _useHTableContext$hea === void 0 ? open : _useHTableContext$hea,
|
|
135
|
+
_useHTableContext$set = _useHTableContext.setHeaderOpen,
|
|
136
|
+
setHeaderOpen = _useHTableContext$set === void 0 ? setOpen : _useHTableContext$set;
|
|
137
|
+
return {
|
|
138
|
+
headerOpen: headerOpen,
|
|
139
|
+
setHeaderOpen: setHeaderOpen
|
|
140
|
+
};
|
|
141
|
+
};
|
|
142
|
+
var useHideMoreTitle = (function (_ref3) {
|
|
167
143
|
var _context2;
|
|
168
144
|
var searchSpan = _ref3.searchSpan,
|
|
169
145
|
configData = _ref3.configData,
|
|
170
146
|
table = _ref3.table;
|
|
171
|
-
var
|
|
172
|
-
_useState2 = _slicedToArray(_useState, 2),
|
|
173
|
-
formConfigData = _useState2[0],
|
|
174
|
-
setFormConfigData = _useState2[1];
|
|
175
|
-
var _useState3 = React.useState(defaultSubItem),
|
|
147
|
+
var _useState3 = React.useState([]),
|
|
176
148
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
var
|
|
180
|
-
|
|
181
|
-
|
|
149
|
+
formConfigData = _useState4[0],
|
|
150
|
+
setFormConfigData = _useState4[1];
|
|
151
|
+
var _useState5 = React.useState(config.defaultSubItem),
|
|
152
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
153
|
+
subData = _useState6[0],
|
|
154
|
+
setSubData = _useState6[1];
|
|
155
|
+
var _useDefaultOpen = useDefaultOpen(),
|
|
156
|
+
headerOpen = _useDefaultOpen.headerOpen,
|
|
157
|
+
setHeaderOpen = _useDefaultOpen.setHeaderOpen;
|
|
182
158
|
var className = index.useClassName("hw-table-header-item-hide");
|
|
183
159
|
var mkNewFn = function mkNewFn() {
|
|
184
160
|
var _context;
|
|
@@ -217,38 +193,7 @@ var useHideMoreTitle = function useHideMoreTitle(_ref3) {
|
|
|
217
193
|
};
|
|
218
194
|
}, [configData, searchSpan, headerOpen]);
|
|
219
195
|
return _concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray(formConfigData), [subData]);
|
|
220
|
-
};
|
|
221
|
-
var useHeaderDefaultProps = function useHeaderDefaultProps(_ref4) {
|
|
222
|
-
var configData = _ref4.configData,
|
|
223
|
-
loading = _ref4.loading,
|
|
224
|
-
onFinish = _ref4.onFinish,
|
|
225
|
-
hideLabel = _ref4.hideLabel,
|
|
226
|
-
labelWidth = _ref4.labelWidth,
|
|
227
|
-
table = _ref4.table;
|
|
228
|
-
var _useHTableContext2 = context.useHTableContext(),
|
|
229
|
-
contextTableInstance = _useHTableContext2.tableInstance,
|
|
230
|
-
contextLoading = _useHTableContext2.loading,
|
|
231
|
-
contextOnFinish = _useHTableContext2.onFinish,
|
|
232
|
-
contextConfigData = _useHTableContext2.configData,
|
|
233
|
-
contextHideLabel = _useHTableContext2.hideLabel,
|
|
234
|
-
contextLabelWidth = _useHTableContext2.labelWidth;
|
|
235
|
-
var defaultTable = useHTable.default();
|
|
236
|
-
var headerConfigData = configData || contextConfigData;
|
|
237
|
-
var submitLoading = contextLoading || loading;
|
|
238
|
-
var subOnFinish = onFinish || contextOnFinish;
|
|
239
|
-
var tableHideLabel = typeof hideLabel === "undefined" ? contextHideLabel : hideLabel;
|
|
240
|
-
var tableLabelWidth = labelWidth || contextLabelWidth;
|
|
241
|
-
var tableInstance = table || contextTableInstance;
|
|
242
|
-
return {
|
|
243
|
-
tableInstance: tableInstance || defaultTable,
|
|
244
|
-
tableLabelWidth: tableLabelWidth,
|
|
245
|
-
tableHideLabel: tableHideLabel,
|
|
246
|
-
subOnFinish: subOnFinish,
|
|
247
|
-
submitLoading: submitLoading,
|
|
248
|
-
headerConfigData: headerConfigData
|
|
249
|
-
};
|
|
250
|
-
};
|
|
196
|
+
});
|
|
251
197
|
|
|
252
|
-
exports.
|
|
253
|
-
exports.useHideMoreTitle = useHideMoreTitle;
|
|
198
|
+
exports.default = useHideMoreTitle;
|
|
254
199
|
// powered by h
|
|
@@ -7,9 +7,10 @@ var jsxRuntime = require('react/jsx-runtime');
|
|
|
7
7
|
var antd = require('antd');
|
|
8
8
|
var form = require('@hw-component/form');
|
|
9
9
|
var index = require('../hooks/index.js');
|
|
10
|
-
var
|
|
10
|
+
var useHeaderDefaultProps = require('./hooks/useHeaderDefaultProps.js');
|
|
11
11
|
var Context = require('./Context.js');
|
|
12
12
|
var TableConfig = require('../TableConfig.js');
|
|
13
|
+
var useHideMoreTitle = require('./hooks/useHideMoreTitle.js');
|
|
13
14
|
|
|
14
15
|
var _excluded = ["searchSpan", "headerStyle", "initValues", "onReset"];
|
|
15
16
|
var defaultSearchSpan = {
|
|
@@ -26,7 +27,7 @@ var Header = (function (_ref) {
|
|
|
26
27
|
initValues = _ref.initValues,
|
|
27
28
|
onReset = _ref.onReset,
|
|
28
29
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
29
|
-
var _useHeaderDefaultProp =
|
|
30
|
+
var _useHeaderDefaultProp = useHeaderDefaultProps.default(props),
|
|
30
31
|
tableLabelWidth = _useHeaderDefaultProp.tableLabelWidth,
|
|
31
32
|
tableInstance = _useHeaderDefaultProp.tableInstance,
|
|
32
33
|
subOnFinish = _useHeaderDefaultProp.subOnFinish,
|
|
@@ -34,7 +35,7 @@ var Header = (function (_ref) {
|
|
|
34
35
|
tableHideLabel = _useHeaderDefaultProp.tableHideLabel,
|
|
35
36
|
headerConfigData = _useHeaderDefaultProp.headerConfigData;
|
|
36
37
|
var form$1 = tableInstance.form;
|
|
37
|
-
var nConfigData =
|
|
38
|
+
var nConfigData = useHideMoreTitle.default({
|
|
38
39
|
searchSpan: searchSpan,
|
|
39
40
|
configData: headerConfigData,
|
|
40
41
|
table: tableInstance
|
|
@@ -25,7 +25,10 @@ var useCurrentTable = (function (_ref) {
|
|
|
25
25
|
resultTable.table.getSelectedRowData = function () {
|
|
26
26
|
return selectedRowData;
|
|
27
27
|
};
|
|
28
|
-
resultTable.table.getTableSourceData = function () {
|
|
28
|
+
resultTable.table.getTableSourceData = function (full) {
|
|
29
|
+
if (full) {
|
|
30
|
+
return dataSource;
|
|
31
|
+
}
|
|
29
32
|
return dataSource === null || dataSource === void 0 ? void 0 : dataSource.records;
|
|
30
33
|
};
|
|
31
34
|
return resultTable;
|
package/lib/modal.d.ts
CHANGED
|
@@ -93,7 +93,7 @@ export interface TableInstance {
|
|
|
93
93
|
reloadWithParams: (params?: ParamsModal) => Promise<any>;
|
|
94
94
|
getParams: () => any;
|
|
95
95
|
getSelectedRowData: () => RowObj;
|
|
96
|
-
getTableSourceData: () => any;
|
|
96
|
+
getTableSourceData: (full?: boolean) => any;
|
|
97
97
|
getColSettingKeys: () => ColCheckResultKeys;
|
|
98
98
|
}
|
|
99
99
|
export interface HTableInstance {
|
package/package.json
CHANGED
|
@@ -35,16 +35,16 @@ export const useTableProps = ({
|
|
|
35
35
|
request,
|
|
36
36
|
dataSource,
|
|
37
37
|
});
|
|
38
|
-
useEffect(()=>{
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
},[configData])
|
|
38
|
+
useEffect(() => {
|
|
39
|
+
if (configData) {
|
|
40
|
+
setModalTableParams((oldVal) => {
|
|
41
|
+
return {
|
|
42
|
+
...oldVal,
|
|
43
|
+
configData,
|
|
44
|
+
};
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
}, [configData]);
|
|
48
48
|
return {
|
|
49
49
|
modalTableParams,
|
|
50
50
|
setModalTableParams,
|
|
@@ -17,7 +17,8 @@ import { useHTableContext } from "../context";
|
|
|
17
17
|
import React from "react";
|
|
18
18
|
import { ConfigProvider, Empty, Alert, Space } from "antd";
|
|
19
19
|
import { useHTableConfigContext } from "../TableConfig";
|
|
20
|
-
import
|
|
20
|
+
import type { IPaginationProps } from "../HTablePagination";
|
|
21
|
+
import HTablePagination from "../HTablePagination";
|
|
21
22
|
import { useClassName } from "../hooks";
|
|
22
23
|
import AlertMsg from "./AlertMsg";
|
|
23
24
|
import type { AffixProps } from "antd/lib/affix";
|
|
@@ -31,7 +32,7 @@ export interface OptionModal extends OptionConfig {
|
|
|
31
32
|
export interface HTableBodyProps
|
|
32
33
|
extends Omit<
|
|
33
34
|
ProTableProps<any, any>,
|
|
34
|
-
"dataSource" | "rowSelection" | "options"|"pagination"
|
|
35
|
+
"dataSource" | "rowSelection" | "options" | "pagination"
|
|
35
36
|
> {
|
|
36
37
|
configData?: ConfigDataModal;
|
|
37
38
|
onPageChange?: (params: ParamsModal) => void;
|
|
@@ -51,7 +52,7 @@ export interface HTableBodyProps
|
|
|
51
52
|
localSorter?: boolean;
|
|
52
53
|
options?: OptionModal | false;
|
|
53
54
|
table?: HTableInstance;
|
|
54
|
-
pagination?:IPaginationProps|false;
|
|
55
|
+
pagination?: IPaginationProps | false;
|
|
55
56
|
}
|
|
56
57
|
const defaultRender = () => {
|
|
57
58
|
return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { HFormInstance, HItemProps } from "@hw-component/form/es/Form/modal";
|
|
2
|
+
import React from "react";
|
|
3
|
+
import { DefaultSubComponent } from "../defaultSubComponent";
|
|
4
|
+
|
|
5
|
+
export const sizeObj = {
|
|
6
|
+
xl: {
|
|
7
|
+
min: 1200,
|
|
8
|
+
max: 1600,
|
|
9
|
+
},
|
|
10
|
+
xxl: {
|
|
11
|
+
min: 1600,
|
|
12
|
+
},
|
|
13
|
+
lg: {
|
|
14
|
+
min: 992,
|
|
15
|
+
max: 1200,
|
|
16
|
+
},
|
|
17
|
+
md: {
|
|
18
|
+
min: 768,
|
|
19
|
+
max: 992,
|
|
20
|
+
},
|
|
21
|
+
sm: {
|
|
22
|
+
min: 576,
|
|
23
|
+
max: 768,
|
|
24
|
+
},
|
|
25
|
+
xs: {
|
|
26
|
+
max: 576,
|
|
27
|
+
},
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
export const defaultSubItem = {
|
|
31
|
+
type: "submit",
|
|
32
|
+
itemProps: {
|
|
33
|
+
position: "end",
|
|
34
|
+
},
|
|
35
|
+
style: {
|
|
36
|
+
padding: 0,
|
|
37
|
+
marginLeft: -20,
|
|
38
|
+
},
|
|
39
|
+
render: (item: HItemProps, node: React.ReactNode, form: HFormInstance) => {
|
|
40
|
+
return <DefaultSubComponent form={form} />;
|
|
41
|
+
},
|
|
42
|
+
};
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { IHeaderProps } from "../modal";
|
|
2
|
+
import { useHTableContext } from "../../context";
|
|
3
|
+
import useHTable from "../../hooks/useHTable";
|
|
4
|
+
|
|
5
|
+
export default ({
|
|
6
|
+
configData,
|
|
7
|
+
loading,
|
|
8
|
+
onFinish,
|
|
9
|
+
hideLabel,
|
|
10
|
+
labelWidth,
|
|
11
|
+
table,
|
|
12
|
+
}: IHeaderProps) => {
|
|
13
|
+
const {
|
|
14
|
+
tableInstance: contextTableInstance,
|
|
15
|
+
loading: contextLoading,
|
|
16
|
+
onFinish: contextOnFinish,
|
|
17
|
+
configData: contextConfigData,
|
|
18
|
+
hideLabel: contextHideLabel,
|
|
19
|
+
labelWidth: contextLabelWidth,
|
|
20
|
+
} = useHTableContext();
|
|
21
|
+
const defaultTable = useHTable();
|
|
22
|
+
const headerConfigData = configData || contextConfigData;
|
|
23
|
+
const submitLoading = contextLoading || loading;
|
|
24
|
+
const subOnFinish = onFinish || contextOnFinish;
|
|
25
|
+
const tableHideLabel =
|
|
26
|
+
typeof hideLabel === "undefined" ? contextHideLabel : hideLabel;
|
|
27
|
+
const tableLabelWidth = labelWidth || contextLabelWidth;
|
|
28
|
+
const tableInstance = table || contextTableInstance;
|
|
29
|
+
return {
|
|
30
|
+
tableInstance: tableInstance || defaultTable,
|
|
31
|
+
tableLabelWidth,
|
|
32
|
+
tableHideLabel,
|
|
33
|
+
subOnFinish,
|
|
34
|
+
submitLoading,
|
|
35
|
+
headerConfigData,
|
|
36
|
+
};
|
|
37
|
+
};
|
|
@@ -1,63 +1,13 @@
|
|
|
1
|
-
import type { FormConfigDataItemProviderModal, IHeaderProps } from "
|
|
2
|
-
import
|
|
1
|
+
import type { FormConfigDataItemProviderModal, IHeaderProps } from "../modal";
|
|
2
|
+
import { useEffect, useState } from "react";
|
|
3
3
|
import type { HItemProps } from "@hw-component/form/es/Form/modal";
|
|
4
|
+
import { defaultSubItem, sizeObj } from "./config";
|
|
5
|
+
import { useHTableContext } from "../../context";
|
|
6
|
+
import { useClassName } from "../../hooks";
|
|
7
|
+
import type { HTableInstance } from "../../modal";
|
|
4
8
|
import type { ColProps } from "antd";
|
|
5
|
-
import {
|
|
6
|
-
import type { HFormInstance } from "@hw-component/form/es/Form/modal";
|
|
7
|
-
import { DefaultSubComponent } from "../HTableHeader/defaultSubComponent";
|
|
8
|
-
import { useHTableContext } from "../context";
|
|
9
|
-
import type { HTableInstance } from "../modal";
|
|
10
|
-
import { renderData } from "./defaultFormRender";
|
|
11
|
-
import useHTable from "../hooks/useHTable";
|
|
12
|
-
const sizeObj = {
|
|
13
|
-
xl: {
|
|
14
|
-
min: 1200,
|
|
15
|
-
max: 1600,
|
|
16
|
-
},
|
|
17
|
-
xxl: {
|
|
18
|
-
min: 1600,
|
|
19
|
-
},
|
|
20
|
-
lg: {
|
|
21
|
-
min: 992,
|
|
22
|
-
max: 1200,
|
|
23
|
-
},
|
|
24
|
-
md: {
|
|
25
|
-
min: 768,
|
|
26
|
-
max: 992,
|
|
27
|
-
},
|
|
28
|
-
sm: {
|
|
29
|
-
min: 576,
|
|
30
|
-
max: 768,
|
|
31
|
-
},
|
|
32
|
-
xs: {
|
|
33
|
-
max: 576,
|
|
34
|
-
},
|
|
35
|
-
};
|
|
36
|
-
const defaultSubItem = {
|
|
37
|
-
type: "submit",
|
|
38
|
-
itemProps: {
|
|
39
|
-
position: "end",
|
|
40
|
-
},
|
|
41
|
-
style: {
|
|
42
|
-
padding: 0,
|
|
43
|
-
marginLeft: -20,
|
|
44
|
-
},
|
|
45
|
-
render: (item: HItemProps, node: React.ReactNode, form: HFormInstance) => {
|
|
46
|
-
return <DefaultSubComponent form={form} />;
|
|
47
|
-
},
|
|
48
|
-
};
|
|
9
|
+
import { renderData } from "../defaultFormRender";
|
|
49
10
|
|
|
50
|
-
const getCuSpanMaxNum = (searchSpan: ColProps = { span: 6 }) => {
|
|
51
|
-
const clientWidth = document.documentElement.clientWidth;
|
|
52
|
-
const keys = Object.keys(sizeObj);
|
|
53
|
-
const index = keys.findIndex((value) => {
|
|
54
|
-
const { min = 0, max = Number.MAX_VALUE } = sizeObj[value];
|
|
55
|
-
return clientWidth >= min && clientWidth < max;
|
|
56
|
-
});
|
|
57
|
-
const cuKey = keys[index];
|
|
58
|
-
const cuSpan = searchSpan[cuKey] || searchSpan.span;
|
|
59
|
-
return 24 / cuSpan;
|
|
60
|
-
};
|
|
61
11
|
const formConfigDataItemProvider = (
|
|
62
12
|
{
|
|
63
13
|
searchType,
|
|
@@ -97,6 +47,19 @@ const formConfigDataItemProvider = (
|
|
|
97
47
|
},
|
|
98
48
|
};
|
|
99
49
|
};
|
|
50
|
+
|
|
51
|
+
const getCuSpanMaxNum = (searchSpan: ColProps = { span: 6 }) => {
|
|
52
|
+
const clientWidth = document.documentElement.clientWidth;
|
|
53
|
+
const keys = Object.keys(sizeObj);
|
|
54
|
+
const index = keys.findIndex((value) => {
|
|
55
|
+
const { min = 0, max = Number.MAX_VALUE } = sizeObj[value];
|
|
56
|
+
return clientWidth >= min && clientWidth < max;
|
|
57
|
+
});
|
|
58
|
+
const cuKey = keys[index];
|
|
59
|
+
const cuSpan = searchSpan[cuKey] || searchSpan.span;
|
|
60
|
+
return 24 / cuSpan;
|
|
61
|
+
};
|
|
62
|
+
|
|
100
63
|
const mkNewConfig = ({ configData = [], table }: IHeaderProps) => {
|
|
101
64
|
let subConfigData: HItemProps | undefined;
|
|
102
65
|
const realConfigData: HItemProps[] = [];
|
|
@@ -121,6 +84,7 @@ const mkNewConfig = ({ configData = [], table }: IHeaderProps) => {
|
|
|
121
84
|
subConfigData,
|
|
122
85
|
};
|
|
123
86
|
};
|
|
87
|
+
|
|
124
88
|
const filterHideFormItem = (
|
|
125
89
|
configData: HItemProps[],
|
|
126
90
|
className: string,
|
|
@@ -149,14 +113,21 @@ const filterHideFormItem = (
|
|
|
149
113
|
hideData,
|
|
150
114
|
};
|
|
151
115
|
};
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
116
|
+
|
|
117
|
+
const useDefaultOpen = () => {
|
|
118
|
+
const [open, setOpen] = useState(false);
|
|
119
|
+
const { headerOpen = open, setHeaderOpen = setOpen } = useHTableContext();
|
|
120
|
+
|
|
121
|
+
return {
|
|
122
|
+
headerOpen,
|
|
123
|
+
setHeaderOpen,
|
|
124
|
+
};
|
|
125
|
+
};
|
|
126
|
+
export default ({ searchSpan, configData, table }: IHeaderProps) => {
|
|
157
127
|
const [formConfigData, setFormConfigData] = useState<HItemProps[]>([]);
|
|
158
128
|
const [subData, setSubData] = useState<HItemProps>(defaultSubItem as any);
|
|
159
|
-
|
|
129
|
+
|
|
130
|
+
const { headerOpen, setHeaderOpen } = useDefaultOpen();
|
|
160
131
|
const className = useClassName("hw-table-header-item-hide");
|
|
161
132
|
const mkNewFn = () => {
|
|
162
133
|
const { realConfigData, subConfigData } = mkNewConfig({
|
|
@@ -195,29 +166,3 @@ export const useHideMoreTitle = ({
|
|
|
195
166
|
}, [configData, searchSpan, headerOpen]);
|
|
196
167
|
return [...formConfigData, subData];
|
|
197
168
|
};
|
|
198
|
-
|
|
199
|
-
export const useHeaderDefaultProps=({configData,loading,onFinish,hideLabel,labelWidth,table}:IHeaderProps)=>{
|
|
200
|
-
const {
|
|
201
|
-
tableInstance: contextTableInstance,
|
|
202
|
-
loading: contextLoading,
|
|
203
|
-
onFinish: contextOnFinish,
|
|
204
|
-
configData: contextConfigData,
|
|
205
|
-
hideLabel: contextHideLabel,
|
|
206
|
-
labelWidth: contextLabelWidth,
|
|
207
|
-
} = useHTableContext();
|
|
208
|
-
const defaultTable=useHTable();
|
|
209
|
-
const headerConfigData = configData || contextConfigData;
|
|
210
|
-
const submitLoading=contextLoading || loading;
|
|
211
|
-
const subOnFinish = onFinish || contextOnFinish;
|
|
212
|
-
const tableHideLabel = typeof hideLabel === "undefined" ? contextHideLabel : hideLabel;
|
|
213
|
-
const tableLabelWidth = labelWidth || contextLabelWidth;
|
|
214
|
-
const tableInstance = table || contextTableInstance;
|
|
215
|
-
return {
|
|
216
|
-
tableInstance:tableInstance||defaultTable,
|
|
217
|
-
tableLabelWidth,
|
|
218
|
-
tableHideLabel,
|
|
219
|
-
subOnFinish,
|
|
220
|
-
submitLoading,
|
|
221
|
-
headerConfigData
|
|
222
|
-
}
|
|
223
|
-
}
|
|
@@ -3,9 +3,10 @@ import { HForm } from "@hw-component/form";
|
|
|
3
3
|
import React from "react";
|
|
4
4
|
import { useClassName } from "../hooks";
|
|
5
5
|
import type { IHeaderProps } from "./modal";
|
|
6
|
-
import
|
|
6
|
+
import useHeaderDefaultProps from "./hooks/useHeaderDefaultProps";
|
|
7
7
|
import { HeaderProvider } from "./Context";
|
|
8
8
|
import { useHTableConfigContext } from "../TableConfig";
|
|
9
|
+
import useHideMoreTitle from "./hooks/useHideMoreTitle";
|
|
9
10
|
|
|
10
11
|
const defaultSearchSpan = {
|
|
11
12
|
xxl: 4,
|
|
@@ -21,11 +22,24 @@ export default ({
|
|
|
21
22
|
onReset,
|
|
22
23
|
...props
|
|
23
24
|
}: IHeaderProps) => {
|
|
24
|
-
const {
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
const {
|
|
26
|
+
tableLabelWidth,
|
|
27
|
+
tableInstance,
|
|
28
|
+
subOnFinish,
|
|
29
|
+
submitLoading,
|
|
30
|
+
tableHideLabel,
|
|
31
|
+
headerConfigData,
|
|
32
|
+
} = useHeaderDefaultProps(props);
|
|
33
|
+
const { form } = tableInstance;
|
|
34
|
+
const nConfigData = useHideMoreTitle({
|
|
35
|
+
searchSpan,
|
|
36
|
+
configData: headerConfigData,
|
|
37
|
+
table: tableInstance,
|
|
38
|
+
});
|
|
27
39
|
const className = useClassName("hw-table-header");
|
|
28
|
-
const { headerStyle: defaultHeaderStyle } = useHTableConfigContext({
|
|
40
|
+
const { headerStyle: defaultHeaderStyle } = useHTableConfigContext({
|
|
41
|
+
headerStyle,
|
|
42
|
+
});
|
|
29
43
|
return (
|
|
30
44
|
<Card
|
|
31
45
|
style={defaultHeaderStyle}
|
|
@@ -41,7 +55,9 @@ export default ({
|
|
|
41
55
|
dismissOnPressEnter={false}
|
|
42
56
|
gutter={[20, 0]}
|
|
43
57
|
initialValues={initValues}
|
|
44
|
-
hideLabel={
|
|
58
|
+
hideLabel={
|
|
59
|
+
typeof tableHideLabel === "undefined" ? true : tableHideLabel
|
|
60
|
+
}
|
|
45
61
|
configData={nConfigData}
|
|
46
62
|
form={form}
|
|
47
63
|
colon
|
|
@@ -36,7 +36,10 @@ export default ({
|
|
|
36
36
|
resultTable.table.getSelectedRowData = () => {
|
|
37
37
|
return selectedRowData;
|
|
38
38
|
};
|
|
39
|
-
resultTable.table.getTableSourceData = () => {
|
|
39
|
+
resultTable.table.getTableSourceData = (full) => {
|
|
40
|
+
if (full){
|
|
41
|
+
return dataSource;
|
|
42
|
+
}
|
|
40
43
|
return dataSource?.records;
|
|
41
44
|
};
|
|
42
45
|
return resultTable as HTableInstance;
|
package/src/components/modal.ts
CHANGED
|
@@ -10,7 +10,6 @@ import type { ModalProps } from "antd";
|
|
|
10
10
|
import type { TableProps } from "antd/lib/table";
|
|
11
11
|
import type { AffixProps } from "antd/lib/affix";
|
|
12
12
|
import type { OptionModal } from "./HTableBody";
|
|
13
|
-
import { GetRowKey } from "rc-table/lib/interface";
|
|
14
13
|
import type { DrawerProps } from "antd";
|
|
15
14
|
import type { IPaginationProps } from "@/components/HTablePagination";
|
|
16
15
|
|
|
@@ -126,7 +125,7 @@ export interface TableInstance {
|
|
|
126
125
|
reloadWithParams: (params?: ParamsModal) => Promise<any>;
|
|
127
126
|
getParams: () => any;
|
|
128
127
|
getSelectedRowData: () => RowObj;
|
|
129
|
-
getTableSourceData: () => any;
|
|
128
|
+
getTableSourceData: (full?:boolean) => any;
|
|
130
129
|
getColSettingKeys: () => ColCheckResultKeys;
|
|
131
130
|
}
|
|
132
131
|
export interface HTableInstance {
|
|
@@ -69,9 +69,9 @@ const linkRender = (config: ConfigItemModal, itemData: any) => {
|
|
|
69
69
|
if (typeof href === "function") {
|
|
70
70
|
hrefUrl = href(itemData);
|
|
71
71
|
}
|
|
72
|
-
const relUrl=hrefUrl||tableVal;
|
|
73
|
-
if (!relUrl){
|
|
74
|
-
return
|
|
72
|
+
const relUrl = hrefUrl || tableVal;
|
|
73
|
+
if (!relUrl) {
|
|
74
|
+
return "-";
|
|
75
75
|
}
|
|
76
76
|
return (
|
|
77
77
|
<Link
|