zmdms-webui 2.7.5 → 2.7.7

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/form/common-search-list.js

@@ -37,7 +37,7 @@ var CommonSearchList = function (props) {
         deleteData === null || deleteData === void 0 ? void 0 : deleteData(index);
     };
     return (jsxs("div", __assign({ className: "common-search-list--container" }, { children: [jsx("div", __assign({ className: "common-search-list--title" }, { children: "\u5E38\u7528\u641C\u7D22" })), jsx("div", __assign({ className: "common-search-list--content" }, { children: jsx(Sortable, { children: commonSearchList.map(function (item, index) {
-                        return (jsx(Sortable.Item, __assign({ onMoveItem: onMoveItem, onMoveEnd: onMoveEnd, index: index, type: sortableType }, { children: jsxs(ButtonCom, __assign({ type: currentCommonSearchKey === item.key ? "primary" : undefined, onClick: function () {
+                        return (jsx(Sortable.Item, __assign({ onMoveItem: onMoveItem, onMoveEnd: onMoveEnd, index: index, type: sortableType }, { children: jsxs(ButtonCom, __assign({ type: currentCommonSearchKey === item.key ? "primary" : undefined, isWhite: true, onClick: function () {
                                     handleClick(item);
                                     if (currentCommonSearchKey === item.key) {
                                         return;

package/dist/es/form/form.js

@@ -27,26 +27,33 @@ 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,
+        setCurrentCommonSearchKey: setCurrentCommonSearchKey,
     }).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 +125,23 @@ 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;
+        setCurrentCommonSearchKey: setCurrentCommonSearchKey,
+    }), 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: "\u4FDD\u5B58\u4E3A\u5E38\u7528\u641C\u7D22" })) }))) : 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/hooks.js

@@ -116,20 +116,22 @@ function useDynamicListByItems(items, options) {
 }
 // 右侧按钮组
 function useBtnHandle(form, handleObj) {
-    var onResetHandle = handleObj.onResetHandle, onSearchHandle = handleObj.onSearchHandle;
+    var onResetHandle = handleObj.onResetHandle, onSearchHandle = handleObj.onSearchHandle, setCurrentCommonSearchKey = handleObj.setCurrentCommonSearchKey;
     var onResetHandleInner = useCallback(function () {
         form === null || form === void 0 ? void 0 : form.resetFields();
+        setCurrentCommonSearchKey === null || setCurrentCommonSearchKey === void 0 ? void 0 : setCurrentCommonSearchKey("");
         onResetHandle && onResetHandle();
-    }, [form, onResetHandle]);
+    }, [form, onResetHandle, setCurrentCommonSearchKey]);
     var onDropdownResetHandleInner = useCallback(function (key) {
         form === null || form === void 0 ? void 0 : form.resetFields();
+        setCurrentCommonSearchKey === null || setCurrentCommonSearchKey === void 0 ? void 0 : setCurrentCommonSearchKey("");
         if (key === "clear") {
             onResetHandle && onResetHandle({});
         }
         else {
             onResetHandle && onResetHandle();
         }
-    }, [form, onResetHandle]);
+    }, [form, onResetHandle, setCurrentCommonSearchKey]);
     var onSearchHandleInner = useCallback(function () {
         // 当前表单数据
         var currentFormParams = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);

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 || []); });
@@ -123,7 +125,7 @@ function useCommonSearch(options) {
                             result[index] = saveData;
                         }
                         else {
-                            result.push(saveData);
+                            result.unshift(saveData);
                         }
                     }
                     setCommonSearchList(result);
@@ -211,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, setCurrentCommonSearchKey = options.setCurrentCommonSearchKey;
     var iptRef = useRef(null);
     useEffect(function () {
         var _a;
+        if (!isCommonSearchEnabled) {
+            return;
+        }
         if (!(commonSearchList === null || commonSearchList === void 0 ? void 0 : commonSearchList.length)) {
             return;
         }
@@ -222,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]);
     /**
      * 保存为常用搜索事件
      */
@@ -233,7 +238,8 @@ function useCommonSearchModal(options) {
         }
         ModalComponent.confirm({
             icon: null,
-            title: currentCommonSearchKey ? "更新常用搜索" : "保存为常用搜索",
+            // title: currentCommonSearchKey ? "更新常用搜索" : "保存为常用搜索",
+            title: "保存为常用搜索",
             content: jsx(MyInput, { ref: iptRef }),
             onOk: function () {
                 var _a, _b;
@@ -252,7 +258,8 @@ function useCommonSearchModal(options) {
                                 data = {
                                     title: currentCommonName,
                                     value: currentData,
-                                    key: currentCommonSearchKey || Date.now(),
+                                    // key: currentCommonSearchKey || Date.now(),
+                                    key: Date.now(),
                                 };
                                 _c.label = 1;
                             case 1:
@@ -260,6 +267,7 @@ function useCommonSearchModal(options) {
                                 return [4 /*yield*/, (setData === null || setData === void 0 ? void 0 : setData(data))];
                             case 2:
                                 _c.sent();
+                                setCurrentCommonSearchKey === null || setCurrentCommonSearchKey === void 0 ? void 0 : setCurrentCommonSearchKey(data.key);
                                 myMessage.info("保存成功！");
                                 (_b = iptRef.current) === null || _b === void 0 ? void 0 : _b.setValue("");
                                 return [3 /*break*/, 4];

package/package.json

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