ztxkui 1.9.9 → 2.0.3

package/dist/Demo.js

@@ -6,7 +6,7 @@ var selectStyle = { width: '200px' };
 function request(options) {
     return fetch(options.url + "?" + stringify(options.params), {
         headers: {
-            'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiWUcyMTA2MDA2IiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLlrovlrofnjq8iLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjE0MTcwMzkzNTgzNDMxMDY1NjEsMTQxNzA0MDY4MzI0NDA0ODM4NiwxNDE3MDQwODQyODM3MzE1NTg1LDE0MTcwNDEwNDM3Mjc2OTk5NzAsMTQxNzM3MjI0NTA4OTE3NzYwMSwxNDE3NjQ1NzYxMjI3MjQ3NjE3LDE0MTc3NDkwNTAwMTY0NDg1MTQsMTQxNzc0OTE2NDg4NTg1MjE2MiwxNDE4NDg2MTMwNjM1MDE4MjQxLDE0MTk4NjM2MzQ3NzE4MDgyNTgiLCJjbGllbnRfaWQiOiJzd29yZCIsInVzZXJfdHlwZSI6IndlYiIsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxLDE0MTcwMDQyMDMxOTY5MjgwMDEsMTQxNzAxNDExOTYwOTUyMDEyOSwxNDE3MDE0Njg1NTI1OTg3MzMwLDE0MTczNzAxNzQwMDA1ODI2NTgsMTQxNzY0NTE4OTIyOTAzOTYxOCwxNDE3NjQ2MjY2MTMzMzY4ODM0LDE0MTc2NTY3NTc1ODA4NDUwNTgsMTQxNzY1NzM0OTcxNTkwNjU2MiwxNDE5ODM0NDQ3NTU4MTg0OTYxIiwicG9zdF9uYW1lIjpudWxsLCJzY29wZSI6WyJhbGwiXSwiaW50ZXJ2aWV3X2lkIjpudWxsLCJleHAiOjE2Mzg3MzA0ODcsIm9yZ19uYW1lIjpudWxsLCJqdGkiOiJmNGE2Y2U1My1hYjU0LTRhYTctOTM1NS1iOWMzNzY4YWU1MGUiLCJtZW1iZXJfaWQiOjE0MDQ2ODk5NDUyOTg3MDIzMzcsImNvbXBhbnlfaWQiOjEzOTcwNzQ2MDU0MTI2OTYwNjYsInN5c3RlbV9pZCI6bnVsbCwiZGVwdF9uYW1lIjoi5Lia5Yqh5LiA6YOoIiwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJ1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iLCJ1c2VyIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MjAzMzI5ODE5Njc0NTAxMTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IuWui-Wuh-eOryIsImNvbXBhbnlfbmFtZSI6Iua1meWVhuS4reaLk-mbhuWboueJqea1geenkeaKgOaciemZkOWFrOWPuCIsImRlcHRfaWQiOiIxMzk3MDgxOTMwMzI4NDI0NDQ5IiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiJZRzIxMDYwMDYiLCJyZXN1bWVfaWQiOm51bGx9.nxXBP4n23ZV7Oajz4umdl1e2iE4iyXAXvmZbXvrv5ZU',
+            'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLpmYjkuprpm4QiLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQxMjYxNDExMDY0NzM4NjExNCwxNDEyNjE1Njc3MTE5MjY2ODE3LDE0NDgxMjEwODY1MDQzMDA1NDYsMTQ1MjgyMDI5MzgwMjcxMzA5MCwxNDUzOTI1MDAxNTMxNDc4MDE3LDE0NTg3MTIwODIwODIzNTcyNTAsMTQ1ODgyNjIzODE4NTg4OTc5NCwxNDU4ODI3NzAxMDEyMzI0MzUzLDE0NTg4MjgzNjA4MDE1MDkzNzcsMTQ2MDA4OTI2MjAxMjAzMDk3NywxNDYxMTM3Nzg4NjQ1MTI2MTQ2IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTQxMjYwODc0Mjk1MzI4NzY4MiwxNDM4MzIyNTQzMjk1OTI2Mjc0LDE0NDM0NzU0NzU5NzI3MzQ5NzcsMTQ0NjgxOTQ2MzY5Mzg0NDQ4MiwxNDYwMDg1NDI2ODE1OTUwODQ5LDE0NjI2MjI5OTIzNzUyMDk5ODYiLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTYzOTI3NTUxNiwib3JnX25hbWUiOiLmuZbljZfkuK3mi5Pkv6Hmga_np5HmioDmnInpmZDlhazlj7giLCJqdGkiOiJjOTM4ZmFlMy05YzA1LTQ1MzQtYTVhNy1mZjllY2VkMTFiOWIiLCJtZW1iZXJfaWQiOjE0MTI5NTMyMDUyNjk1MTYyOTAsImNvbXBhbnlfaWQiOjEzOTcwNzQ2MDU0MTI2OTYwNjYsInN5c3RlbV9pZCI6IjMiLCJkZXB0X25hbWUiOiLkuJrliqHkuIDpg6giLCJhdmF0YXIiOiIiLCJkYXRhX3JvbGVfbmFtZSI6ImFkbWluLHVzZXIsdXNlcixhZG1pbixhZG1pbixhZG1pbix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlciIsImF1dGhvcml0aWVzIjpbImFkbWluIiwidXNlciIsImFkbWluaXN0cmF0b3IiXSwicm9sZV9uYW1lIjoidXNlcixhZG1pbixhZG1pbixhZG1pbmlzdHJhdG9yLHVzZXIsdXNlciIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOjE0NTc1Mjc3NjU5MTg1MTU1MzUsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6Iua1meWVhuS4reaLk-mbhuWboueJqea1geenkeaKgOaciemZkOWFrOWPuCIsImRlcHRfaWQiOiIxMzk3MDgxOTMwMzI4NDI0NDQ5IiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiJjaGVueXgiLCJyZXN1bWVfaWQiOm51bGx9.Moo8uYZzd7bNGw_jsydYQvyf5lVoJA8LLUNQdkPxXac',
         },
         method: options.method,
     }).then(function (response) { return response.json(); });
@@ -47,7 +47,7 @@ function Demo() {
                     projectName: '项目12',
                 },
             ]);
