@rainbow-oh/yee-c 0.12.1 → 0.13.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/Form/style/index.less +4 -0
- package/dist/cjs/Input/style/index.less +1 -1
- package/dist/cjs/InputNumber/style/index.less +1 -1
- package/dist/cjs/Search/style/index.less +1 -1
- package/dist/cjs/Selector/style/index.less +1 -1
- 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/TextArea/style/index.less +1 -1
- package/dist/cjs/VerificationCode/style/index.less +1 -1
- package/dist/cjs/style/color.blue.css +6 -7
- package/dist/cjs/style/color.crimson.css +8 -9
- package/dist/cjs/style/color.css +14 -11
- package/dist/cjs/style/color.dark.css +8 -9
- package/dist/cjs/style/color.gemini.css +8 -2
- package/dist/cjs/style/color.green.css +8 -9
- package/dist/cjs/style/color.jam.css +8 -9
- package/dist/cjs/style/color.navy.css +8 -9
- package/dist/cjs/style/color.peach.css +8 -9
- package/dist/cjs/style/color.pine.css +8 -9
- package/dist/cjs/style/color.pitaya.css +8 -9
- package/dist/cjs/style/color.pumpkin.css +8 -9
- package/dist/cjs/style/color.ruby.css +8 -9
- package/dist/cjs/style/themes.css +95 -100
- package/dist/cjs/style/variables.css +15 -12
- package/dist/cjs/version.d.ts +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/Form/style/index.less +4 -0
- package/dist/esm/Input/style/index.less +1 -1
- package/dist/esm/InputNumber/style/index.less +1 -1
- package/dist/esm/Search/style/index.less +1 -1
- package/dist/esm/Selector/style/index.less +1 -1
- 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/TextArea/style/index.less +1 -1
- package/dist/esm/VerificationCode/style/index.less +1 -1
- package/dist/esm/style/color.blue.css +6 -7
- package/dist/esm/style/color.crimson.css +8 -9
- package/dist/esm/style/color.css +14 -11
- package/dist/esm/style/color.dark.css +8 -9
- package/dist/esm/style/color.gemini.css +8 -2
- package/dist/esm/style/color.green.css +8 -9
- package/dist/esm/style/color.jam.css +8 -9
- package/dist/esm/style/color.navy.css +8 -9
- package/dist/esm/style/color.peach.css +8 -9
- package/dist/esm/style/color.pine.css +8 -9
- package/dist/esm/style/color.pitaya.css +8 -9
- package/dist/esm/style/color.pumpkin.css +8 -9
- package/dist/esm/style/color.ruby.css +8 -9
- package/dist/esm/style/themes.css +95 -100
- package/dist/esm/style/variables.css +15 -12
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/umd/yee-c.min.css +6 -8
- package/dist/umd/yee-c.min.js +1 -1
- package/package.json +1 -1
- package/src/Form/style/index.less +4 -0
- package/src/Input/style/index.less +1 -1
- package/src/InputNumber/style/index.less +1 -1
- package/src/Search/style/index.less +1 -1
- package/src/Selector/style/index.less +1 -1
- 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/TextArea/style/index.less +1 -1
- package/src/VerificationCode/style/index.less +1 -1
- package/src/style/color.blue.css +6 -7
- package/src/style/color.crimson.css +8 -9
- package/src/style/color.css +14 -11
- package/src/style/color.dark.css +8 -9
- package/src/style/color.gemini.css +8 -2
- package/src/style/color.green.css +8 -9
- package/src/style/color.jam.css +8 -9
- package/src/style/color.navy.css +8 -9
- package/src/style/color.peach.css +8 -9
- package/src/style/color.pine.css +8 -9
- package/src/style/color.pitaya.css +8 -9
- package/src/style/color.pumpkin.css +8 -9
- package/src/style/color.ruby.css +8 -9
- package/src/version.ts +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* @rainbow-oh/yee-c CSS Variables
|
|
3
3
|
* Auto-generated, do not edit manually
|
|
4
|
-
* Generated on 2026-09-
|
|
4
|
+
* Generated on 2026-09-14T07:04:58.616Z
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
/* ========== color.css ========== */
|
|
@@ -41,7 +41,8 @@
|
|
|
41
41
|
--yee-color-text-auxiliary: #d1d1d1;
|
|
42
42
|
--yee-color-split: #e7e7e7;
|
|
43
43
|
--yee-color-border: #cbd6e2;
|
|
44
|
-
--yee-color-border-hover
|
|
44
|
+
--yee-color-border-hover: #75b9f0;
|
|
45
|
+
--yee-color-border-focus: #75b9f0;
|
|
45
46
|
--yee-color-bg-highlight: rgba(245, 130, 32, 16%);
|
|
46
47
|
--yee-color-bg-disabled: #f5f8fa;
|
|
47
48
|
--yee-color-bg-head: #f8f8f8;
|
|
@@ -493,7 +494,7 @@
|
|
|
493
494
|
/* --Checkbox-- */
|
|
494
495
|
--yee-checkbox-bg-color: var(--yee-color-bg-container);
|
|
495
496
|
--yee-checkbox-border-color: var(--yee-color-border);
|
|
496
|
-
--yee-checkbox-hover-border-color: var(--yee-color-border-hover
|
|
497
|
+
--yee-checkbox-hover-border-color: var(--yee-color-border-hover);
|
|
497
498
|
--yee-checkbox-checked-bg-color: var(--yee-color-primary);
|
|
498
499
|
--yee-checkbox-checked-border-color: var(--yee-color-primary);
|
|
499
500
|
--yee-checkbox-checked-after-border-color: #fff;
|
|
@@ -536,9 +537,7 @@
|
|
|
536
537
|
--yee-date-picker-time-disabled-color: var(--yee-color-text-disabled);
|
|
537
538
|
--yee-date-picker-time-disabled-bg-color: transparent;
|
|
538
539
|
--yee-range-picker-trigger-border-color: var(--yee-color-border);
|
|
539
|
-
--yee-range-picker-trigger-hover-border-color: var(
|
|
540
|
-
--yee-color-border-hover-focus
|
|
541
|
-
);
|
|
540
|
+
--yee-range-picker-trigger-hover-border-color: var(--yee-color-border-hover);
|
|
542
541
|
--yee-range-picker-checked-bg-color: var(--yee-color-option-active-bg);
|
|
543
542
|
--yee-range-picker-hover-border-color: var(--yee-color-primary);
|
|
544
543
|
--yee-range-picker-panel-bg-color: #fff;
|
|
@@ -555,8 +554,8 @@
|
|
|
555
554
|
);
|
|
556
555
|
|
|
557
556
|
/* --Input-- */
|
|
558
|
-
--yee-input-hover-border-color: var(--yee-color-border-hover
|
|
559
|
-
--yee-input-
|
|
557
|
+
--yee-input-hover-border-color: var(--yee-color-border-hover);
|
|
558
|
+
--yee-input-focus-border-color: var(--yee-color-border-focus);
|
|
560
559
|
--yee-input-focus-bs-color: rgba(117, 185, 240, 24%);
|
|
561
560
|
--yee-input-border-color: var(--yee-color-border);
|
|
562
561
|
--yee-input-content-bg-color: var(--yee-color-bg-container);
|
|
@@ -608,7 +607,7 @@
|
|
|
608
607
|
--yee-radio-inner-disabled-after-checked-bg-color: var(
|
|
609
608
|
--yee-color-text-disabled
|
|
610
609
|
);
|
|
611
|
-
--yee-radio-inner-hover-border-color: var(--yee-color-border-hover
|
|
610
|
+
--yee-radio-inner-hover-border-color: var(--yee-color-border-hover);
|
|
612
611
|
--yee-radio-label-button-border-color: var(--yee-color-border);
|
|
613
612
|
--yee-radio-label-button-bg-color: var(--yee-color-bg-container);
|
|
614
613
|
--yee-radio-label-button-hover-color: var(--yee-color-primary);
|
|
@@ -1153,7 +1152,7 @@
|
|
|
1153
1152
|
|
|
1154
1153
|
/* --Selector-- */
|
|
1155
1154
|
--yee-selector-border-color: var(--yee-color-border);
|
|
1156
|
-
--yee-selector-hover-border-color: var(--yee-color-border-hover
|
|
1155
|
+
--yee-selector-hover-border-color: var(--yee-color-border-hover);
|
|
1157
1156
|
--yee-selector-focus-border-color: var(--yee-color-primary);
|
|
1158
1157
|
--yee-selector-disabled-bg-color: var(--yee-input-disabled-bg-color);
|
|
1159
1158
|
|
|
@@ -1228,9 +1227,13 @@
|
|
|
1228
1227
|
--yee-text-color-highlight: var(--yee-color-text-highlight);
|
|
1229
1228
|
--yee-text-color-secondary: var(--yee-color-text-secondary);
|
|
1230
1229
|
--yee-border-color: var(--yee-color-border);
|
|
1231
|
-
--yee-border-color-hover-focus: var(--yee-color-border-
|
|
1230
|
+
--yee-border-color-hover-focus: var(--yee-color-border-focus);
|
|
1232
1231
|
--yee-placeholder-color: var(--yee-color-placeholder);
|
|
1233
1232
|
|
|
1233
|
+
/* deprecated:2026-09-11 hover/focus 拆分为 --yee-color-border-hover / --yee-color-border-focus */
|
|
1234
|
+
--yee-color-border-hover-focus: var(--yee-color-border-focus);
|
|
1235
|
+
/* deprecated:2026-09-11 更名 --yee-input-focus-border-color */
|
|
1236
|
+
--yee-input-content-focus-border-color: var(--yee-input-focus-border-color);
|
|
1234
1237
|
/* deprecated-aliases:end */
|
|
1235
1238
|
|
|
1236
1239
|
/* deprecated-aliases:start
|
|
@@ -1343,7 +1346,7 @@
|
|
|
1343
1346
|
--yee-timepicker-bg-color: var(--yee-time-picker-bg-color);
|
|
1344
1347
|
--yee-treeselect-dropdown-bg-color: var(--yee-tree-select-dropdown-bg-color);
|
|
1345
1348
|
|
|
1346
|
-
|
|
1349
|
+
/* deprecated-aliases:end */
|
|
1347
1350
|
}
|
|
1348
1351
|
|
|
1349
1352
|
|
package/dist/cjs/version.d.ts
CHANGED
package/dist/cjs/version.js
CHANGED
|
@@ -99,6 +99,7 @@
|
|
|
99
99
|
&&-error {
|
|
100
100
|
--yee-input-border-color: var(--yee-color-error);
|
|
101
101
|
--yee-input-hover-border-color: var(--yee-color-error-hover);
|
|
102
|
+
--yee-input-focus-border-color: var(--yee-color-error-hover);
|
|
102
103
|
--yee-input-focus-bs-color: var(--yee-color-error-border);
|
|
103
104
|
--yee-checkbox-border-color: var(--yee-color-error);
|
|
104
105
|
}
|
|
@@ -106,6 +107,7 @@
|
|
|
106
107
|
&&-warning {
|
|
107
108
|
--yee-input-border-color: var(--yee-color-warning);
|
|
108
109
|
--yee-input-hover-border-color: var(--yee-color-warning-hover);
|
|
110
|
+
--yee-input-focus-border-color: var(--yee-color-warning-hover);
|
|
109
111
|
--yee-input-focus-bs-color: var(--yee-color-warning-border);
|
|
110
112
|
--yee-checkbox-border-color: var(--yee-color-warning);
|
|
111
113
|
}
|
|
@@ -113,6 +115,7 @@
|
|
|
113
115
|
&&-success {
|
|
114
116
|
--yee-input-border-color: var(--yee-color-success);
|
|
115
117
|
--yee-input-hover-border-color: var(--yee-color-success-hover);
|
|
118
|
+
--yee-input-focus-border-color: var(--yee-color-success-hover);
|
|
116
119
|
--yee-input-focus-bs-color: var(--yee-color-success-border);
|
|
117
120
|
--yee-checkbox-border-color: var(--yee-color-success);
|
|
118
121
|
}
|
|
@@ -120,6 +123,7 @@
|
|
|
120
123
|
&&-info {
|
|
121
124
|
--yee-input-border-color: var(--yee-color-info);
|
|
122
125
|
--yee-input-hover-border-color: var(--yee-color-info-hover);
|
|
126
|
+
--yee-input-focus-border-color: var(--yee-color-info-hover);
|
|
123
127
|
--yee-input-focus-bs-color: var(--yee-color-info-border);
|
|
124
128
|
--yee-checkbox-border-color: var(--yee-color-info);
|
|
125
129
|
}
|
|
@@ -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
|
*/
|