ztxkui 2.6.3 → 2.6.6

package/dist/components/EnhanceSelect/index.js

@@ -24,7 +24,7 @@ var __rest = (this && this.__rest) || function (s, e) {
  * @author cyx
  * @description 增强下拉框功能
  */
-import React, { useCallback, useEffect, memo, useRef } from 'react';
+import React, { useCallback, useEffect, memo, useRef, useState } from 'react';
 import { Select } from 'antd';
 import { useFetchState } from 'ztxkutils/dist/hooks';
 import debounce from 'lodash/debounce';
@@ -87,6 +87,8 @@ function EnhanceSelect(_a) {
     var _l = useFetchState(false), firstLoading = _l[0], setFirstLoading = _l[1];
     // 第一次清空时，才做远程查询
     var _m = useFetchState(false), firstClearData = _m[0], setFirstClearData = _m[1];
+    // 获得焦点选中
+    var _o = useState(false), isOpen = _o[0], setIsOpen = _o[1];
     // 如果selectList 发生改变，那么触发onCompleted事件
     useEffect(function () {
         if (Array.isArray(selectList) && onCompleted) {
@@ -444,6 +446,13 @@ function EnhanceSelect(_a) {
             onChange && onChange(value, option);
         }
     };
-    return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : undefined, onChange: onChangeHandle, optionLabelProp: "title", loading: loading }, restProps, { disabled: remoteSearch ? restProps.disabled : loading || restProps.disabled }), renderSelectOption()));
+    // 焦点事件
+    var onFocusHandle = function () {
+        setIsOpen(true);
+    };
+    var onBlurHandle = function () {
+        setIsOpen(false);
+    };
+    return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : undefined, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onBlur: onBlurHandle, open: isOpen }, restProps, { disabled: remoteSearch ? restProps.disabled : loading || restProps.disabled }), renderSelectOption()));
 }
 export default memo(EnhanceSelect);

package/dist/components/Select/select.js

@@ -20,11 +20,20 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React from 'react';
+import React, { useState } from 'react';
 import { Select as AntSelect } from 'antd';
 function Select(props) {
     var children = props.children, restProps = __rest(props, ["children"]);
-    return React.createElement(AntSelect, __assign({}, restProps), children);
+    // 获得焦点选中
+    var _a = useState(false), isOpen = _a[0], setIsOpen = _a[1];
+    // 焦点事件
+    var onFocusHandle = function () {
+        setIsOpen(true);
+    };
+    var onBlurHandle = function () {
+        setIsOpen(false);
+    };
+    return (React.createElement(AntSelect, __assign({ onFocus: onFocusHandle, onBlur: onBlurHandle, open: isOpen }, restProps), children));
 }
 Select.Option = AntSelect.Option;
 Select.OptGroup = AntSelect.OptGroup;

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

@@ -11,6 +11,10 @@ export interface ISearchLayout {
  * @param value 值
  */
 export declare function setDynamicKey(dynamicStorageKey: string, value: any): void;
+/**
+ * @description 比对方法，获取最终数据
+ */
+export declare function getSearchParams(storageKey: string, params: any, otherKeys: any): any;
 declare function useDynamic(children: React.ReactNode, isDynamic?: boolean, // 是否利用动态列配置
 dynamicStorageKey?: string): {
     dynamicArr: ISearchLayout[];

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

@@ -1,4 +1,16 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import React, { useEffect, useState } from 'react';
+var LOCALSTORAGE_KEY = 'ztui_dynamic_list_key';
 /**
  * @description 将动态配置存在本地存储中
  * @param dynamicStorageKey 保留的key值
@@ -7,13 +19,54 @@ import React, { useEffect, useState } from 'react';
 export function setDynamicKey(dynamicStorageKey, 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[dynamicStorageKey] = value;
-    localStorage.setItem('ztui_sort_list_key', JSON.stringify(obj));
+    localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(obj));
+}
+/**
+ * @description 比对方法，获取最终数据
+ */
+export function getSearchParams(storageKey, params, otherKeys) {
+    var obj = {};
+    try {
+        obj = JSON.parse(localStorage.getItem(LOCALSTORAGE_KEY) || '{}') || {};
+    }
+    catch (err) {
+        console.error(err);
+    }
+    var config = obj[storageKey] || [];
+    var resultParams = __assign({}, params);
+    if (Array.isArray(config) && config.length > 0) {
+        for (var i = 0; i < config.length; i++) {
+            var _a = config[i] || {}, name_1 = _a.name, show = _a.show;
+            // 如果这个key存在，那么不用处理
+            if (show) {
+                break;
+            }
+            // 如果不展示当前key
+            // 如果key在源数据中，直接删除
+            if (resultParams.hasOwnProperty(name_1)) {
+                Reflect.deleteProperty(resultParams, name_1);
+            }
+            else if (otherKeys.hasOwnProperty(name_1)) {
+                // 如果key不在源数据中，找到该key对应的keys
+                var keys = otherKeys[name_1];
+                if (Array.isArray(keys)) {
+                    keys.forEach(function (key) {
+                        Reflect.deleteProperty(resultParams, key);
+                    });
+                }
+                else {
+                    Reflect.deleteProperty(resultParams, keys);
+                }
+            }
+        }
+    }
+    return resultParams;
 }
 function useDynamic(children, isDynamic, // 是否利用动态列配置
 dynamicStorageKey // 动态列配置的key值
@@ -32,8 +85,7 @@ dynamicStorageKey // 动态列配置的key值
             // 从storage中取到历史数据
             var dynamicList_1 = [];
             try {
-                var obj = JSON.parse(localStorage.getItem('ztui_dynamic_list_key') || '{}') ||
-                    {};
+                var obj = JSON.parse(localStorage.getItem(LOCALSTORAGE_KEY) || '{}') || {};
                 dynamicList_1 = obj[dynamicStorageKey];
             }
             catch (err) {
@@ -46,16 +98,16 @@ dynamicStorageKey // 动态列配置的key值
             // 遍历当前子元素
             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;
+                    var _a = item.props, name_2 = _a.name, label = _a.label, disabled = _a.disabled;
                     _initDynamicList_1.push({
-                        name: name_1,
+                        name: name_2,
                         label: label,
                         show: true,
                         disabled: disabled,
                     });
                     if (!dynamicList_1 || dynamicList_1.length === 0) {
                         _currentDynamicList_1.push({
-                            name: name_1,
+                            name: name_2,
                             label: label,
                             show: true,
                             disabled: disabled,

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

@@ -13,7 +13,13 @@ function useConfigChildren(children) {
     return { configChildren: configChildren };
 }
 var SearchLeft = function (_a) {
-    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;
+    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, dynamicStorageKey), dynamicArr = _c.dynamicArr, initDynamicArr = _c.initDynamicArr, newChildren = _c.newChildren;
     var configChildren = useConfigChildren(children).configChildren;

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/dist/components/utils/index.d.ts

@@ -0,0 +1,2 @@
+import { getSearchParams } from '../business/SearchContainer/hooks/useDynamic';
+export { getSearchParams };

package/dist/components/utils/index.js

@@ -0,0 +1,2 @@
+import { getSearchParams } from '../business/SearchContainer/hooks/useDynamic';
+export { getSearchParams };

package/package.json

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