ztxkui 4.2.5 → 4.2.6

package/dist/DemoCom/FormDemo.js

@@ -47,6 +47,15 @@ var configInfo = {
         isDisplay: 1,
     },
 };
+var getCustomDom = function () {
+    return (React.createElement(React.Fragment, { key: "search-form-fragment-id" },
+        React.createElement(SearchItem, { name: "type7", width: "half", label: "\u4F60\u597D7" },
+            React.createElement(Select, null)),
+        React.createElement(SearchItem, { name: "type8", width: "half", label: "\u4F60\u597D811" },
+            React.createElement(Select, null)),
+        React.createElement(SearchItem, { name: "type5", width: "all", label: "\u4F60\u597D" },
+            React.createElement(Input.TextArea, { showCount: true, rows: 3, handleSize: true }))));
+};
 var FormDemo = function () {
     var form = Form.useForm()[0];
     var _a = useState('1'), status = _a[0], setStatus = _a[1];
@@ -57,15 +66,6 @@ var FormDemo = function () {
         return __assign(__assign({}, configInfo), { startTime: __assign(__assign({}, configInfo === null || configInfo === void 0 ? void 0 : configInfo.startTime), { isDisplay: status === '1' ? true : false }) });
     }, [status]);
     var handleRef = useRef(null);
