@hi-ui/tree-select 4.0.0-alpha.23 → 4.0.0-alpha.24
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/README.md +1 -1
- package/lib/cjs/TreeSelect.js +23 -15
- package/lib/cjs/TreeSelect.js.map +1 -1
- package/lib/esm/TreeSelect.js +23 -15
- package/lib/esm/TreeSelect.js.map +1 -1
- package/lib/types/TreeSelect.d.ts +4 -5
- package/package.json +6 -6
package/README.md
CHANGED
@@ -77,7 +77,7 @@
|
|
77
77
|
| searchPlaceholder | feature | - | Picker 类型组件统一支持 |
|
78
78
|
| loadingContent | feature | - | Picker 类型组件统一支持,适配新 UI |
|
79
79
|
| popper | feature | - | Picker 类型组件统一支持,聚合管理。比如: placement,之前有的加了有的没加 |
|
80
|
-
|
|
80
|
+
| render | feature | - | 统一支持自定义渲染每一项 |
|
81
81
|
| virtual | feature | - | 支持虚拟列表 |
|
82
82
|
| height | feature | - | 支持虚拟列表 |
|
83
83
|
| itemHeight | feature | - | 支持虚拟列表 |
|
package/lib/cjs/TreeSelect.js
CHANGED
@@ -92,14 +92,14 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
|
|
92
92
|
searchableProp = _a.searchable,
|
93
93
|
searchModeProp = _a.searchMode,
|
94
94
|
onLoadChildren = _a.onLoadChildren,
|
95
|
-
titleRender = _a.
|
95
|
+
titleRender = _a.render,
|
96
96
|
filterOption = _a.filterOption,
|
97
97
|
clearable = _a.clearable,
|
98
98
|
invalid = _a.invalid,
|
99
|
-
|
99
|
+
displayRenderProp = _a.displayRender,
|
100
100
|
placeholderProp = _a.placeholder,
|
101
101
|
appearance = _a.appearance,
|
102
|
-
rest = tslib.__rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "fieldNames", "showCheckedMode", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "
|
102
|
+
rest = tslib.__rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "fieldNames", "showCheckedMode", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "render", "filterOption", "clearable", "invalid", "displayRender", "placeholder", "appearance"]);
|
103
103
|
|
104
104
|
var i18n = localeContext.useLocaleContext();
|
105
105
|
var placeholder = typeAssertion.isUndef(placeholderProp) ? i18n.get('treeSelect.placeholder') : placeholderProp;
|
@@ -116,11 +116,22 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
|
|
116
116
|
return node[fieldNames[key] || key];
|
117
117
|
}, [fieldNames]);
|
118
118
|
var flattedData = React.useMemo(function () {
|
119
|
-
return treeUtils.
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
119
|
+
return treeUtils.baseFlattenTree({
|
120
|
+
tree: data,
|
121
|
+
childrenFieldName: function childrenFieldName(node) {
|
122
|
+
return getKeyFields(node, 'children');
|
123
|
+
},
|
124
|
+
transform: function transform(node) {
|
125
|
+
var _a, _b;
|
126
|
+
|
127
|
+
var flattedNode = node;
|
128
|
+
var raw = node.raw;
|
129
|
+
flattedNode.id = getKeyFields(raw, 'id');
|
130
|
+
flattedNode.title = getKeyFields(raw, 'title');
|
131
|
+
flattedNode.disabled = (_a = getKeyFields(raw, 'disabled')) !== null && _a !== void 0 ? _a : false;
|
132
|
+
flattedNode.isLeaf = (_b = getKeyFields(raw, 'isLeaf')) !== null && _b !== void 0 ? _b : false;
|
133
|
+
return flattedNode;
|
134
|
+
}
|
124
135
|
});
|
125
136
|
}, [data, getKeyFields]); // TODO: 抽离展开hook
|
126
137
|
// TODO: onLoadChildren 和 defaultExpandAll 共存时
|
@@ -143,6 +154,7 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
|
|
143
154
|
tryChangeValue = _useUncontrolledState2[1];
|
144
155
|
|
145
156
|
var onSelect = React.useCallback(function (selectedId, selectedNode) {
|
157
|
+
// 关闭反选功能
|
146
158
|
if (selectedId) {
|
147
159
|
tryChangeValue(selectedId, selectedNode);
|
148
160
|
setSelectedItem(selectedNode);
|
@@ -217,7 +229,7 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
|
|
217
229
|
});
|
218
230
|
});
|
219
231
|
} : tryChangeExpandedIds,
|
220
|
-
|
232
|
+
render: proxyTitleRender
|
221
233
|
}; // 下拉菜单不能合并(因为树形数据,不知道是第几级)
|
222
234
|
|
223
235
|
var mergedData = React.useMemo(function () {
|
@@ -243,16 +255,12 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
|
|
243
255
|
searchable: searchable,
|
244
256
|
onSearch: onSearch,
|
245
257
|
loading: loading,
|
246
|
-
trigger: /*#__PURE__*/React__default['default'].createElement(MockInput.MockInput //
|
247
|
-
// onClick={openMenu}
|
248
|
-
// disabled={disabled}
|
258
|
+
trigger: /*#__PURE__*/React__default['default'].createElement(MockInput.MockInput // disabled={disabled}
|
249
259
|
, {
|
250
|
-
// ref={targetElementRef}
|
251
|
-
// onClick={openMenu}
|
252
260
|
// disabled={disabled}
|
253
261
|
clearable: clearable,
|
254
262
|
placeholder: placeholder,
|
255
|
-
displayRender:
|
263
|
+
displayRender: displayRenderProp,
|
256
264
|
suffix: menuVisible ? /*#__PURE__*/React__default['default'].createElement(icons.UpOutlined, null) : /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, null),
|
257
265
|
focused: menuVisible,
|
258
266
|
value: value,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"TreeSelect.js","sources":["../../src/TreeSelect.tsx"],"sourcesContent":[null],"names":["TREE_SELECT_PREFIX","getPrefixCls","DEFAULT_DATA","DEFAULT_FIELD_NAMES","DEFAULT_EXPANDED_IDS","TreeSelect","forwardRef","_a","ref","prefixCls","className","data","dataSource","disabled","fieldNames","defaultExpandAll","expandedIdsProp","expandedIds","defaultExpandedIds","onExpand","defaultValue","valueProp","value","onChange","searchableProp","searchable","searchModeProp","searchMode","onLoadChildren","titleRender","filterOption","clearable","invalid","displayRender","placeholderProp","placeholder","appearance","rest","i18n","useLocaleContext","isUndef","get","useToggle","menuVisible","menuVisibleAction","getKeyFields","useCallback","node","key","flattedData","useMemo","
|
1
|
+
{"version":3,"file":"TreeSelect.js","sources":["../../src/TreeSelect.tsx"],"sourcesContent":[null],"names":["TREE_SELECT_PREFIX","getPrefixCls","DEFAULT_DATA","DEFAULT_FIELD_NAMES","DEFAULT_EXPANDED_IDS","TreeSelect","forwardRef","_a","ref","prefixCls","className","data","dataSource","disabled","fieldNames","defaultExpandAll","expandedIdsProp","expandedIds","defaultExpandedIds","onExpand","defaultValue","valueProp","value","onChange","searchableProp","searchable","searchModeProp","searchMode","onLoadChildren","titleRender","render","filterOption","clearable","invalid","displayRenderProp","displayRender","placeholderProp","placeholder","appearance","rest","i18n","useLocaleContext","isUndef","get","useToggle","menuVisible","menuVisibleAction","getKeyFields","useCallback","node","key","flattedData","useMemo","baseFlattenTree","tree","childrenFieldName","transform","flattedNode","raw","id","title","isLeaf","useUncontrolledState","getDefaultExpandedIds","map","tryChangeExpandedIds","tryChangeValue","onSelect","selectedId","selectedNode","setSelectedItem","off","useState","selectedItem","_b","useAsyncSearch","loading","hasError","dataSourceStrategy","customSearchStrategy","useTreeCustomSearch","filterSearchStrategy","useFilterSearch","highlightSearchStrategy","useHighlightSearch","useSearchMode","strategies","stateInSearch","state","setStateInSearch","onSearch","searchValue","keyword","proxyTitleRender","ret","highlight","React","Highlighter","shouldUseSearch","treeProps","ids","prev","mergedData","nextData","concat","uniqBy","cls","cx","Picker","visible","onOpen","on","onClose","trigger","MockInput","suffix","UpOutlined","DownOutlined","focused","isArrayNonEmpty","Tree","selectable","__DEV__","displayName"],"mappings":"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"}
|
package/lib/esm/TreeSelect.js
CHANGED
@@ -15,7 +15,7 @@ import { useToggle } from '@hi-ui/use-toggle';
|
|
15
15
|
import { Tree } from '@hi-ui/tree';
|
16
16
|
import { useUncontrolledState } from '@hi-ui/use-uncontrolled-state';
|
17
17
|
import { Picker } from '@hi-ui/picker';
|
18
|
-
import {
|
18
|
+
import { baseFlattenTree } from '@hi-ui/tree-utils';
|
19
19
|
import { isUndef, isArrayNonEmpty } from '@hi-ui/type-assertion';
|
20
20
|
import { uniqBy } from 'lodash';
|
21
21
|
import { Highlighter } from '@hi-ui/highlighter';
|
@@ -58,14 +58,14 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
|
|
58
58
|
searchableProp = _a.searchable,
|
59
59
|
searchModeProp = _a.searchMode,
|
60
60
|
onLoadChildren = _a.onLoadChildren,
|
61
|
-
titleRender = _a.
|
61
|
+
titleRender = _a.render,
|
62
62
|
filterOption = _a.filterOption,
|
63
63
|
clearable = _a.clearable,
|
64
64
|
invalid = _a.invalid,
|
65
|
-
|
65
|
+
displayRenderProp = _a.displayRender,
|
66
66
|
placeholderProp = _a.placeholder,
|
67
67
|
appearance = _a.appearance,
|
68
|
-
rest = __rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "fieldNames", "showCheckedMode", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "
|
68
|
+
rest = __rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "fieldNames", "showCheckedMode", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "render", "filterOption", "clearable", "invalid", "displayRender", "placeholder", "appearance"]);
|
69
69
|
|
70
70
|
var i18n = useLocaleContext();
|
71
71
|
var placeholder = isUndef(placeholderProp) ? i18n.get('treeSelect.placeholder') : placeholderProp;
|
@@ -82,11 +82,22 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
|
|
82
82
|
return node[fieldNames[key] || key];
|
83
83
|
}, [fieldNames]);
|
84
84
|
var flattedData = useMemo(function () {
|
85
|
-
return
|
86
|
-
|
85
|
+
return baseFlattenTree({
|
86
|
+
tree: data,
|
87
|
+
childrenFieldName: function childrenFieldName(node) {
|
88
|
+
return getKeyFields(node, 'children');
|
89
|
+
},
|
90
|
+
transform: function transform(node) {
|
91
|
+
var _a, _b;
|
87
92
|
|
88
|
-
|
89
|
-
|
93
|
+
var flattedNode = node;
|
94
|
+
var raw = node.raw;
|
95
|
+
flattedNode.id = getKeyFields(raw, 'id');
|
96
|
+
flattedNode.title = getKeyFields(raw, 'title');
|
97
|
+
flattedNode.disabled = (_a = getKeyFields(raw, 'disabled')) !== null && _a !== void 0 ? _a : false;
|
98
|
+
flattedNode.isLeaf = (_b = getKeyFields(raw, 'isLeaf')) !== null && _b !== void 0 ? _b : false;
|
99
|
+
return flattedNode;
|
100
|
+
}
|
90
101
|
});
|
91
102
|
}, [data, getKeyFields]); // TODO: 抽离展开hook
|
92
103
|
// TODO: onLoadChildren 和 defaultExpandAll 共存时
|
@@ -109,6 +120,7 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
|
|
109
120
|
tryChangeValue = _useUncontrolledState2[1];
|
110
121
|
|
111
122
|
var onSelect = useCallback(function (selectedId, selectedNode) {
|
123
|
+
// 关闭反选功能
|
112
124
|
if (selectedId) {
|
113
125
|
tryChangeValue(selectedId, selectedNode);
|
114
126
|
setSelectedItem(selectedNode);
|
@@ -183,7 +195,7 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
|
|
183
195
|
});
|
184
196
|
});
|
185
197
|
} : tryChangeExpandedIds,
|
186
|
-
|
198
|
+
render: proxyTitleRender
|
187
199
|
}; // 下拉菜单不能合并(因为树形数据,不知道是第几级)
|
188
200
|
|
189
201
|
var mergedData = useMemo(function () {
|
@@ -209,16 +221,12 @@ var TreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
|
|
209
221
|
searchable: searchable,
|
210
222
|
onSearch: onSearch,
|
211
223
|
loading: loading,
|
212
|
-
trigger: /*#__PURE__*/React.createElement(MockInput //
|
213
|
-
// onClick={openMenu}
|
214
|
-
// disabled={disabled}
|
224
|
+
trigger: /*#__PURE__*/React.createElement(MockInput // disabled={disabled}
|
215
225
|
, {
|
216
|
-
// ref={targetElementRef}
|
217
|
-
// onClick={openMenu}
|
218
226
|
// disabled={disabled}
|
219
227
|
clearable: clearable,
|
220
228
|
placeholder: placeholder,
|
221
|
-
displayRender:
|
229
|
+
displayRender: displayRenderProp,
|
222
230
|
suffix: menuVisible ? /*#__PURE__*/React.createElement(UpOutlined, null) : /*#__PURE__*/React.createElement(DownOutlined, null),
|
223
231
|
focused: menuVisible,
|
224
232
|
value: value,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"TreeSelect.js","sources":["../../src/TreeSelect.tsx"],"sourcesContent":[null],"names":["TREE_SELECT_PREFIX","getPrefixCls","DEFAULT_DATA","DEFAULT_FIELD_NAMES","DEFAULT_EXPANDED_IDS","TreeSelect","forwardRef","_a","ref","prefixCls","className","data","dataSource","disabled","fieldNames","defaultExpandAll","expandedIdsProp","expandedIds","defaultExpandedIds","onExpand","defaultValue","valueProp","value","onChange","searchableProp","searchable","searchModeProp","searchMode","onLoadChildren","titleRender","filterOption","clearable","invalid","displayRender","placeholderProp","placeholder","appearance","rest","i18n","useLocaleContext","isUndef","get","useToggle","menuVisible","menuVisibleAction","getKeyFields","useCallback","node","key","flattedData","useMemo","
|
1
|
+
{"version":3,"file":"TreeSelect.js","sources":["../../src/TreeSelect.tsx"],"sourcesContent":[null],"names":["TREE_SELECT_PREFIX","getPrefixCls","DEFAULT_DATA","DEFAULT_FIELD_NAMES","DEFAULT_EXPANDED_IDS","TreeSelect","forwardRef","_a","ref","prefixCls","className","data","dataSource","disabled","fieldNames","defaultExpandAll","expandedIdsProp","expandedIds","defaultExpandedIds","onExpand","defaultValue","valueProp","value","onChange","searchableProp","searchable","searchModeProp","searchMode","onLoadChildren","titleRender","render","filterOption","clearable","invalid","displayRenderProp","displayRender","placeholderProp","placeholder","appearance","rest","i18n","useLocaleContext","isUndef","get","useToggle","menuVisible","menuVisibleAction","getKeyFields","useCallback","node","key","flattedData","useMemo","baseFlattenTree","tree","childrenFieldName","transform","flattedNode","raw","id","title","isLeaf","useUncontrolledState","getDefaultExpandedIds","map","tryChangeExpandedIds","tryChangeValue","onSelect","selectedId","selectedNode","setSelectedItem","off","useState","selectedItem","_b","useAsyncSearch","loading","hasError","dataSourceStrategy","customSearchStrategy","useTreeCustomSearch","filterSearchStrategy","useFilterSearch","highlightSearchStrategy","useHighlightSearch","useSearchMode","strategies","stateInSearch","state","setStateInSearch","onSearch","searchValue","keyword","proxyTitleRender","ret","highlight","React","Highlighter","shouldUseSearch","treeProps","ids","prev","mergedData","nextData","concat","uniqBy","cls","cx","Picker","visible","onOpen","on","onClose","trigger","MockInput","suffix","UpOutlined","DownOutlined","focused","isArrayNonEmpty","Tree","selectable","__DEV__","displayName"],"mappings":"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"}
|
@@ -80,7 +80,7 @@ export interface TreeSelectProps extends Omit<PickerProps, 'data' | 'onChange' |
|
|
80
80
|
/**
|
81
81
|
* 自定义渲染节点的 title 内容
|
82
82
|
*/
|
83
|
-
|
83
|
+
render?: (node: TreeNodeEventData) => React.ReactNode;
|
84
84
|
/**
|
85
85
|
* 点击异步加载子项
|
86
86
|
*/
|
@@ -107,11 +107,10 @@ export interface TreeSelectProps extends Omit<PickerProps, 'data' | 'onChange' |
|
|
107
107
|
overlayClassName?: string;
|
108
108
|
/**
|
109
109
|
* 选中时触发
|
110
|
-
*
|
111
|
-
*
|
112
|
-
* currentNode: 当前操作节点
|
110
|
+
* selectedId : 选中项 ID
|
111
|
+
* selectedItem: 选中项数据项
|
113
112
|
*/
|
114
|
-
onChange?: (
|
113
|
+
onChange?: (selectedId: React.ReactText, selectedItem: TreeSelectDataItem) => void;
|
115
114
|
/**
|
116
115
|
* 是否可清空
|
117
116
|
*/
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@hi-ui/tree-select",
|
3
|
-
"version": "4.0.0-alpha.
|
3
|
+
"version": "4.0.0-alpha.24",
|
4
4
|
"description": "A sub-package for @hi-ui/hiui.",
|
5
5
|
"keywords": [],
|
6
6
|
"author": "HIUI <mi-hiui@xiaomi.com>",
|
@@ -50,13 +50,13 @@
|
|
50
50
|
"@hi-ui/highlighter": "^4.0.0-alpha.13",
|
51
51
|
"@hi-ui/icons": "^4.0.0-alpha.29",
|
52
52
|
"@hi-ui/locale-context": "^4.0.0-alpha.19",
|
53
|
-
"@hi-ui/picker": "^4.0.0-alpha.
|
53
|
+
"@hi-ui/picker": "^4.0.0-alpha.19",
|
54
54
|
"@hi-ui/popper": "^4.0.0-alpha.25",
|
55
55
|
"@hi-ui/tag-input": "^4.0.0-alpha.25",
|
56
|
-
"@hi-ui/tree": "^4.0.0-alpha.
|
57
|
-
"@hi-ui/tree-utils": "^4.0.0-alpha.
|
56
|
+
"@hi-ui/tree": "^4.0.0-alpha.42",
|
57
|
+
"@hi-ui/tree-utils": "^4.0.0-alpha.13",
|
58
58
|
"@hi-ui/type-assertion": "^4.0.0-alpha.14",
|
59
|
-
"@hi-ui/use-search-mode": "^4.0.0-alpha.
|
59
|
+
"@hi-ui/use-search-mode": "^4.0.0-alpha.15",
|
60
60
|
"@hi-ui/use-toggle": "^4.0.0-alpha.12",
|
61
61
|
"@hi-ui/use-uncontrolled-state": "^4.0.0-alpha.14",
|
62
62
|
"lodash": "^4.17.21"
|
@@ -70,5 +70,5 @@
|
|
70
70
|
"react": "^17.0.1",
|
71
71
|
"react-dom": "^17.0.1"
|
72
72
|
},
|
73
|
-
"gitHead": "
|
73
|
+
"gitHead": "4ae866e7efb2c7f95f6bba5bd6194c9a568c60fb"
|
74
74
|
}
|