@rainbow-oh/yee-c 0.12.2 → 0.14.0
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/dist/cjs/Field/demo/standalone.d.ts +3 -0
- package/dist/cjs/Field/demo/standalone.js +56 -0
- package/dist/cjs/Field/field.js +20 -11
- package/dist/cjs/Field/interface.d.ts +7 -4
- package/dist/cjs/Field/style/index.less +1 -0
- package/dist/cjs/Table/demo/controlled-filter.d.ts +3 -0
- package/dist/cjs/Table/demo/controlled-filter.js +105 -0
- package/dist/cjs/Table/hooks/useFilter.d.ts +5 -1
- package/dist/cjs/Table/hooks/useFilter.js +80 -42
- package/dist/cjs/Table/index.d.ts +1 -1
- package/dist/cjs/Table/interface.d.ts +14 -4
- package/dist/cjs/Table/table.js +22 -25
- package/dist/cjs/Table/theader/cell.js +0 -3
- package/dist/cjs/Table/theader/filter.js +22 -5
- package/dist/cjs/style/themes.css +1 -1
- package/dist/cjs/style/variables.css +1 -1
- package/dist/cjs/version.d.ts +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/Field/demo/standalone.d.ts +3 -0
- package/dist/esm/Field/demo/standalone.js +43 -0
- package/dist/esm/Field/field.js +24 -11
- package/dist/esm/Field/interface.d.ts +7 -4
- package/dist/esm/Field/style/index.less +1 -0
- package/dist/esm/Table/demo/controlled-filter.d.ts +3 -0
- package/dist/esm/Table/demo/controlled-filter.js +122 -0
- package/dist/esm/Table/hooks/useFilter.d.ts +5 -1
- package/dist/esm/Table/hooks/useFilter.js +112 -69
- package/dist/esm/Table/index.d.ts +1 -1
- package/dist/esm/Table/interface.d.ts +14 -4
- package/dist/esm/Table/table.js +34 -21
- package/dist/esm/Table/theader/cell.js +1 -3
- package/dist/esm/Table/theader/filter.js +22 -1
- package/dist/esm/style/themes.css +1 -1
- package/dist/esm/style/variables.css +1 -1
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/umd/yee-c.min.css +1 -1
- package/dist/umd/yee-c.min.js +1 -1
- package/package.json +1 -1
- package/src/Field/demo/standalone.tsx +30 -0
- package/src/Field/field.tsx +38 -22
- package/src/Field/index.en-US.md +8 -4
- package/src/Field/index.zh-CN.md +8 -4
- package/src/Field/interface.ts +7 -4
- package/src/Field/style/index.less +1 -0
- package/src/Table/demo/controlled-filter.tsx +107 -0
- package/src/Table/hooks/useFilter.ts +107 -49
- package/src/Table/index.en-US.md +22 -1
- package/src/Table/index.ts +1 -0
- package/src/Table/index.zh-CN.md +22 -1
- package/src/Table/interface.ts +14 -2
- package/src/Table/table-filter.test.tsx +343 -0
- package/src/Table/table.tsx +29 -27
- package/src/Table/theader/cell.tsx +0 -2
- package/src/Table/theader/filter.tsx +26 -1
- package/src/version.ts +1 -1
package/dist/cjs/version.d.ts
CHANGED
package/dist/cjs/version.js
CHANGED
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
2
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
3
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
4
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
5
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
6
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
|
+
import { Field, Input, TextArea } from "../..";
|
|
8
|
+
import React, { useState } from 'react';
|
|
9
|
+
export default (function () {
|
|
10
|
+
var _useState = useState(''),
|
|
11
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
12
|
+
name = _useState2[0],
|
|
13
|
+
setName = _useState2[1];
|
|
14
|
+
var _useState3 = useState(''),
|
|
15
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
|
16
|
+
remark = _useState4[0],
|
|
17
|
+
setRemark = _useState4[1];
|
|
18
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
19
|
+
style: {
|
|
20
|
+
maxWidth: 400
|
|
21
|
+
}
|
|
22
|
+
}, /*#__PURE__*/React.createElement(Field, {
|
|
23
|
+
label: "Name",
|
|
24
|
+
required: true
|
|
25
|
+
}, /*#__PURE__*/React.createElement(Input, {
|
|
26
|
+
value: name,
|
|
27
|
+
onChange: function onChange(v) {
|
|
28
|
+
return setName(v);
|
|
29
|
+
},
|
|
30
|
+
placeholder: "Standalone controlled Input"
|
|
31
|
+
})), /*#__PURE__*/React.createElement(Field, {
|
|
32
|
+
label: "Remark"
|
|
33
|
+
}, /*#__PURE__*/React.createElement(TextArea, {
|
|
34
|
+
value: remark,
|
|
35
|
+
onChange: function onChange(v) {
|
|
36
|
+
return setRemark(v);
|
|
37
|
+
},
|
|
38
|
+
placeholder: "Standalone controlled TextArea",
|
|
39
|
+
rows: 3
|
|
40
|
+
})), /*#__PURE__*/React.createElement(Field, null, /*#__PURE__*/React.createElement(Input, {
|
|
41
|
+
placeholder: "Field without label"
|
|
42
|
+
})));
|
|
43
|
+
});
|
package/dist/esm/Field/field.js
CHANGED
|
@@ -37,7 +37,7 @@ var Field = function Field(props) {
|
|
|
37
37
|
}, 0),
|
|
38
38
|
_useReducer2 = _slicedToArray(_useReducer, 2),
|
|
39
39
|
forceUpdate = _useReducer2[1];
|
|
40
|
-
var _useVirtualField = useVirtualField(formName, name, {
|
|
40
|
+
var _useVirtualField = useVirtualField(formName !== null && formName !== void 0 ? formName : '', name !== null && name !== void 0 ? name : '', {
|
|
41
41
|
props: props,
|
|
42
42
|
onStoreChange: forceUpdate
|
|
43
43
|
}),
|
|
@@ -55,22 +55,35 @@ var Field = function Field(props) {
|
|
|
55
55
|
}) || required;
|
|
56
56
|
};
|
|
57
57
|
var getControlled = function getControlled(children) {
|
|
58
|
-
var
|
|
58
|
+
var childProps = children.props;
|
|
59
|
+
|
|
60
|
+
// Pure layout mode (no form): children keep their own value/onChange.
|
|
61
|
+
// Only a Field-level disabled is merged down.
|
|
62
|
+
// Pure layout mode (no form or no field name): children keep their own
|
|
63
|
+
// value/onChange. Only a Field-level disabled is merged down.
|
|
64
|
+
if (!form || name === undefined) {
|
|
65
|
+
if (disabled === undefined) return children;
|
|
66
|
+
return /*#__PURE__*/React.cloneElement(children, {
|
|
67
|
+
disabled: disabled || childProps.disabled
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
var mergedDisabled = disabled || childProps.disabled;
|
|
71
|
+
var fieldName = name;
|
|
59
72
|
var attr = {
|
|
60
|
-
value: getFieldValue === null || getFieldValue === void 0 ? void 0 : getFieldValue(
|
|
73
|
+
value: getFieldValue === null || getFieldValue === void 0 ? void 0 : getFieldValue(fieldName),
|
|
61
74
|
name: formName,
|
|
62
|
-
id:
|
|
75
|
+
id: fieldName,
|
|
63
76
|
disabled: mergedDisabled,
|
|
64
77
|
onChange: function onChange(value) {
|
|
65
78
|
var _callbacks$onValuesBe, _children$props, _callbacks$onValuesCh;
|
|
66
79
|
var callbacks = getCallbacks === null || getCallbacks === void 0 ? void 0 : getCallbacks();
|
|
67
80
|
var _value = value;
|
|
68
81
|
var fieldsValue = getFieldsValue === null || getFieldsValue === void 0 ? void 0 : getFieldsValue();
|
|
69
|
-
var feedback = callbacks === null || callbacks === void 0 || (_callbacks$onValuesBe = callbacks.onValuesBeforeChange) === null || _callbacks$onValuesBe === void 0 ? void 0 : _callbacks$onValuesBe.call(callbacks, _defineProperty({},
|
|
82
|
+
var feedback = callbacks === null || callbacks === void 0 || (_callbacks$onValuesBe = callbacks.onValuesBeforeChange) === null || _callbacks$onValuesBe === void 0 ? void 0 : _callbacks$onValuesBe.call(callbacks, _defineProperty({}, fieldName, _value), fieldsValue);
|
|
70
83
|
if (feedback !== undefined) {
|
|
71
84
|
_value = feedback;
|
|
72
85
|
}
|
|
73
|
-
setFieldsValue === null || setFieldsValue === void 0 || setFieldsValue(_defineProperty({},
|
|
86
|
+
setFieldsValue === null || setFieldsValue === void 0 || setFieldsValue(_defineProperty({}, fieldName, _value), 'onChange');
|
|
74
87
|
|
|
75
88
|
// Call child component's onChange
|
|
76
89
|
if ((_children$props = children.props) !== null && _children$props !== void 0 && _children$props.onChange) {
|
|
@@ -80,12 +93,12 @@ var Field = function Field(props) {
|
|
|
80
93
|
}
|
|
81
94
|
(_ref2 = children.props).onChange.apply(_ref2, [_value].concat(rest));
|
|
82
95
|
}
|
|
83
|
-
callbacks === null || callbacks === void 0 || (_callbacks$onValuesCh = callbacks['onValuesChange']) === null || _callbacks$onValuesCh === void 0 || _callbacks$onValuesCh.call(callbacks, _defineProperty({},
|
|
96
|
+
callbacks === null || callbacks === void 0 || (_callbacks$onValuesCh = callbacks['onValuesChange']) === null || _callbacks$onValuesCh === void 0 || _callbacks$onValuesCh.call(callbacks, _defineProperty({}, fieldName, _value), fieldsValue);
|
|
84
97
|
forceUpdate();
|
|
85
98
|
},
|
|
86
99
|
onBlur: function onBlur(event) {
|
|
87
100
|
// Fire-and-forget async validation; store notifies onStoreChange on completion.
|
|
88
|
-
void (validateField === null || validateField === void 0 ? void 0 : validateField(
|
|
101
|
+
void (validateField === null || validateField === void 0 ? void 0 : validateField(fieldName, 'onBlur'));
|
|
89
102
|
|
|
90
103
|
// Call child component's onBlur
|
|
91
104
|
if (children.props.onBlur) {
|
|
@@ -95,14 +108,14 @@ var Field = function Field(props) {
|
|
|
95
108
|
};
|
|
96
109
|
return /*#__PURE__*/React.cloneElement(children, attr);
|
|
97
110
|
};
|
|
98
|
-
var validate = getFieldValidate === null || getFieldValidate === void 0 ? void 0 : getFieldValidate(name);
|
|
111
|
+
var validate = name !== undefined ? getFieldValidate === null || getFieldValidate === void 0 ? void 0 : getFieldValidate(name) : undefined;
|
|
99
112
|
return /*#__PURE__*/React.createElement("div", {
|
|
100
113
|
className: clsx("".concat(prefixCls), "".concat(prefixCls, "-").concat(layout), _defineProperty({}, "".concat(prefixCls, "-").concat(validate === null || validate === void 0 ? void 0 : validate.status), validate === null || validate === void 0 ? void 0 : validate.status), className),
|
|
101
114
|
style: style
|
|
102
|
-
}, /*#__PURE__*/React.createElement("label", {
|
|
115
|
+
}, label ? /*#__PURE__*/React.createElement("label", {
|
|
103
116
|
className: clsx("".concat(prefixCls, "-label"), _defineProperty({}, "".concat(prefixCls, "-required"), isRequired()), classNames === null || classNames === void 0 ? void 0 : classNames.label),
|
|
104
117
|
style: styles === null || styles === void 0 ? void 0 : styles.label
|
|
105
|
-
}, label), /*#__PURE__*/React.createElement("div", {
|
|
118
|
+
}, label) : null, /*#__PURE__*/React.createElement("div", {
|
|
106
119
|
className: clsx("".concat(prefixCls, "-content"), classNames === null || classNames === void 0 ? void 0 : classNames.content),
|
|
107
120
|
style: styles === null || styles === void 0 ? void 0 : styles.content
|
|
108
121
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -27,13 +27,16 @@ export interface FieldProps {
|
|
|
27
27
|
*/
|
|
28
28
|
label?: React.ReactNode;
|
|
29
29
|
/**
|
|
30
|
-
* Field name
|
|
30
|
+
* Field name (required only when used with a registered virtual form)
|
|
31
31
|
*/
|
|
32
|
-
name
|
|
32
|
+
name?: string;
|
|
33
33
|
/**
|
|
34
|
-
* Name of the parent form
|
|
34
|
+
* Name of the parent form.
|
|
35
|
+
* When omitted (or no form is registered under this name), Field renders
|
|
36
|
+
* as a pure layout wrapper: the child keeps its own value/onChange and
|
|
37
|
+
* no validation runs.
|
|
35
38
|
*/
|
|
36
|
-
formName
|
|
39
|
+
formName?: string;
|
|
37
40
|
/**
|
|
38
41
|
* Whether disabled
|
|
39
42
|
*/
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
2
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
3
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
4
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
5
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
6
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
|
+
import { Button, message, Space, Table } from "../..";
|
|
8
|
+
import React, { useState } from 'react';
|
|
9
|
+
var allData = [{
|
|
10
|
+
key: '1',
|
|
11
|
+
name: 'John Brown',
|
|
12
|
+
age: 32,
|
|
13
|
+
gender: 'male'
|
|
14
|
+
}, {
|
|
15
|
+
key: '2',
|
|
16
|
+
name: 'Jim Green',
|
|
17
|
+
age: 42,
|
|
18
|
+
gender: 'male'
|
|
19
|
+
}, {
|
|
20
|
+
key: '3',
|
|
21
|
+
name: 'Joe Black',
|
|
22
|
+
age: 32,
|
|
23
|
+
gender: 'male'
|
|
24
|
+
}, {
|
|
25
|
+
key: '4',
|
|
26
|
+
name: 'Jon Snow',
|
|
27
|
+
age: 42,
|
|
28
|
+
gender: 'female'
|
|
29
|
+
}, {
|
|
30
|
+
key: '5',
|
|
31
|
+
name: 'Arya Stark',
|
|
32
|
+
age: 16,
|
|
33
|
+
gender: 'female'
|
|
34
|
+
}];
|
|
35
|
+
export default (function () {
|
|
36
|
+
var _message$useMessage = message.useMessage(),
|
|
37
|
+
messageApi = _message$useMessage.messageApi,
|
|
38
|
+
messageHolder = _message$useMessage.messageHolder;
|
|
39
|
+
|
|
40
|
+
// Server-side search: keep the keyword controlled, refetch in onChange.
|
|
41
|
+
var _useState = useState(''),
|
|
42
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
43
|
+
nameKeyword = _useState2[0],
|
|
44
|
+
setNameKeyword = _useState2[1];
|
|
45
|
+
|
|
46
|
+
// Controlled local filter: the tree selection lives in the parent state.
|
|
47
|
+
var _useState3 = useState([]),
|
|
48
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
|
49
|
+
genders = _useState4[0],
|
|
50
|
+
setGenders = _useState4[1];
|
|
51
|
+
var columns = [{
|
|
52
|
+
title: 'Name',
|
|
53
|
+
dataIndex: 'name',
|
|
54
|
+
key: 'name',
|
|
55
|
+
filter: {
|
|
56
|
+
searchable: true,
|
|
57
|
+
// No onFilter: no local matching, the search hits the "server".
|
|
58
|
+
filteredValue: nameKeyword
|
|
59
|
+
}
|
|
60
|
+
}, {
|
|
61
|
+
title: 'Age',
|
|
62
|
+
dataIndex: 'age',
|
|
63
|
+
key: 'age'
|
|
64
|
+
}, {
|
|
65
|
+
title: 'Gender',
|
|
66
|
+
dataIndex: 'gender',
|
|
67
|
+
key: 'gender',
|
|
68
|
+
filter: {
|
|
69
|
+
filterMode: 'tree',
|
|
70
|
+
items: [{
|
|
71
|
+
label: 'Male',
|
|
72
|
+
key: 'male'
|
|
73
|
+
}, {
|
|
74
|
+
label: 'Female',
|
|
75
|
+
key: 'female'
|
|
76
|
+
}],
|
|
77
|
+
filteredValue: genders,
|
|
78
|
+
onFilter: function onFilter(value, record) {
|
|
79
|
+
return value === record.gender;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}];
|
|
83
|
+
var handleChange = function handleChange(info) {
|
|
84
|
+
var _info$filters, _filters$name, _filters$gender;
|
|
85
|
+
if (info.action !== 'filter') return;
|
|
86
|
+
var filters = (_info$filters = info.filters) !== null && _info$filters !== void 0 ? _info$filters : {};
|
|
87
|
+
|
|
88
|
+
// The committing column's key is always present in the payload — with its
|
|
89
|
+
// empty value on clear — so both setting and clearing are mirrored here.
|
|
90
|
+
var name = (_filters$name = filters.name) !== null && _filters$name !== void 0 ? _filters$name : '';
|
|
91
|
+
if (name !== nameKeyword) {
|
|
92
|
+
// Pretend to refetch with ?name=<keyword>.
|
|
93
|
+
messageApi.info("Fetch: /api/users?name=".concat(name));
|
|
94
|
+
setNameKeyword(name);
|
|
95
|
+
}
|
|
96
|
+
setGenders((_filters$gender = filters.gender) !== null && _filters$gender !== void 0 ? _filters$gender : []);
|
|
97
|
+
};
|
|
98
|
+
var data = allData.filter(function (item) {
|
|
99
|
+
var matchName = nameKeyword ? item.name.toLowerCase().includes(nameKeyword.toLowerCase()) : true;
|
|
100
|
+
var matchGender = genders.length ? genders.includes(item.gender) : true;
|
|
101
|
+
return matchName && matchGender;
|
|
102
|
+
});
|
|
103
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, messageHolder, /*#__PURE__*/React.createElement(Space, {
|
|
104
|
+
block: true,
|
|
105
|
+
style: {
|
|
106
|
+
marginBottom: 16
|
|
107
|
+
}
|
|
108
|
+
}, /*#__PURE__*/React.createElement(Button, {
|
|
109
|
+
onClick: function onClick() {
|
|
110
|
+
return setNameKeyword('');
|
|
111
|
+
}
|
|
112
|
+
}, "Reset name search"), /*#__PURE__*/React.createElement(Button, {
|
|
113
|
+
onClick: function onClick() {
|
|
114
|
+
return setGenders([]);
|
|
115
|
+
}
|
|
116
|
+
}, "Reset gender filter")), /*#__PURE__*/React.createElement(Table, {
|
|
117
|
+
columns: columns,
|
|
118
|
+
dataSource: data,
|
|
119
|
+
onChange: handleChange,
|
|
120
|
+
pagination: false
|
|
121
|
+
}));
|
|
122
|
+
});
|
|
@@ -8,12 +8,16 @@ type FilterRecord = {
|
|
|
8
8
|
value: FilterInput;
|
|
9
9
|
dataIndex: string;
|
|
10
10
|
};
|
|
11
|
+
export declare const isControlledFilter: (column?: ColumnProps) => boolean;
|
|
11
12
|
export default function useFilter({ data, columns, }: {
|
|
12
13
|
data: Array<Record<string, unknown>>;
|
|
13
14
|
columns: ColumnProps[];
|
|
14
15
|
}): {
|
|
15
16
|
data: Record<string, unknown>[];
|
|
16
17
|
filterRecords: FilterRecord[];
|
|
17
|
-
onFilter: ({ value, dataIndex }: FilterOptions) =>
|
|
18
|
+
onFilter: ({ value, dataIndex }: FilterOptions) => {
|
|
19
|
+
data: Record<string, unknown>[];
|
|
20
|
+
filterRecords: FilterRecord[];
|
|
21
|
+
};
|
|
18
22
|
};
|
|
19
23
|
export {};
|
|
@@ -4,102 +4,145 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
4
4
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
5
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
6
6
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
7
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
8
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
9
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
10
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
11
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
8
12
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
13
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
9
14
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
10
15
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
11
|
-
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
12
|
-
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
13
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
14
16
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
15
|
-
|
|
16
|
-
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
17
|
-
import { useEffect, useMemo, useState } from 'react';
|
|
17
|
+
import { useCallback, useEffect, useMemo, useState } from 'react';
|
|
18
18
|
var isEmptyFilterValue = function isEmptyFilterValue(value) {
|
|
19
19
|
return value === '' || Array.isArray(value) && value.length === 0;
|
|
20
20
|
};
|
|
21
|
+
export var isControlledFilter = function isControlledFilter(column) {
|
|
22
|
+
var _column$filter;
|
|
23
|
+
return (column === null || column === void 0 || (_column$filter = column.filter) === null || _column$filter === void 0 ? void 0 : _column$filter.filteredValue) !== undefined;
|
|
24
|
+
};
|
|
21
25
|
var normalizeValue = function normalizeValue(value) {
|
|
22
26
|
return value === null || value === undefined ? '' : String(value).toLowerCase();
|
|
23
27
|
};
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
28
|
+
|
|
29
|
+
// Controlled columns (`filteredValue` defined) always take their value from
|
|
30
|
+
// the prop; internal records for them are ignored entirely — a commit on a
|
|
31
|
+
// controlled column must not leak into the merged state while the parent has
|
|
32
|
+
// not (yet) applied the new prop value.
|
|
33
|
+
var mergeRecords = function mergeRecords(internalRecords, columnMap) {
|
|
34
|
+
var controlled = [];
|
|
35
|
+
columnMap.forEach(function (column, dataIndex) {
|
|
36
|
+
var _column$filter2;
|
|
37
|
+
if (!isControlledFilter(column)) return;
|
|
38
|
+
var value = (_column$filter2 = column.filter) === null || _column$filter2 === void 0 ? void 0 : _column$filter2.filteredValue;
|
|
39
|
+
if (!isEmptyFilterValue(value)) {
|
|
40
|
+
controlled.push({
|
|
41
|
+
dataIndex: dataIndex,
|
|
42
|
+
value: value
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
var merged = internalRecords.filter(function (record) {
|
|
47
|
+
return !isControlledFilter(columnMap.get(record.dataIndex));
|
|
48
|
+
});
|
|
49
|
+
if (!controlled.length && merged.length === internalRecords.length) {
|
|
50
|
+
return internalRecords;
|
|
51
|
+
}
|
|
52
|
+
return [].concat(_toConsumableArray(merged), controlled);
|
|
53
|
+
};
|
|
54
|
+
var applyFilters = function applyFilters(data, records, columnMap) {
|
|
55
|
+
var handled = records.filter(function (_ref) {
|
|
56
|
+
var dataIndex = _ref.dataIndex,
|
|
57
|
+
value = _ref.value;
|
|
58
|
+
return Boolean(dataIndex) && columnMap.has(dataIndex) && !isEmptyFilterValue(value);
|
|
59
|
+
});
|
|
60
|
+
if (!handled.length) {
|
|
61
|
+
return data;
|
|
62
|
+
}
|
|
63
|
+
return data.filter(function (item) {
|
|
64
|
+
return handled.every(function (_ref2) {
|
|
65
|
+
var _column$filter3, _column$filter4;
|
|
66
|
+
var dataIndex = _ref2.dataIndex,
|
|
67
|
+
value = _ref2.value;
|
|
68
|
+
var column = columnMap.get(dataIndex);
|
|
69
|
+
|
|
70
|
+
// Controlled column without `onFilter` is server-side: the data the
|
|
71
|
+
// consumer renders is already filtered upstream, pass it through.
|
|
72
|
+
if (isControlledFilter(column) && !(column !== null && column !== void 0 && (_column$filter3 = column.filter) !== null && _column$filter3 !== void 0 && _column$filter3.onFilter)) {
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
var customFilter = column === null || column === void 0 || (_column$filter4 = column.filter) === null || _column$filter4 === void 0 ? void 0 : _column$filter4.onFilter;
|
|
76
|
+
if (customFilter) {
|
|
77
|
+
return Array.isArray(value) ? value.some(function (filterValue) {
|
|
78
|
+
return customFilter(filterValue, item);
|
|
79
|
+
}) : customFilter(value, item);
|
|
80
|
+
}
|
|
81
|
+
var targetValue = normalizeValue(item[dataIndex]);
|
|
82
|
+
if (Array.isArray(value)) {
|
|
83
|
+
return value.some(function (filterValue) {
|
|
84
|
+
return targetValue === normalizeValue(filterValue);
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
return targetValue.includes(normalizeValue(value));
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
};
|
|
91
|
+
export default function useFilter(_ref3) {
|
|
92
|
+
var data = _ref3.data,
|
|
93
|
+
columns = _ref3.columns;
|
|
27
94
|
var _useState = useState([]),
|
|
28
95
|
_useState2 = _slicedToArray(_useState, 2),
|
|
29
|
-
|
|
30
|
-
|
|
96
|
+
internalRecords = _useState2[0],
|
|
97
|
+
setInternalRecords = _useState2[1];
|
|
31
98
|
var columnMap = useMemo(function () {
|
|
32
99
|
return new Map(columns.flatMap(function (column) {
|
|
33
100
|
return column.dataIndex ? [[column.dataIndex, column]] : [];
|
|
34
101
|
}));
|
|
35
102
|
}, [columns]);
|
|
36
103
|
useEffect(function () {
|
|
37
|
-
|
|
38
|
-
var next = current.filter(function (
|
|
39
|
-
var dataIndex =
|
|
104
|
+
setInternalRecords(function (current) {
|
|
105
|
+
var next = current.filter(function (_ref4) {
|
|
106
|
+
var dataIndex = _ref4.dataIndex;
|
|
40
107
|
return columnMap.has(dataIndex);
|
|
41
108
|
});
|
|
42
109
|
return next.length === current.length ? current : next;
|
|
43
110
|
});
|
|
44
111
|
}, [columnMap]);
|
|
45
|
-
var
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
setFilterRecords(function (current) {
|
|
49
|
-
if (isEmptyFilterValue(value)) {
|
|
50
|
-
return current.filter(function (item) {
|
|
51
|
-
return item.dataIndex !== dataIndex;
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
var index = current.findIndex(function (item) {
|
|
55
|
-
return item.dataIndex === dataIndex;
|
|
56
|
-
});
|
|
57
|
-
if (index === -1) {
|
|
58
|
-
return [].concat(_toConsumableArray(current), [{
|
|
59
|
-
dataIndex: dataIndex,
|
|
60
|
-
value: value
|
|
61
|
-
}]);
|
|
62
|
-
}
|
|
63
|
-
return current.map(function (item, itemIndex) {
|
|
64
|
-
return itemIndex === index ? _objectSpread(_objectSpread({}, item), {}, {
|
|
65
|
-
value: value
|
|
66
|
-
}) : item;
|
|
67
|
-
});
|
|
68
|
-
});
|
|
69
|
-
};
|
|
112
|
+
var activeRecords = useMemo(function () {
|
|
113
|
+
return mergeRecords(internalRecords, columnMap);
|
|
114
|
+
}, [internalRecords, columnMap]);
|
|
70
115
|
var filtered = useMemo(function () {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
return
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
});
|
|
99
|
-
}, [columnMap, data, filterRecords]);
|
|
116
|
+
return applyFilters(data, activeRecords, columnMap);
|
|
117
|
+
}, [columnMap, data, activeRecords]);
|
|
118
|
+
|
|
119
|
+
// Mirrors useSorter.onSort: computes the next state synchronously and
|
|
120
|
+
// returns it, so callers can emit onChange with the result in the same tick.
|
|
121
|
+
var onFilter = useCallback(function (_ref5) {
|
|
122
|
+
var value = _ref5.value,
|
|
123
|
+
dataIndex = _ref5.dataIndex;
|
|
124
|
+
var nextInternal = isEmptyFilterValue(value) ? internalRecords.filter(function (item) {
|
|
125
|
+
return item.dataIndex !== dataIndex;
|
|
126
|
+
}) : internalRecords.some(function (item) {
|
|
127
|
+
return item.dataIndex === dataIndex;
|
|
128
|
+
}) ? internalRecords.map(function (item) {
|
|
129
|
+
return item.dataIndex === dataIndex ? _objectSpread(_objectSpread({}, item), {}, {
|
|
130
|
+
value: value
|
|
131
|
+
}) : item;
|
|
132
|
+
}) : [].concat(_toConsumableArray(internalRecords), [{
|
|
133
|
+
dataIndex: dataIndex,
|
|
134
|
+
value: value
|
|
135
|
+
}]);
|
|
136
|
+
setInternalRecords(nextInternal);
|
|
137
|
+
var nextActive = mergeRecords(nextInternal, columnMap);
|
|
138
|
+
return {
|
|
139
|
+
data: applyFilters(data, nextActive, columnMap),
|
|
140
|
+
filterRecords: nextActive
|
|
141
|
+
};
|
|
142
|
+
}, [internalRecords, columnMap, data]);
|
|
100
143
|
return {
|
|
101
144
|
data: filtered,
|
|
102
|
-
filterRecords:
|
|
145
|
+
filterRecords: activeRecords,
|
|
103
146
|
onFilter: onFilter
|
|
104
147
|
};
|
|
105
148
|
}
|
|
@@ -2,7 +2,7 @@ import Column from './column';
|
|
|
2
2
|
import Summary from './summary';
|
|
3
3
|
import InternalTable from './table';
|
|
4
4
|
import Head from './theader';
|
|
5
|
-
export type { ColumnProps, HeaderCell, PaginationType, RowSelectionType, TableBodyComponents, TableComponents, TableProps, TableRowRendererProps, onChangeParams, } from './interface';
|
|
5
|
+
export type { ColumnProps, FilterValue, HeaderCell, PaginationType, RowSelectionType, TableBodyComponents, TableComponents, TableProps, TableRowRendererProps, onChangeParams, } from './interface';
|
|
6
6
|
type TableType = typeof InternalTable & {
|
|
7
7
|
Column: typeof Column;
|
|
8
8
|
Summary: typeof Summary;
|
|
@@ -62,11 +62,13 @@ export interface HeadCellProps extends Omit<WrapedColumnProps, 'title'> {
|
|
|
62
62
|
[prop: string]: number;
|
|
63
63
|
};
|
|
64
64
|
showSorterTooltip?: boolean;
|
|
65
|
-
internalFilters?: {
|
|
66
|
-
[dataIndex: string]: boolean;
|
|
67
|
-
};
|
|
68
65
|
onSort?: (dataIndex: string, sorter: any) => void;
|
|
69
|
-
onInternalFilter?: (
|
|
66
|
+
onInternalFilter?: (options: {
|
|
67
|
+
dataIndex: string;
|
|
68
|
+
value: FilterValue | FilterValue[];
|
|
69
|
+
type?: 'filter' | 'search';
|
|
70
|
+
column: WrapedColumnProps;
|
|
71
|
+
}) => void;
|
|
70
72
|
/**
|
|
71
73
|
* `resizeKey` of the column currently being dragged, if any
|
|
72
74
|
*/
|
|
@@ -188,6 +190,14 @@ export interface ColumnProps {
|
|
|
188
190
|
* Whether searchable, when items is undefined, it acts as a search component
|
|
189
191
|
*/
|
|
190
192
|
searchable?: boolean;
|
|
193
|
+
/**
|
|
194
|
+
* Controlled filter state. When defined, this column's filter state is
|
|
195
|
+
* controlled: the dropdown echo, icon highlight and the `filters` in
|
|
196
|
+
* onChange all derive from it. With no `onFilter`, local matching is
|
|
197
|
+
* skipped entirely (server mode — filter in your onChange handler).
|
|
198
|
+
* Reset with `[]` / `''`.
|
|
199
|
+
*/
|
|
200
|
+
filteredValue?: FilterValue | FilterValue[];
|
|
191
201
|
/**
|
|
192
202
|
* Filter icon
|
|
193
203
|
*/
|