ztxkui 2.6.2 → 2.6.5

package/dist/components/business/SearchContainer/hooks/useDynamic.d.ts

@@ -5,7 +5,14 @@ export interface ISearchLayout {
     show?: boolean;
     disabled?: boolean;
 }
-declare function useDynamic(children: React.ReactNode, isDynamic?: boolean, searchLayout?: ISearchLayout[]): {
+/**
+ * @description 将动态配置存在本地存储中
+ * @param dynamicStorageKey 保留的key值
+ * @param value 值
+ */
+export declare function setDynamicKey(dynamicStorageKey: string, value: any): void;
+declare function useDynamic(children: React.ReactNode, isDynamic?: boolean, // 是否利用动态列配置
+dynamicStorageKey?: string): {
     dynamicArr: ISearchLayout[];
     initDynamicArr: ISearchLayout[];
     newChildren: any;

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

@@ -1,28 +1,60 @@
 import React, { useEffect, useState } from 'react';
-function useDynamic(children, isDynamic, searchLayout) {
+var LOCALSTORAGE_KEY = 'ztui_dynamic_list_key';
+/**
+ * @description 将动态配置存在本地存储中
+ * @param dynamicStorageKey 保留的key值
+ * @param value 值
+ */
+export function setDynamicKey(dynamicStorageKey, value) {
+    var obj = {};
+    try {
+        obj = JSON.parse(localStorage.getItem(LOCALSTORAGE_KEY) || '{}') || {};
+    }
+    catch (err) {
+        console.error(err);
+    }
+    obj[dynamicStorageKey] = value;
+    localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(obj));
+}
+function useDynamic(children, isDynamic, // 是否利用动态列配置
+dynamicStorageKey // 动态列配置的key值
+) {
+    /** 当前传入的组件排列顺序 */
     var _a = useState([]), dynamicArr = _a[0], setDynamicArr = _a[1];
+    /** 初始化顺序，根据传入得组件children元素得到，重置时需要用到它 */
     var _b = useState([]), initDynamicArr = _b[0], setInitDynamicArr = _b[1];
+    /** 组件子元素得拷贝 */
     var _c = useState(null), newChildren = _c[0], setNewChildren = _c[1];
     /**
      * 这里这么做的用处是防止dom发生改变
      */
     useEffect(function () {
-        if (isDynamic) {
-            var myDynamicArr_1 = Array.isArray(searchLayout) && searchLayout.length > 0
-                ? searchLayout
-                : [];
-            var myInitDynamicArr_1 = [];
+        if (isDynamic && dynamicStorageKey) {
+            // 从storage中取到历史数据
+            var dynamicList_1 = [];
+            try {
+                var obj = JSON.parse(localStorage.getItem(LOCALSTORAGE_KEY) || '{}') || {};
+                dynamicList_1 = obj[dynamicStorageKey];
+            }
+            catch (err) {
+                console.log(err);
+            }
+            // 如果默认传入了需要设置的顺序，那么当前顺序取这个
+            var _currentDynamicList_1 = Array.isArray(dynamicList_1) && dynamicList_1.length > 0 ? dynamicList_1 : [];
+            // 初始化的排列顺序
+            var _initDynamicList_1 = [];
+            // 遍历当前子元素
             React.Children.forEach(children, function (item) {
                 if (item === null || item === void 0 ? void 0 : item.props) {
                     var _a = item.props, name_1 = _a.name, label = _a.label, disabled = _a.disabled;
-                    myInitDynamicArr_1.push({
+                    _initDynamicList_1.push({
                         name: name_1,
                         label: label,
                         show: true,
                         disabled: disabled,
                     });
-                    if (!searchLayout || searchLayout.length === 0) {
-                        myDynamicArr_1.push({
+                    if (!dynamicList_1 || dynamicList_1.length === 0) {
+                        _currentDynamicList_1.push({
                             name: name_1,
                             label: label,
                             show: true,
@@ -32,10 +64,10 @@ function useDynamic(children, isDynamic, searchLayout) {
                 }
             });
             setNewChildren(children);
-            setDynamicArr(myDynamicArr_1);
-            setInitDynamicArr(myInitDynamicArr_1);
+            setDynamicArr(_currentDynamicList_1);
+            setInitDynamicArr(_initDynamicList_1);
         }
-    }, [children, searchLayout, isDynamic]);
+    }, [children, dynamicStorageKey, isDynamic]);
     return {
         dynamicArr: dynamicArr,
         initDynamicArr: initDynamicArr,

package/dist/components/business/SearchContainer/search-left.d.ts

@@ -7,6 +7,7 @@ export interface ISearchLayout {
 }
 export interface ISearchLeft {
     isDynamic?: boolean;
+    dynamicStorageKey?: string;
     searchLayout?: ISearchLayout[];
     onChange?: (searchLayout: ISearchLayout[]) => void;
     isFlex?: boolean;

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

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import classNames from 'classnames';
 import SearchDrawer from './search-drawer';
 import { SettingOutlined } from '@ant-design/icons';
-import useDynamic from './hooks/useDynamic';
+import useDynamic, { setDynamicKey } from './hooks/useDynamic';
 function useConfigChildren(children) {
     var _a = useState(null), configChildren = _a[0], setConfigChildren = _a[1];
     useEffect(function () {
@@ -13,9 +13,15 @@ function useConfigChildren(children) {
     return { configChildren: configChildren };
 }
 var SearchLeft = function (_a) {
-    var children = _a.children, className = _a.className, isDynamic = _a.isDynamic, searchLayout = _a.searchLayout, onChange = _a.onChange, _b = _a.isFlex, isFlex = _b === void 0 ? true : _b, configInfo = _a.configInfo;
+    var children = _a.children, className = _a.className, isDynamic = _a.isDynamic, _dynamicStorageKey = _a.dynamicStorageKey, onChange = _a.onChange, _b = _a.isFlex, isFlex = _b === void 0 ? true : _b, configInfo = _a.configInfo;
+    // 为了兼容之前的写法，默认取当前路由地址，但是这种情况会导致微前端下面出现一些问题
+    // 所以在使用组件的时候，如果要使用动态配置，必须传入dynamicStorageKey
+    // 如果有时间还是需要传入storageKey，之前的写法需要简化
+    var dynamicStorageKey = _dynamicStorageKey
+        ? _dynamicStorageKey
+        : window.location.pathname;
     /**缓存初始化值 */
-    var _c = useDynamic(children, isDynamic, searchLayout), dynamicArr = _c.dynamicArr, initDynamicArr = _c.initDynamicArr, newChildren = _c.newChildren;
+    var _c = useDynamic(children, isDynamic, dynamicStorageKey), dynamicArr = _c.dynamicArr, initDynamicArr = _c.initDynamicArr, newChildren = _c.newChildren;
     var configChildren = useConfigChildren(children).configChildren;
     var classes = classNames('zt-search__left', className, {
         'zt-search__left--flex': isFlex,
@@ -34,13 +40,21 @@ var SearchLeft = function (_a) {
     /**重置 */
     var onReset = useCallback(function () {
         setVisible(false);
+        setDynamicList(initDynamicArr);
+        if (dynamicStorageKey) {
+            setDynamicKey(dynamicStorageKey, initDynamicArr);
+        }
         onChange && onChange(initDynamicArr);
-    }, [onChange, initDynamicArr]);
+    }, [onChange, initDynamicArr, dynamicStorageKey]);
     /**确定修改 */
     var onSure = useCallback(function (newList) {
         setVisible(false);
+        setDynamicList(newList);
+        if (dynamicStorageKey) {
+            setDynamicKey(dynamicStorageKey, newList);
+        }
         onChange && onChange(newList);
-    }, [onChange]);
+    }, [onChange, dynamicStorageKey]);
     /**取消修改，回到初始位置 */
     var onClose = useCallback(function () {
         setVisible(false);

package/dist/components/business/SortList/hooks/useSort.js

@@ -2,16 +2,17 @@
  * @description 得到一些初始化数据
  */
 import React, { useState, useEffect } from 'react';
+var LOCALSTORAGE_KEY = 'ztui_sort_list_key';
 export function setSortKey(sortStorageKey, value) {
     var obj = {};
     try {
-        obj = JSON.parse(localStorage.getItem('ztui_sort_list_key') || '{}') || {};
+        obj = JSON.parse(localStorage.getItem(LOCALSTORAGE_KEY) || '{}') || {};
     }
     catch (err) {
         console.error(err);
     }
     obj[sortStorageKey] = value;
-    localStorage.setItem('ztui_sort_list_key', JSON.stringify(obj));
+    localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(obj));
 }
 function useSort(children, sortStorageKey) {
     /** 初始化顺序，根据传入得组件children元素得到，重置时需要用到它 */
@@ -24,7 +25,7 @@ function useSort(children, sortStorageKey) {
         // 从storage中取到历史数据
         var sortList = [];
         try {
-            var obj = JSON.parse(localStorage.getItem('ztui_sort_list_key') || '{}') || {};
+            var obj = JSON.parse(localStorage.getItem(LOCALSTORAGE_KEY) || '{}') || {};
             sortList = obj[sortStorageKey];
         }
         catch (err) {

package/package.json

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