ztxkui 1.8.5 → 1.8.6
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.
|
@@ -232,13 +232,28 @@ function EnhanceSelect(_a) {
|
|
|
232
232
|
// console.log('TEST: 远程搜索');
|
|
233
233
|
getRemoteDataHandle('');
|
|
234
234
|
}, [url, remoteSearch, getRemoteDataHandle]);
|
|
235
|
+
// 数据合并
|
|
236
|
+
function concatData(originalData, newData) {
|
|
237
|
+
if (!newData) {
|
|
238
|
+
return originalData;
|
|
239
|
+
}
|
|
240
|
+
var resultData = originalData.slice() || [];
|
|
241
|
+
if (Array.isArray(newData)) {
|
|
242
|
+
newData.forEach(function (item) {
|
|
243
|
+
if (!resultData.find(function (resultItem) { return resultItem[dataKey] === item[dataKey]; })) {
|
|
244
|
+
resultData.unshift(item);
|
|
245
|
+
}
|
|
246
|
+
});
|
|
247
|
+
}
|
|
248
|
+
return resultData;
|
|
249
|
+
}
|
|
235
250
|
// 渲染数据
|
|
236
251
|
function renderSelectOption() {
|
|
237
252
|
var _defaultList = Array.isArray(defaultList) ? defaultList : [];
|
|
238
253
|
return (React.createElement(React.Fragment, null,
|
|
239
254
|
showAll && (React.createElement(Select.Option, { title: "\u5168\u90E8", value: "" }, "\u5168\u90E8")),
|
|
240
255
|
Array.isArray(selectList) &&
|
|
241
|
-
selectList
|
|
256
|
+
concatData(selectList, _defaultList).map(function (item) {
|
|
242
257
|
var key = componentKey ? item[componentKey] : item[dataKey];
|
|
243
258
|
var value = item[dataKey];
|
|
244
259
|
var title = item[titleKey];
|