ztxkui 3.8.6 → 3.8.8

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.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoi6ZmI5Lqa6ZuEMTEiLCJlbXBfbmFtZSI6IumZiOS6mumbhDExIiwiZW1wX251bWJlciI6IllHMjIwOTAwMiIsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEMTEiLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQ2ODAzNTM1MTYyNTI4NTYzNCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2ODAzNDQzNzE1Nzk2MTcyOSIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjY0NDQyMjI1LCJvcmdfbmFtZSI6Iua1meWVhuS4reaLk-mbhuWbouiCoeS7veaciemZkOWFrOWPuCIsImp0aSI6ImIwNzQzYzdkLWJjZDgtNDZkMy1hM2JkLWRkYTUzNTdiMWJlNiIsIm1lbWJlcl9pZCI6MTU3Mjg3Mzg4ODM3MDk3MDYyNSwiY29tcGFueV9pZCI6MTI5NTkwODYyNzk4NDY3MDcyMiwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOiLph43luobkuK3mi5Mt5bel56iL5LiA6YOoIiwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbixhZG1pbiIsImF1dGhvcml0aWVzIjpbImFkbWluIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yLGFkbWluIiwicmVzdW1lX3RlbXBsYXRlIjpudWxsLCJsaWNlbnNlIjoicG93ZXJlZCBieSB6bWRtcyIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMTU3Mjg3NDE0MjkyMzI3NjI4OSIsIm9yZ19pZCI6MTQ1NzUyNzc2NTkxODUxNTIwMSwibmlja19uYW1lIjoi6ZmI5Lqa6ZuEMTEiLCJjb21wYW55X25hbWUiOiLmtZnllYbkuK3mi5Ppm4blm6LvvIjph43luobvvInmnInpmZDlhazlj7giLCJkZXB0X2lkIjoiMTI5NTkwOTU5NDU2NjIyMTgyNiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50Ijoi6ZmI5Lqa6ZuEMTEiLCJyZXN1bWVfaWQiOm51bGx9.NHWV_i8yisajX0UKi1Z1_W8EXoHrhf_jPv6TChX3DgI',
+            'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoi546L5aWVIiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi546L5aWVIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQzNDkwNjg2MjYwMjI4MDk3IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTEyMzU5ODgxNjczODY3NTIwMSwxMzQzNDkwNDI1MDAxMjI2MjQyIiwicG9zdF9uYW1lIjpudWxsLCJzY29wZSI6WyJhbGwiXSwiaW50ZXJ2aWV3X2lkIjpudWxsLCJleHAiOjE2NjQ4NjgyODcsIm9yZ19uYW1lIjpudWxsLCJqdGkiOiJkMTU3MGYzNy0zY2JiLTQ0ODgtYTEwMy0wYTkyNDVmZjc5Y2IiLCJtZW1iZXJfaWQiOjEsImNvbXBhbnlfaWQiOm51bGwsInN5c3RlbV9pZCI6bnVsbCwiZGVwdF9uYW1lIjpudWxsLCJhdmF0YXIiOiIiLCJkYXRhX3JvbGVfbmFtZSI6Im51bGwiLCJhdXRob3JpdGllcyI6WyLlhoXli6QiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3Is5YaF5YukIiwicmVzdW1lX3RlbXBsYXRlIjpudWxsLCJsaWNlbnNlIjoicG93ZXJlZCBieSB6bWRtcyIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMTM0NDA5OTIwNjMyODM1Njg2NSIsIm9yZ19pZCI6bnVsbCwibmlja19uYW1lIjoi546L5aWVIiwiY29tcGFueV9uYW1lIjpudWxsLCJkZXB0X2lkIjoiIiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiLnjovlpZUiLCJyZXN1bWVfaWQiOm51bGx9.frYQQIw5WQIJIc_Qf6NLmYV5hZ6OVd6TAfxXrjgWFhY',
         },
         method: options.method,
     }).then(function (response) { return response.json(); });

package/dist/components/EnhanceSelect/index.js

@@ -30,7 +30,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
  * @description 增强下拉框功能
  */
 import React, { useCallback, useEffect, memo, useRef, useState, useMemo, } from 'react';
-import { Select } from 'antd';
+import { Divider, Select } from 'antd';
+import Button from '../Button';
 import { useFetchState } from 'ztxkutils/dist/hooks';
 import debounce from 'lodash/debounce';
 import { dangerouslySetXss } from 'ztxkutils/dist/tools';
