@aloudata/aloudata-design 2.18.1 → 2.18.3
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/AldSelect/index.js
CHANGED
|
@@ -181,17 +181,20 @@ export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
|
|
|
181
181
|
};
|
|
182
182
|
// Used for OptionList selection
|
|
183
183
|
var onOptionSelect = function onOptionSelect(val) {
|
|
184
|
+
// Get the original value from keyMenuItems to preserve the type (number/string)
|
|
185
|
+
var menuItem = keyMenuItems.get(toString(val));
|
|
186
|
+
var originalValue = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.value) !== undefined ? menuItem.value : val;
|
|
184
187
|
var selected = displayValues.find(function (item) {
|
|
185
188
|
return toString(item.value) === toString(val);
|
|
186
189
|
});
|
|
187
190
|
if (isMultiple(mode)) {
|
|
188
191
|
if (!selected) {
|
|
189
|
-
triggerSelect(
|
|
192
|
+
triggerSelect(originalValue, true, 'add');
|
|
190
193
|
} else {
|
|
191
|
-
triggerSelect(
|
|
194
|
+
triggerSelect(originalValue, false, 'remove');
|
|
192
195
|
}
|
|
193
196
|
} else {
|
|
194
|
-
triggerSelect(
|
|
197
|
+
triggerSelect(originalValue, true, 'add');
|
|
195
198
|
}
|
|
196
199
|
};
|
|
197
200
|
// ======================= Display Change =======================
|
|
@@ -217,6 +220,9 @@ export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
|
|
|
217
220
|
items: (mergedMenu === null || mergedMenu === void 0 ? void 0 : mergedMenu.items) || [],
|
|
218
221
|
onClick: function onClick(menuInfo) {
|
|
219
222
|
var _mergedMenu$onClick;
|
|
223
|
+
// Get the original value from keyMenuItems to preserve the type (number/string)
|
|
224
|
+
var menuItem = keyMenuItems.get(menuInfo.key);
|
|
225
|
+
var originalValue = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.value) !== undefined ? menuItem.value : menuInfo.key;
|
|
220
226
|
if (mode && isMultiple(mode)) {
|
|
221
227
|
if (displayValues.find(function (item) {
|
|
222
228
|
return toString(item.value) === menuInfo.key;
|
|
@@ -227,15 +233,15 @@ export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
|
|
|
227
233
|
return item.value;
|
|
228
234
|
}));
|
|
229
235
|
} else {
|
|
230
|
-
triggerChange([].concat(_toConsumableArray(displayValues), [
|
|
236
|
+
triggerChange([].concat(_toConsumableArray(displayValues), [originalValue]));
|
|
231
237
|
}
|
|
232
238
|
} else {
|
|
233
|
-
triggerChange(
|
|
239
|
+
triggerChange(originalValue);
|
|
234
240
|
}
|
|
235
241
|
mergedMenu === null || mergedMenu === void 0 ? void 0 : (_mergedMenu$onClick = mergedMenu.onClick) === null || _mergedMenu$onClick === void 0 ? void 0 : _mergedMenu$onClick.call(mergedMenu, menuInfo);
|
|
236
242
|
}
|
|
237
243
|
});
|
|
238
|
-
}, [mergedMenu, mode, displayValues, triggerChange]);
|
|
244
|
+
}, [mergedMenu, mode, displayValues, triggerChange, keyMenuItems]);
|
|
239
245
|
var displayMenu = useDisplayMenu(selectMenu,
|
|
240
246
|
// 如果用户接管了搜索,则默认不做搜索过滤
|
|
241
247
|
onSearch ? filterOption || noOpFilter : filterOption, innerSearchValue);
|
|
@@ -62,14 +62,14 @@ export default function InputSearch(props) {
|
|
|
62
62
|
}, [locale, size]);
|
|
63
63
|
|
|
64
64
|
// 判断是否为受控模式
|
|
65
|
-
var isControlled = value
|
|
65
|
+
var isControlled = ('value' in props);
|
|
66
66
|
var _useState = useState(defaultValue || ''),
|
|
67
67
|
_useState2 = _slicedToArray(_useState, 2),
|
|
68
68
|
searchValue = _useState2[0],
|
|
69
69
|
setSearchValue = _useState2[1];
|
|
70
70
|
|
|
71
71
|
// 获取当前值:受控模式使用 value,非受控模式使用内部状态
|
|
72
|
-
var currentValue = isControlled ? value : searchValue;
|
|
72
|
+
var currentValue = isControlled ? value !== null && value !== void 0 ? value : '' : searchValue;
|
|
73
73
|
var isComposing = useRef(false);
|
|
74
74
|
var onPressEnter = useCallback(function (e) {
|
|
75
75
|
if (!isComposing.current) {
|
|
@@ -93,7 +93,8 @@ export default function InputSearch(props) {
|
|
|
93
93
|
setSearchValue(newValue);
|
|
94
94
|
}
|
|
95
95
|
if (!isComposing.current) {
|
|
96
|
-
|
|
96
|
+
// 受控的时候debounce不生效
|
|
97
|
+
if (debounce && !isControlled) {
|
|
97
98
|
debounceSearch(newValue);
|
|
98
99
|
} else {
|
|
99
100
|
onSearch(newValue);
|
|
@@ -55,7 +55,7 @@ var UserGroupSelection = function UserGroupSelection(_ref) {
|
|
|
55
55
|
filterUserList = _useState6[0],
|
|
56
56
|
setFilterUserList = _useState6[1];
|
|
57
57
|
var getFilterUserList = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
58
|
-
var _$last, nextLevelGroup;
|
|
58
|
+
var _$last, nextLevelGroup, normalizedKeyword, currentLevelGroups;
|
|
59
59
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
60
60
|
while (1) switch (_context.prev = _context.next) {
|
|
61
61
|
case 0:
|
|
@@ -72,18 +72,26 @@ var UserGroupSelection = function UserGroupSelection(_ref) {
|
|
|
72
72
|
nextLevelGroup = _context.sent;
|
|
73
73
|
return _context.abrupt("return", nextLevelGroup);
|
|
74
74
|
case 5:
|
|
75
|
-
|
|
75
|
+
normalizedKeyword = searchKey.trim().toLowerCase();
|
|
76
|
+
currentLevelGroups = userGroupList.filter(function (userGroup) {
|
|
76
77
|
var _$last2;
|
|
77
|
-
if (groupPath.length === 0)
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
if (groupPath.length === 0) {
|
|
79
|
+
return !userGroup.parentId;
|
|
80
|
+
}
|
|
81
|
+
return userGroup.parentId === ((_$last2 = _.last(groupPath)) === null || _$last2 === void 0 ? void 0 : _$last2.groupId);
|
|
82
|
+
});
|
|
83
|
+
return _context.abrupt("return", currentLevelGroups.filter(function (group) {
|
|
84
|
+
if (!normalizedKeyword) {
|
|
85
|
+
return true;
|
|
86
|
+
}
|
|
87
|
+
return group.name.toLowerCase().includes(normalizedKeyword);
|
|
80
88
|
}));
|
|
81
|
-
case
|
|
89
|
+
case 8:
|
|
82
90
|
case "end":
|
|
83
91
|
return _context.stop();
|
|
84
92
|
}
|
|
85
93
|
}, _callee);
|
|
86
|
-
})), [
|
|
94
|
+
})), [isAsync, searchKey, userGroupList, getNextLevelGroup, groupPath]);
|
|
87
95
|
useEffect(function () {
|
|
88
96
|
getFilterUserList().then(function (userGroups) {
|
|
89
97
|
setFilterUserList(userGroups.filter(function (userGroup) {
|
|
@@ -93,7 +101,7 @@ var UserGroupSelection = function UserGroupSelection(_ref) {
|
|
|
93
101
|
return true;
|
|
94
102
|
}));
|
|
95
103
|
});
|
|
96
|
-
}, [getFilterUserList]);
|
|
104
|
+
}, [filterItem, getFilterUserList]);
|
|
97
105
|
return /*#__PURE__*/React.createElement("div", {
|
|
98
106
|
className: classNames(className, 'ald-member-picker-member-list-wrap')
|
|
99
107
|
}, /*#__PURE__*/React.createElement(Input, {
|