ztxkui 2.0.0 → 2.0.1

package/dist/components/EnhanceSelect/index.js

@@ -74,9 +74,11 @@ function EnhanceSelect(_a) {
     var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, transformData = _a.transformData, joinKey = _a.joinKey, _e = _a.joinStr, joinStr = _e === void 0 ? '-' : _e, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "transformData", "joinKey", "joinStr"]);
     // 下拉数据源
     var _f = useFetchState([]), selectList = _f[0], setSelectList = _f[1];
-    var _g = useFetchState(false), loading = _g[0], setLoading = _g[1];
+    // 多选时，自己需要合并的数据
+    var _g = useFetchState([]), multipleList = _g[0], setMultipleList = _g[1];
+    var _h = useFetchState(false), loading = _h[0], setLoading = _h[1];
     var fetchId = useRef(0); // 请求Id，每次请求都会加1
-    var _h = useFetchState(false), firstLoading = _h[0], setFirstLoading = _h[1];
+    var _j = useFetchState(false), firstLoading = _j[0], setFirstLoading = _j[1];
     // 如果selectList 发生改变，那么触发onCompleted事件
     useEffect(function () {
         if (Array.isArray(selectList) && onCompleted) {
@@ -270,7 +272,7 @@ function EnhanceSelect(_a) {
                 // 如果源数组中找到了该条数据，那么不添加
                 // 否则添加
                 if (!resultData.find(function (resultItem) { return resultItem[dataKey] === item[dataKey]; })) {
-                    resultData.unshift(item);
+                    resultData.push(item);
                 }
             });
         }
@@ -282,7 +284,7 @@ function EnhanceSelect(_a) {
         return (React.createElement(React.Fragment, null,
             showAll && (React.createElement(Select.Option, { title: "\u5168\u90E8", value: "" }, "\u5168\u90E8")),
             Array.isArray(selectList) &&
-                concatData(selectList, _defaultList).map(function (item) {
+                concatData(concatData(selectList, _defaultList), multipleList).map(function (item) {
                     var key = componentKey ? item[componentKey] : item[dataKey];
                     var value = item[dataKey];
                     var title = item[titleKey];
@@ -318,6 +320,7 @@ function EnhanceSelect(_a) {
                 currentData = value.map(function (valueItem) {
                     return selectList.find(function (item) { return item[key_1] === valueItem; });
                 });
+                setMultipleList(currentData);
             }
             else {
                 currentData = selectList.find(function (item) { return item[key_1] === value; });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",