@@ -43,6 +44,8 @@ import { dangerouslySetXss } from 'ztxkutils/dist/tools';
  * }
  */
 var enhanceSelectCatchObj = {};
+var enhanceSelectCatchLruKeys = [];
+var enhanceSelectCatchLruMaxSize = 800;
 // 获取接口数据
 function getData(request, options) {
     var _a;
@@ -101,7 +104,9 @@ function textContent(children) {
  */
 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.timeout, timeout = _c === void 0 ? 60000 : _c, _d = _a.dataKey, dataKey = _d === void 0 ? 'id' : _d, componentKey = _a.componentKey, _e = _a.titleKey, titleKey = _e === void 0 ? 'name' : _e, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, onSearch = _a.onSearch, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _f = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _f === void 0 ? true : _f, transformData = _a.transformData, joinKey = _a.joinKey, _g = _a.joinStr, joinStr = _g === void 0 ? '-' : _g, lineFeedKey = _a.lineFeedKey, _h = _a.lineFeedStr, lineFeedStr = _h === void 0 ? '-' : _h, mustHasParams = _a.mustHasParams, disabledValues = _a.disabledValues, searchDeleteKeys = _a.searchDeleteKeys, isHandAddItem = _a.isHandAddItem, isPage = _a.isPage, _j = _a.currentSize, currentSize = _j === void 0 ? 30 : _j, isCopy = _a.isCopy, onBlur = _a.onBlur, onFocus = _a.onFocus, isClickRequest = _a.isClickRequest, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "timeout", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "onSearch", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "mustHasParams", "disabledValues", "searchDeleteKeys", "isHandAddItem", "isPage", "currentSize", "isCopy", "onBlur", "onFocus", "isClickRequest"]);
-    var currentClick = useRef(true);
+    // TODO: 注释动态设置open逻辑 start
+    // const currentClick = useRef<boolean>(true);
+    // TODO: 注释动态设置open逻辑 end
     // 下拉数据源
     var _k = useFetchState([]), selectList = _k[0], setSelectList = _k[1];
     // 手动添加的数据源
