zmdms-webui 2.7.4 → 2.7.6

package/dist/es/config/ZtxkContext.d.ts

@@ -31,7 +31,7 @@ interface IZtxkConfig {
      */
     customConfigFetch?: (data: any) => Promise<any>;
     /**
-     * 表单是否开启常用搜索功能
+     * 表单是否默认开启常用搜索功能。
      */
     enableCommonSearch?: boolean;
 }

package/dist/es/config/ZtxkContext.js

@@ -7,9 +7,6 @@ var ztxkConfig = {
     noPermission: "display",
     editTableInputMode: "div",
     customConfigFetch: undefined,
-    /**
-     * 表单是否开启常用搜索功能
-     */
     enableCommonSearch: false,
 };
 var ZtxkContext = React__default.createContext(ztxkConfig);

package/dist/es/dynamicsetting/hooks.js

@@ -1,13 +1,17 @@
 import { useState, useCallback } from 'react';
 import { getSetDynamicKey } from './useDynamic.js';
+import '../config/ZtxkContext.js';
+import useBaseContext from '../config/useBaseContext.js';
+import '../config/MyStorage.js';
 
 function useDrawer(currentDynamicList, setCurrentDynamicList, dynamicKey, parentDynamicKey, setTempDynamicList, list, onCurrentListChange) {
     // 控制抽屉显示隐藏
     var _a = useState(false), visible = _a[0], setVisible = _a[1];
+    var customConfigFetch = useBaseContext().customConfigFetch;
     // 设置缓存数据的方法
     var setDynamicKey = useCallback(function () {
-        return getSetDynamicKey(parentDynamicKey, "".concat(parentDynamicKey, "_lru_key"));
-    }, [parentDynamicKey]);
+        return getSetDynamicKey(parentDynamicKey, "".concat(parentDynamicKey, "_lru_key"), customConfigFetch);
+    }, [parentDynamicKey, customConfigFetch]);
     // 关闭
     var onClose = useCallback(function () {
         setVisible(false);

package/dist/es/dynamicsetting/useDynamic.js

@@ -143,7 +143,7 @@ function getCurrentDynamicItems(dynamicKey, parentDynamicKey, list) {
  * @param dynamicStorageKey 保留的key值
  * @param value 值
  */
-function getSetDynamicKey(LOCALSTORAGE_KEY, LOCALSTORAGE_LRU_KEY) {
+function getSetDynamicKey(LOCALSTORAGE_KEY, LOCALSTORAGE_LRU_KEY, customConfigFetch) {
     return function (dynamicStorageKey, value) {
         var obj = {};
         var lruKeys = [];
@@ -184,8 +184,26 @@ function getSetDynamicKey(LOCALSTORAGE_KEY, LOCALSTORAGE_LRU_KEY) {
             }
         }
         obj[dynamicStorageKey] = value;
-        localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(obj));
-        localStorage.setItem(LOCALSTORAGE_LRU_KEY, JSON.stringify(lruKeys));
+        var data = JSON.stringify(obj);
+        var lruData = JSON.stringify(lruKeys);
+        localStorage.setItem(LOCALSTORAGE_KEY, data);
+        localStorage.setItem(LOCALSTORAGE_LRU_KEY, lruData);
+        // 持久化存储
+        try {
+            customConfigFetch === null || customConfigFetch === void 0 ? void 0 : customConfigFetch({
+                customKey: LOCALSTORAGE_KEY,
+                customValue: data,
+                mark: "表单动态列配置缓存数据-新版组件库",
+            });
+            customConfigFetch === null || customConfigFetch === void 0 ? void 0 : customConfigFetch({
+                customKey: LOCALSTORAGE_LRU_KEY,
+                customValue: lruData,
+                mark: "表单动态列配置缓存LRUKey数据-新版组件库",
+            });
+        }
+        catch (err) {
+            console.error("\u8BBE\u7F6E\u52A8\u6001\u5217\u7F13\u5B58\u6570\u636E\u5931\u8D25!", err);
+        }
     };
 }
 /**

package/dist/es/form/form.js

@@ -27,26 +27,32 @@ var FormContext = createContext({});
 // 用户配置优先，先从远端获取到 表单配置信息。
 // 给子元素设置好了表单配置信息后 接下来的内容 交给动态列配置接管
 var Form = function (props, ref) {
-    var form = props.form, bottomBorder = props.bottomBorder, _a = props.isFlex, isFlex = _a === void 0 ? true : _a, wrapClassName = props.wrapClassName, leftClassName = props.leftClassName; props.itemClassName; var rightWrapVisible = props.rightWrapVisible, rightClassName = props.rightClassName, children = props.children, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, formPreferences = props.formPreferences, items = props.items, outsideState = props.outsideState, onValuesChange = props.onValuesChange, isResetAndClear = props.isResetAndClear, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, type = props.type, directionColumn = props.directionColumn, isToggle = props.isToggle, toggleNum = props.toggleNum, defaultToggle = props.defaultToggle, _b = props.isCommonSearch, isCommonSearch = _b === void 0 ? true : _b, restProps = __rest(props, ["form", "bottomBorder", "isFlex", "wrapClassName", "leftClassName", "itemClassName", "rightWrapVisible", "rightClassName", "children", "dynamicKey", "dynamicVersion", "formPreferences", "items", "outsideState", "onValuesChange", "isResetAndClear", "onResetHandle", "onSearchHandle", "type", "directionColumn", "isToggle", "toggleNum", "defaultToggle", "isCommonSearch"]);
+    var form = props.form, bottomBorder = props.bottomBorder, _a = props.isFlex, isFlex = _a === void 0 ? true : _a, wrapClassName = props.wrapClassName, leftClassName = props.leftClassName; props.itemClassName; var rightWrapVisible = props.rightWrapVisible, rightClassName = props.rightClassName, children = props.children, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, formPreferences = props.formPreferences, items = props.items, outsideState = props.outsideState, onValuesChange = props.onValuesChange, isResetAndClear = props.isResetAndClear, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, type = props.type, directionColumn = props.directionColumn, isToggle = props.isToggle, toggleNum = props.toggleNum, defaultToggle = props.defaultToggle, isCommonSearch = props.isCommonSearch, restProps = __rest(props, ["form", "bottomBorder", "isFlex", "wrapClassName", "leftClassName", "itemClassName", "rightWrapVisible", "rightClassName", "children", "dynamicKey", "dynamicVersion", "formPreferences", "items", "outsideState", "onValuesChange", "isResetAndClear", "onResetHandle", "onSearchHandle", "type", "directionColumn", "isToggle", "toggleNum", "defaultToggle", "isCommonSearch"]);
     var enableCommonSearch = useBaseContext().enableCommonSearch;
+    // 是否开启常用搜索
+    // 如果全局开启了默认添加，那么只要没有单独配置关闭，都认为需要打开
+    var isCommonSearchEnabled = rightWrapVisible &&
+        (enableCommonSearch ? isCommonSearch !== false : !!isCommonSearch);
     // 常用搜索hooks
-    var _c = useCommonSearch({
+    var _b = useCommonSearch({
         commonSearchKey: dynamicKey || window.location.pathname,
-    }), commonSearchList = _c.commonSearchList, setCommonSearchList = _c.setCommonSearchList, currentCommonSearchKey = _c.currentCommonSearchKey, setCurrentCommonSearchKey = _c.setCurrentCommonSearchKey, setData = _c.setData, deleteData = _c.deleteData, setReplaceData = _c.setReplaceData, reTransformData = _c.reTransformData, updateServerData = _c.updateServerData;
+        isCommonSearchEnabled: isCommonSearchEnabled,
+    }), commonSearchList = _b.commonSearchList, setCommonSearchList = _b.setCommonSearchList, currentCommonSearchKey = _b.currentCommonSearchKey, setCurrentCommonSearchKey = _b.setCurrentCommonSearchKey, setData = _b.setData, deleteData = _b.deleteData, setReplaceData = _b.setReplaceData, reTransformData = _b.reTransformData, updateServerData = _b.updateServerData;
     var onCommonSearchHandle = useCommonSearchModal({
         commonSearchList: commonSearchList,
         currentCommonSearchKey: currentCommonSearchKey,
         form: form,
         setData: setData,
+        isCommonSearchEnabled: isCommonSearchEnabled,
     }).onCommonSearchHandle;
     // 获取新的items 如果传入了配置项的话，配置项优先
     var configInfoItems = useFormPreferencesCreateNewItems(formPreferences, items).configInfoItems;
     // 根据items 和 dynamicKey 获取到动态列配置信息
-    var _d = useDynamicListByItems(configInfoItems, {
+    var _c = useDynamicListByItems(configInfoItems, {
         dynamicKey: dynamicKey,
         formPreferences: formPreferences,
         dynamicVersion: dynamicVersion,
-    }), dynamicList = _d.dynamicList, onCurrentListChange = _d.onCurrentListChange, newItems = _d.newItems, dynamicSettingRef = _d.dynamicSettingRef;
+    }), dynamicList = _c.dynamicList, onCurrentListChange = _c.onCurrentListChange, newItems = _c.newItems, dynamicSettingRef = _c.dynamicSettingRef;
     // 主容器类名
     var wrapClasses = classNames("ztxk-form", wrapClassName, {
         "ztxk-form--bottom-border": bottomBorder,
@@ -118,22 +124,22 @@ var Form = function (props, ref) {
         }
         onValuesChange && onValuesChange(changedValues, allValues);
     }, [onValuesChange, itemsShouldUpdate, form]);
-    var _e = useBtnHandle(form, {
+    var _d = useBtnHandle(form, {
         onSearchHandle: onSearchHandle,
         onResetHandle: onResetHandle,
-    }), onSearchHandleInner = _e.onSearchHandleInner, onResetHandleInner = _e.onResetHandleInner, onDropdownResetHandleInner = _e.onDropdownResetHandleInner;
+    }), onSearchHandleInner = _d.onSearchHandleInner, onResetHandleInner = _d.onResetHandleInner, onDropdownResetHandleInner = _d.onDropdownResetHandleInner;
     var leftWrapRef = useRef(null);
-    var _f = useToggle(leftWrapRef, {
+    var _e = useToggle(leftWrapRef, {
         isToggle: isToggle,
         toggleNum: toggleNum,
         defaultToggle: defaultToggle,
-    }), toggle = _f.toggle, onToggleChange = _f.onToggleChange, setToggleHandle = _f.setToggleHandle;
+    }), toggle = _e.toggle, onToggleChange = _e.onToggleChange, setToggleHandle = _e.setToggleHandle;
     useImperativeHandle(ref, function () {
         return {
             setToggleHandle: setToggleHandle,
         };
     });
-    return (jsxs(FormContext.Provider, __assign({ value: { onSearch: onSearchHandleInner } }, { children: [jsxs(Form$1, __assign({ form: form, onValuesChange: onValuesChangeHandle }, restProps, { className: wrapClasses }, { children: [jsx("div", __assign({ className: leftClasses, ref: leftWrapRef }, { children: items ? (jsx(FormItems, { items: dynamicKey ? newItems : configInfoItems, outsideState: outsideState })) : (children) })), jsxs("div", __assign({ className: "ztxk-form--operation" }, { children: [dynamicKey ? (jsx(DynamicSetting, { dynamicKey: dynamicKey, parentDynamicKey: FORM_DYNAMIC_KEY, defaultList: dynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef })) : null, isToggle ? (jsx(Toggle, { toggle: toggle, onClick: onToggleChange })) : null] })), rightWrapVisible ? (jsxs("div", __assign({ className: rightClasses }, { children: [jsxs("div", __assign({ className: "ztxk-form__right--common-left" }, { children: [isResetAndClear ? (jsx(ResetButton, { onClick: onDropdownResetHandleInner })) : (jsx(ButtonCom, __assign({ type: "default", onClick: onResetHandleInner }, { children: "\u91CD\u7F6E" }))), jsx(ButtonCom, __assign({ type: "primary", onClick: onSearchHandleInner }, { children: "\u67E5\u8BE2" }))] })), enableCommonSearch && isCommonSearch ? (jsx("div", __assign({ className: "ztxk-form__right--common-right" }, { children: jsx(ButtonCom, __assign({ style: { width: "100%" }, onClick: onCommonSearchHandle }, { children: currentCommonSearchKey ? "更新常用搜索" : "保存为常用搜索" })) }))) : null] }))) : null] })), enableCommonSearch && isCommonSearch && rightWrapVisible ? (jsx(CommonSearchList, { commonSearchList: commonSearchList, setCommonSearchList: setCommonSearchList, currentCommonSearchKey: currentCommonSearchKey, setCurrentCommonSearchKey: setCurrentCommonSearchKey, form: form, reTransformData: reTransformData, deleteData: deleteData, setReplaceData: setReplaceData, updateServerData: updateServerData, onSearchHandle: onSearchHandleInner })) : null] })));
+    return (jsxs(FormContext.Provider, __assign({ value: { onSearch: onSearchHandleInner } }, { children: [jsxs(Form$1, __assign({ form: form, onValuesChange: onValuesChangeHandle }, restProps, { className: wrapClasses }, { children: [jsx("div", __assign({ className: leftClasses, ref: leftWrapRef }, { children: items ? (jsx(FormItems, { items: dynamicKey ? newItems : configInfoItems, outsideState: outsideState })) : (children) })), jsxs("div", __assign({ className: "ztxk-form--operation" }, { children: [dynamicKey ? (jsx(DynamicSetting, { dynamicKey: dynamicKey, parentDynamicKey: FORM_DYNAMIC_KEY, defaultList: dynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef })) : null, isToggle ? (jsx(Toggle, { toggle: toggle, onClick: onToggleChange })) : null] })), rightWrapVisible ? (jsxs("div", __assign({ className: rightClasses }, { children: [jsxs("div", __assign({ className: "ztxk-form__right--common-left" }, { children: [isResetAndClear ? (jsx(ResetButton, { onClick: onDropdownResetHandleInner })) : (jsx(ButtonCom, __assign({ type: "default", onClick: onResetHandleInner }, { children: "\u91CD\u7F6E" }))), jsx(ButtonCom, __assign({ type: "primary", onClick: onSearchHandleInner }, { children: "\u67E5\u8BE2" }))] })), isCommonSearchEnabled ? (jsx("div", __assign({ className: "ztxk-form__right--common-right" }, { children: jsx(ButtonCom, __assign({ style: { width: "100%" }, onClick: onCommonSearchHandle }, { children: currentCommonSearchKey ? "更新常用搜索" : "保存为常用搜索" })) }))) : null] }))) : null] })), isCommonSearchEnabled ? (jsx(CommonSearchList, { commonSearchList: commonSearchList, setCommonSearchList: setCommonSearchList, currentCommonSearchKey: currentCommonSearchKey, setCurrentCommonSearchKey: setCurrentCommonSearchKey, form: form, reTransformData: reTransformData, deleteData: deleteData, setReplaceData: setReplaceData, updateServerData: updateServerData, onSearchHandle: onSearchHandleInner })) : null] })));
 };
 var MemoForm = memo(forwardRef(Form));
 MemoForm.displayName = "ZTXK_WEBUI_Form";

package/dist/es/form/useCommonSearch.js

@@ -14,17 +14,19 @@ var COMMON_SEARCH_KEY = "__zmdms-ui--common-search-key__";
 // 常用搜索hooks
 function useCommonSearch(options) {
     var _this = this;
-    var commonSearchKey = options.commonSearchKey;
+    var commonSearchKey = options.commonSearchKey, isCommonSearchEnabled = options.isCommonSearchEnabled;
     var customConfigFetch = useBaseContext().customConfigFetch;
     // 常用搜索列表存储实例
-    var storageRef = useRef(new MyStorage({ tableKey: COMMON_SEARCH_KEY }));
+    var storageRef = useRef(isCommonSearchEnabled
+        ? new MyStorage({ tableKey: COMMON_SEARCH_KEY })
+        : null);
     // 常用搜索列表
     var _a = useState([]), commonSearchList = _a[0], setCommonSearchList = _a[1];
     // 当前选中的常用搜索key值
     var _b = useState(""), currentCommonSearchKey = _b[0], setCurrentCommonSearchKey = _b[1];
     // 初始化常用搜索列表
     useMount(function () {
-        if (commonSearchKey) {
+        if (commonSearchKey && storageRef.current) {
             storageRef.current
                 .getItem(commonSearchKey)
                 .then(function (res) { return setCommonSearchList(res || []); });
@@ -179,23 +181,20 @@ function useCommonSearch(options) {
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                console.log("开始更新服务器数据!", res);
-                                _a.label = 1;
-                            case 1:
-                                _a.trys.push([1, 3, , 4]);
+                                _a.trys.push([0, 2, , 3]);
                                 return [4 /*yield*/, (customConfigFetch === null || customConfigFetch === void 0 ? void 0 : customConfigFetch({
                                         customKey: COMMON_SEARCH_KEY,
                                         customValue: JSON.stringify(res),
                                         mark: "常用搜索用户配置",
                                     }))];
-                            case 2:
+                            case 1:
                                 _a.sent();
-                                return [3 /*break*/, 4];
-                            case 3:
+                                return [3 /*break*/, 3];
+                            case 2:
                                 error_1 = _a.sent();
                                 console.error("更新服务器数据失败!", error_1);
-                                return [3 /*break*/, 4];
-                            case 4: return [2 /*return*/];
+                                return [3 /*break*/, 3];
+                            case 3: return [2 /*return*/];
                         }
                     });
                 }); })];
@@ -214,10 +213,13 @@ function useCommonSearch(options) {
     };
 }
 function useCommonSearchModal(options) {
-    var commonSearchList = options.commonSearchList, currentCommonSearchKey = options.currentCommonSearchKey, form = options.form, setData = options.setData;
+    var commonSearchList = options.commonSearchList, currentCommonSearchKey = options.currentCommonSearchKey, form = options.form, setData = options.setData, isCommonSearchEnabled = options.isCommonSearchEnabled;
     var iptRef = useRef(null);
     useEffect(function () {
         var _a;
+        if (!isCommonSearchEnabled) {
+            return;
+        }
         if (!(commonSearchList === null || commonSearchList === void 0 ? void 0 : commonSearchList.length)) {
             return;
         }
@@ -225,7 +227,7 @@ function useCommonSearchModal(options) {
         if (currentCommon) {
             (_a = iptRef.current) === null || _a === void 0 ? void 0 : _a.setValue(currentCommon.title);
         }
-    }, [currentCommonSearchKey, commonSearchList]);
+    }, [currentCommonSearchKey, commonSearchList, isCommonSearchEnabled]);
     /**
      * 保存为常用搜索事件
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "2.7.4",
+  "version": "2.7.6",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",