-            setValue('1462433051208761603');
+            // setValue('1462433051208761603');
         }, 2000);
         return function () {
             if (timeoutId) {
@@ -65,6 +65,8 @@ function Demo() {
         React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E"),
         React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E\uFF0C\u5E76\u7F13\u5B58\u6570\u636E"),
         React.createElement("h2", null, "\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22"),
-        React.createElement(EnhanceSelect, { style: selectStyle, placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.135:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, dataKey: "id", titleKey: "empName", value: value })));
+        React.createElement(EnhanceSelect, { style: selectStyle, placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.83:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, dataKey: "id", titleKey: "empName", 
+            // value={value}
+            mode: "multiple" })));
 }
 export default Demo;

package/dist/components/EnhanceSelect/index.d.ts

@@ -75,6 +75,10 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
      * 远程搜索Key值
      */
     remoteSearchKey?: string;
+    /**
+     * 远程搜索主键Key值
+     */
+    remoteSearchDataKey?: string;
     /**
      * 接口数据格式转换
      */
@@ -95,6 +99,6 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
  *    { code: 200, data: { records: [] } } || { status: 200, data: { code: 200, data: { records: [] } } }
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
-declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, transformData, joinKey, joinStr, ...restProps }: IProps<VT>): JSX.Element;
+declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, remoteSearchDataKey, transformData, joinKey, joinStr, ...restProps }: IProps<VT>): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof EnhanceSelect>;
 export default _default;

package/dist/components/EnhanceSelect/index.js

@@ -71,12 +71,14 @@ function getData(request, options) {
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
 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, 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", "transformData", "joinKey", "joinStr"]);
+    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) {
@@ -119,7 +121,7 @@ function EnhanceSelect(_a) {
     // 远程搜索
     var getRemoteDataHandle = useCallback(function (value, dataKeyValue) {
         var searchKey = remoteSearchKey ? remoteSearchKey : titleKey;
-        var searchDataKey = dataKey;
+        var searchDataKey = remoteSearchDataKey ? remoteSearchDataKey : dataKey;
         var outParams = params;
         try {
             outParams = JSON.parse(params);
@@ -134,7 +136,7 @@ function EnhanceSelect(_a) {
             searchParams[searchKey] = value;
         }
         if (dataKeyValue) {
-            searchParams[searchDataKey] = dataKeyValue;
+            searchParams[searchDataKey] = dataKeyValue + '';
         }
         getData(request, {
             url: url,
@@ -172,6 +174,7 @@ function EnhanceSelect(_a) {
         method,
         request,
         remoteSearchKey,
+        remoteSearchDataKey,
         titleKey,
         dataKey,
         setSelectList,
@@ -268,8 +271,10 @@ function EnhanceSelect(_a) {
             newData.forEach(function (item) {
                 // 如果源数组中找到了该条数据，那么不添加
                 // 否则添加
-                if (!resultData.find(function (resultItem) { return resultItem[dataKey] === item[dataKey]; })) {
-                    resultData.unshift(item);
+                if (!resultData.find(function (resultItem) {
+                    return resultItem && item && resultItem[dataKey] === item[dataKey];
+                })) {
+                    resultData.push(item);
                 }
             });
         }
@@ -281,7 +286,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];
@@ -309,17 +314,23 @@ function EnhanceSelect(_a) {
     };
     // onChange 方法
     var onChangeHandle = function (value, option) {
-        if (selectList && Array.isArray(selectList)) {
+        var _defaultList = Array.isArray(defaultList) ? defaultList : [];
+        var currentList = concatData(concatData(selectList || [], _defaultList), multipleList || []);
+        if (currentList && Array.isArray(currentList)) {
             var key_1 = dataKey;
             // 支持多选模式
             var currentData = void 0;
             if (Array.isArray(value)) {
                 currentData = value.map(function (valueItem) {
-                    return selectList.find(function (item) { return item[key_1] === valueItem; });
+                    return currentList.find(function (item) { return item[key_1] === valueItem; });
                 });
+                currentData = currentData === null || currentData === void 0 ? void 0 : currentData.filter(function (item) { return item; });
+                if (remoteSearch) {
+                    setMultipleList(currentData);
+                }
             }
             else {
-                currentData = selectList.find(function (item) { return item[key_1] === value; });
+                currentData = currentList.find(function (item) { return item[key_1] === value; });
             }
             onChange && onChange(value, option, currentData);
         }

package/package.json

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