@@ -122,8 +127,10 @@ function EnhanceSelect(_a) {
     var _t = useState(1), currentPage = _t[0], setCurrentPage = _t[1];
     // 总条数
     var _u = useState(0), count = _u[0], setCount = _u[1];
-    // 手动清空数据
-    var handleClearDataRef = useRef(false);
+    // TODO: 注释动态设置open逻辑 start
+    // // 手动清空数据
+    // const handleClearDataRef = useRef<boolean>(false);
+    // TODO: 注释动态设置open逻辑 end
     // 是否自动请求
     var isAutoRequest = useRef(false); // 请求过了
     // 处理value
@@ -315,10 +322,12 @@ function EnhanceSelect(_a) {
         // if (value) {
         console.log(value);
         // setIsOpen(true);
-        if (value || handleClearDataRef.current) {
-            setIsOpen(true);
-        }
-        handleClearDataRef.current = false;
+        // TODO: 注释动态设置open逻辑 start
+        // if (value || handleClearDataRef.current) {
+        //   setIsOpen(true);
+        // }
+        // handleClearDataRef.current = false;
+        // TODO: 注释动态设置open逻辑 end
         if (isHandAddItem) {
             if (value) {
                 setHandleAddItems([
@@ -343,10 +352,12 @@ function EnhanceSelect(_a) {
         var _a;
         // console.log(value);
         // setIsOpen(true);
-        if (value || handleClearDataRef.current) {
-            setIsOpen(true);
-        }
-        handleClearDataRef.current = false;
+        // TODO: 注释动态设置open逻辑 start
+        // if (value || handleClearDataRef.current) {
+        //   setIsOpen(true);
+        // }
+        // handleClearDataRef.current = false;
+        // TODO: 注释动态设置open逻辑 end
         if (isHandAddItem) {
             if (value) {
                 setHandleAddItems([
@@ -381,6 +392,23 @@ function EnhanceSelect(_a) {
                 enhanceSelectCatchObj[url] = enhanceSelectCatchObj[url]
                     ? enhanceSelectCatchObj[url]
                     : {};
+                var currentIndex = enhanceSelectCatchLruKeys.indexOf(url);
+                if (currentIndex !== -1) {
+                    enhanceSelectCatchLruKeys.splice(currentIndex, 1);
+                    enhanceSelectCatchLruKeys.push(url);
+                }
+                else {
+                    enhanceSelectCatchLruKeys.push(url);
+                }
+                if (enhanceSelectCatchLruKeys.length > enhanceSelectCatchLruMaxSize) {
+                    var oldKey = enhanceSelectCatchLruKeys.shift();
+                    try {
+                        delete enhanceSelectCatchLruKeys[oldKey];
+                    }
+                    catch (err) {
+                        //
+                    }
+                }
                 var catchData = enhanceSelectCatchObj[url];
                 var catchDataKey = params ? JSON.stringify(params) : 'single';
                 if (!catchData[catchDataKey]) {
@@ -412,6 +440,52 @@ function EnhanceSelect(_a) {
         url,
         remoteSearch,
     ]);
+    var sendRequestNoCatch = function () {
+        if (!url || remoteSearch) {
+            return;
+        }
+        if (isCatch) {
+            if (enhanceSelectCatchObj) {
+                enhanceSelectCatchObj[url] = enhanceSelectCatchObj[url]
+                    ? enhanceSelectCatchObj[url]
+                    : {};
+                var currentIndex = enhanceSelectCatchLruKeys.indexOf(url);
+                if (currentIndex !== -1) {
+                    enhanceSelectCatchLruKeys.splice(currentIndex, 1);
+                    enhanceSelectCatchLruKeys.push(url);
+                }
+                else {
+                    enhanceSelectCatchLruKeys.push(url);
+                }
+                if (enhanceSelectCatchLruKeys.length > enhanceSelectCatchLruMaxSize) {
+                    var oldKey = enhanceSelectCatchLruKeys.shift();
+                    try {
+                        delete enhanceSelectCatchLruKeys[oldKey];
+                    }
+                    catch (err) {
+                        //
+                    }
+                }
+                var catchData = enhanceSelectCatchObj[url];
+                var catchDataKey = params ? JSON.stringify(params) : 'single';
+                // 发送接口请求，并设置缓存数据
+                getDataHandle(request, { url: url, params: params, method: method, timeout: timeout }, {
+                    appointObj: {
+                        obj: catchData,
+                        key: catchDataKey,
+                    },
+                });
+            }
+        }
+        else {
+            getDataHandle(request, {
+                url: url,
+                params: params,
+                method: method,
+                timeout: timeout,
+            });
+        }
+    };
     useEffect(function () {
         if (!url || remoteSearch) {
             return;
@@ -423,6 +497,24 @@ function EnhanceSelect(_a) {
                 enhanceSelectCatchObj[url] = enhanceSelectCatchObj[url]
                     ? enhanceSelectCatchObj[url]
                     : {};
+                var currentIndex = enhanceSelectCatchLruKeys.indexOf(url);
+                // 当前访问数据置为最新鲜
+                if (currentIndex !== -1) {
+                    enhanceSelectCatchLruKeys.splice(currentIndex, 1);
+                    enhanceSelectCatchLruKeys.push(url);
+                }
+                else {
+                    enhanceSelectCatchLruKeys.push(url);
+                }
+                if (enhanceSelectCatchLruKeys.length > enhanceSelectCatchLruMaxSize) {
+                    var oldKey = enhanceSelectCatchLruKeys.shift();
+                    try {
+                        delete enhanceSelectCatchLruKeys[oldKey];
+                    }
+                    catch (err) {
+                        //
+                    }
+                }
                 var catchData = enhanceSelectCatchObj[url];
                 var catchDataKey = params ? JSON.stringify(params) : 'single';
                 if (catchData[catchDataKey]) {
@@ -700,12 +792,13 @@ function EnhanceSelect(_a) {
     };
     // onChange 方法
     var onChangeHandle = function (value, option) {
-        if ((Array.isArray(value) && value.length === 0) || !value) {
-            currentClick.current = true;
-        }
-        else {
-            currentClick.current = false;
-        }
+        // TODO: 注释动态设置open逻辑 start
+        // if ((Array.isArray(value) && value.length === 0) || !value) {
+        //   currentClick.current = true;
+        // } else {
+        //   currentClick.current = false;
+        // }
+        // TODO: 注释动态设置open逻辑 end
         setFirstLoading(true);
         if (((Array.isArray(value) && value.length === 0) || !value) &&
             remoteSearch &&
@@ -787,20 +880,26 @@ function EnhanceSelect(_a) {
     var onFocusHandle = function (e) {
         console.log('焦点事件');
         setIsOpen(true);
-        currentClick.current = false;
+        // TODO: 注释动态设置open逻辑 start
+        // currentClick.current = false;
+        // TODO: 注释动态设置open逻辑 end
         onFocus && onFocus(e);
     };
     var onBlurHandle = function (e) {
-        console.log('失去焦点事件');
-        setIsOpen(false);
-        currentClick.current = false;
+        // TODO: 注释动态设置open逻辑 start
+        // console.log('失去焦点事件');
+        // setIsOpen(false);
+        // currentClick.current = false;
+        // TODO: 注释动态设置open逻辑 end
         onBlur && onBlur(e);
     };
     // 清空数据时
     var onClearHandle = function () {
         // console.log('清空数据事件');
-        handleClearDataRef.current = true;
-        setIsOpen(false);
+        // TODO: 注释动态设置open逻辑 start
+        // handleClearDataRef.current = true;
+        // setIsOpen(false);
+        // TODO: 注释动态设置open逻辑 end
     };
     // 选中时
     var onSelectHandle = function (value, obj) {
@@ -815,9 +914,11 @@ function EnhanceSelect(_a) {
             document === null || document === void 0 ? void 0 : document.execCommand('copy');
             document.body.removeChild(textarea);
         }
-        if (!restProps.mode) {
-            setIsOpen(false);
-        }
+        // TODO: 注释动态设置open逻辑 start
+        // if (!restProps.mode) {
+        //   setIsOpen(false);
+        // }
+        // TODO: 注释动态设置open逻辑 end
     };
     // 点击时
     var onClickHandle = function (e) {
@@ -828,24 +929,24 @@ function EnhanceSelect(_a) {
             sendRemoteRequest();
             sendRemoteRequest1();
         }
-        if (currentClick.current) {
-            console.log(e.nativeEvent.target.getAttribute('class'));
-            var className = '';
-            try {
-                className = e.nativeEvent.target.getAttribute('class');
-            }
-            catch (err) {
-                console.log(err);
-            }
-            var bool = className.indexOf('rc-virtual-list') === -1;
-            if (isOpen && bool) {
-                setIsOpen(false);
-            }
-            else {
-                setIsOpen(true);
-            }
-        }
-        currentClick.current = true;
+        // TODO: 注释动态设置open逻辑 start
+        // if (currentClick.current) {
+        //   console.log(e.nativeEvent.target.getAttribute('class'));
+        //   let className = '';
+        //   try {
+        //     className = e.nativeEvent.target.getAttribute('class');
+        //   } catch (err) {
+        //     console.log(err);
+        //   }
+        //   const bool = className.indexOf('rc-virtual-list') === -1;
+        //   if (isOpen && bool) {
+        //     setIsOpen(false);
+        //   } else {
+        //     setIsOpen(true);
+        //   }
+        // }
+        // currentClick.current = true;
+        // TODO: 注释动态设置open逻辑 end
     };
     // 滚动加载
     var onPopupScrollHandle = function (e) {
@@ -862,7 +963,24 @@ function EnhanceSelect(_a) {
     };
     return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : onSearchHandleInner, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle, 
         // getPopupContainer={(trigger) => trigger || document.body}
-        open: isOpen, onPopupScroll: onPopupScrollHandle }, restProps, { value: newValue, 
+        open: isOpen, onDropdownVisibleChange: function (visible) { return setIsOpen(visible); }, onPopupScroll: onPopupScrollHandle, dropdownRender: url && !remoteSearch && isCatch
+            ? function (menu) { return (React.createElement(React.Fragment, null,
+                menu,
+                React.createElement(Divider, { style: { marginTop: 0, marginBottom: '4px' } }),
+                React.createElement("div", { style: {
+                        display: 'flex',
+                        alignItems: 'center',
+                        flexDirection: 'row',
+                        justifyContent: 'space-between',
+                        padding: '0 6px',
+                    } },
+                    React.createElement("span", null),
+                    React.createElement(Button, { onClick: function (e) {
+                            console.log(e);
+                            e.preventDefault();
+                            sendRequestNoCatch();
+                        } }, "\u5237\u65B0\u6570\u636E")))); }
+            : undefined }, restProps, { value: newValue, 
         // 这里需要注释掉，因为修改了一部分逻辑
         disabled: remoteSearch || isClickRequest
             ? restProps.disabled

package/package.json

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