-    var getDom = function () {
-        return (React.createElement(React.Fragment, { key: "search-form-fragment-id" },
-            React.createElement(SearchItem, { name: "type7", width: "half", label: "\u4F60\u597D7" },
-                React.createElement(Select, null)),
-            React.createElement(SearchItem, { name: "type8", width: "half", label: "\u4F60\u597D811" },
-                React.createElement(Select, null)),
-            React.createElement(SearchItem, { name: "type5", width: "all", label: "\u4F60\u597D" },
-                React.createElement(Input.TextArea, { showCount: true, rows: 3, handleSize: true }))));
-    };
     return (React.createElement(React.Fragment, null,
         React.createElement(Form, { name: "test-list", form: form },
             React.createElement(SearchContainer, { dark: true },
@@ -130,7 +130,7 @@ var FormDemo = function () {
                         React.createElement(Select, null)),
                     React.createElement(SearchItem, { name: "type6", width: "half", label: "\u4F60\u597D6" },
                         React.createElement(Select, null)),
-                    getDom()),
+                    getCustomDom()),
                 React.createElement(SearchRight, { onSearchHandle: function () {
                         var _a;
                         (_a = handleRef.current) === null || _a === void 0 ? void 0 : _a.setToggleHandle(false);

package/dist/components/EnhanceSelect/index.js

@@ -46,6 +46,44 @@ import { dangerouslySetXss } from 'ztxkutils/dist/tools';
 var enhanceSelectCatchObj = {};
 var enhanceSelectCatchLruKeys = [];
 var enhanceSelectCatchLruMaxSize = 800;
+// LRU缓存清除逻辑
+var enhanceSelectCatchLruHandle = function (url) {
+    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 keys = enhanceSelectCatchObj[url]
+            ? Object.keys(enhanceSelectCatchObj[url])
+            : [];
+        if (keys.length > 10) {
+            keys.slice(0, keys.length - 10).forEach(function (key) {
+                try {
+                    delete enhanceSelectCatchObj[url][key];
+                }
+                catch (err) {
+                    //
+                }
+            });
+        }
+    }
+};
 export function clearCatchData(url) {
     enhanceSelectCatchObj[url] = {};
 }
@@ -436,27 +474,8 @@ function EnhanceSelect(_a) {
             return;
         }
         if (isCatch) {
+            enhanceSelectCatchLruHandle(url);
             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';
                 if (!catchData[catchDataKey]) {
@@ -493,27 +512,8 @@ function EnhanceSelect(_a) {
             return;
         }
         if (isCatch) {
+            enhanceSelectCatchLruHandle(url);
             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';
                 // 发送接口请求，并设置缓存数据
@@ -541,28 +541,8 @@ function EnhanceSelect(_a) {
         // console.log('TEST: 异步获取');
         if (isCatch) {
             // 如果是走缓存的话，那么先往缓存数据中取，有没有当前数据，如果没有就发请求
+            enhanceSelectCatchLruHandle(url);
             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';
                 if (catchData[catchDataKey]) {

package/dist/components/business/SearchContainer/hooks/useDynamic.js

@@ -69,7 +69,7 @@ export function getNewChildren(children) {
     React.Children.forEach(children, function (item) {
         var _a;
         // 这个需要拉平这个数据
-        if (item.key === 'search-form-fragment-id' &&
+        if ((item === null || item === void 0 ? void 0 : item.key) === 'search-form-fragment-id' &&
             (item === null || item === void 0 ? void 0 : item.props) &&
             Array.isArray((_a = item === null || item === void 0 ? void 0 : item.props) === null || _a === void 0 ? void 0 : _a.children)) {
             React.Children.forEach(item === null || item === void 0 ? void 0 : item.props.children, function (item) {
@@ -193,7 +193,7 @@ dynamicStorageKey // 动态列配置的key值
             React.Children.forEach(children, function (item) {
                 var _a;
                 // 这个需要拉平这个数据
-                if (item.key === 'search-form-fragment-id' &&
+                if ((item === null || item === void 0 ? void 0 : item.key) === 'search-form-fragment-id' &&
                     (item === null || item === void 0 ? void 0 : item.props) &&
                     Array.isArray((_a = item === null || item === void 0 ? void 0 : item.props) === null || _a === void 0 ? void 0 : _a.children)) {
                     React.Children.forEach(item === null || item === void 0 ? void 0 : item.props.children, function (item) {
@@ -223,6 +223,7 @@ dynamicStorageKey // 动态列配置的key值
             });
             // console.log(_initDynamicList, _currentDynamicList);
             setNewChildren(getNewChildren(children));
+            // setNewChildren(children);
             setDynamicArr(_currentDynamicList_1);
             setInitDynamicArr(_initDynamicList_1);
         }

package/dist/components/business/SearchContainer/search-left.js

@@ -4,14 +4,18 @@ import SearchDrawer from './search-drawer';
 import { SettingOutlined, DownOutlined } from '@ant-design/icons';
 import useDynamic, { setDynamicKey, getNewChildren } from './hooks/useDynamic';
 import useToggle from './hooks/useToggle';
-function useConfigChildren(children) {
+function useConfigChildren(children, isDynamic) {
     var _a = useState(null), configChildren = _a[0], setConfigChildren = _a[1];
     useEffect(function () {
         if (children) {
-            // setConfigChildren(children);
-            setConfigChildren(getNewChildren(children));
+            if (isDynamic) {
+                setConfigChildren(getNewChildren(children));
+            }
+            else {
+                setConfigChildren(children);
+            }
         }
-    }, [children]);
+    }, [children, isDynamic]);
     return { configChildren: configChildren };
 }
 var SearchLeft = function (_a) {
@@ -24,7 +28,7 @@ var SearchLeft = function (_a) {
         : window.location.pathname;
     /**缓存初始化值 */
     var _c = useDynamic(children, isDynamic, dynamicStorageKey), dynamicArr = _c.dynamicArr, initDynamicArr = _c.initDynamicArr, newChildren = _c.newChildren;
-    var configChildren = useConfigChildren(children).configChildren;
+    var configChildren = useConfigChildren(children, isDynamic).configChildren;
     var classes = classNames('zt-search__left', className, {
         'zt-search__left--flex': isFlex,
         'zt-search__left--dynamic': isDynamic,

package/dist/components/business/Signatures/index.js

@@ -579,6 +579,7 @@ var Sinatures = function (_a) {
                                                 setRecords(function (preRecords) {
                                                     return getNewRecord_1(preRecords);
                                                 });
+                                                setContractId(null);
                                                 message.success('文件删除成功！');
                                             }
                                             else {

package/package.json

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