zmdms-webui 3.4.0 → 3.4.2

package/dist/es/applayoutsider/appLayoutSider.d.ts

@@ -63,6 +63,8 @@ interface ILayoutSiderProps {
     filterMenuHandle?: (menus: any) => any[];
     /** 二级菜单最大下探层级，默认 3 */
     maxDeepIndex?: number;
+    /** 是否持久化二级菜单固定状态，刷新后保持 */
+    persist?: boolean;
 }
 declare const _default: React__default.NamedExoticComponent<ILayoutSiderProps>;
 

package/dist/es/applayoutsider/appLayoutSider.js

@@ -16,7 +16,7 @@ var AppLayoutSider = function (props) {
     // 118 宽度改成 134宽度
     _b = props.siderWidth, 
     // 118 宽度改成 134宽度
-    siderWidth = _b === void 0 ? 134 : _b, _c = props.subMenuWidth, subMenuWidth = _c === void 0 ? 162 : _c, addTab = props.addTab, siderBg = props.siderBg, logo = props.logo, logoStyle = props.logoStyle, subMenuLogo = props.subMenuLogo, _d = props.isShowSearchInput, isShowSearchInput = _d === void 0 ? true : _d, apps = props.apps, activeTab = props.activeTab, userMenus = props.userMenus, userSubMenus = props.userSubMenus, mergeSystemIds = props.mergeSystemIds, postMergeSystemIds = props.postMergeSystemIds, drawerTitle = props.drawerTitle, selectMainMenu = props.selectMainMenu, menuJoinRule = props.menuJoinRule, renderItem = props.renderItem, defaultVisible = props.defaultVisible, defaultFixed = props.defaultFixed, openOnlyHasSubmenus = props.openOnlyHasSubmenus, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine, bottomContainer = props.bottomContainer, onLogoClick = props.onLogoClick, filterMenuHandle = props.filterMenuHandle, logoTitle = props.logoTitle, maxDeepIndex = props.maxDeepIndex;
+    siderWidth = _b === void 0 ? 134 : _b, _c = props.subMenuWidth, subMenuWidth = _c === void 0 ? 162 : _c, addTab = props.addTab, siderBg = props.siderBg, logo = props.logo, logoStyle = props.logoStyle, subMenuLogo = props.subMenuLogo, _d = props.isShowSearchInput, isShowSearchInput = _d === void 0 ? true : _d, apps = props.apps, activeTab = props.activeTab, userMenus = props.userMenus, userSubMenus = props.userSubMenus, mergeSystemIds = props.mergeSystemIds, postMergeSystemIds = props.postMergeSystemIds, drawerTitle = props.drawerTitle, selectMainMenu = props.selectMainMenu, menuJoinRule = props.menuJoinRule, renderItem = props.renderItem, defaultVisible = props.defaultVisible, defaultFixed = props.defaultFixed, openOnlyHasSubmenus = props.openOnlyHasSubmenus, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine, bottomContainer = props.bottomContainer, onLogoClick = props.onLogoClick, filterMenuHandle = props.filterMenuHandle, logoTitle = props.logoTitle, maxDeepIndex = props.maxDeepIndex, persist = props.persist;
     // 当前选中的主菜单item
     var _e = useState([]), mainMenuSelectedKeys = _e[0], setMainMenuSelectedKeys = _e[1];
     // 内部二级菜单管理
@@ -75,7 +75,7 @@ var AppLayoutSider = function (props) {
                 getNewPath: getNewPath,
                 renderItem: renderItem,
                 filterMenuHandle: filterMenuHandle,
-            } }, { children: jsx(Menu, { width: siderWidth, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, logo: logo, logoStyle: logoStyle, subMenuLogo: subMenuLogo, getPrefixByAppId: getPrefixByAppId, defaultVisible: defaultVisible, openOnlyHasSubmenus: openOnlyHasSubmenus, defaultFixed: defaultFixed, isShowSearchInput: isShowSearchInput, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine, subMenuItemLine: subMenuItemLine, bottomContainer: bottomContainer, onLogoClick: onLogoClick, logoTitle: logoTitle, maxDeepIndex: maxDeepIndex }) })) })));
+            } }, { children: jsx(Menu, { width: siderWidth, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, logo: logo, logoStyle: logoStyle, subMenuLogo: subMenuLogo, getPrefixByAppId: getPrefixByAppId, defaultVisible: defaultVisible, openOnlyHasSubmenus: openOnlyHasSubmenus, defaultFixed: defaultFixed, isShowSearchInput: isShowSearchInput, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine, subMenuItemLine: subMenuItemLine, bottomContainer: bottomContainer, onLogoClick: onLogoClick, logoTitle: logoTitle, maxDeepIndex: maxDeepIndex, persist: persist }) })) })));
 };
 AppLayoutSider.displayName = "ZTXK_WEBUI_AppLayoutSider";
 var AppLayoutSider$1 = memo(AppLayoutSider);

package/dist/es/applayoutsider/menu/SubMenu.js

@@ -7,14 +7,14 @@ import { LayoutMenuContext } from '../LayoutSiderContext.js';
 import classNames from '../../node_modules/classnames/index.js';
 import { filterMenu } from './MainMenu.js';
 import { useMount } from 'ahooks';
-import { MENU_SEARCH_KEY, MENU_COLLECT_KEY } from './constants.js';
+import { MENU_SEARCH_KEY, MENU_COLLECT_KEY, SUB_MENU_FIXED_STORAGE_KEY } from './constants.js';
 import ButtonCom from '../../button/button.js';
 import SwapOutlined from '../../node_modules/@ant-design/icons/es/icons/SwapOutlined.js';
 import { Drawer, Menu } from 'antd';
 
 var defaultSubMenu = [];
 var SubMenu = function (props, ref) {
-    var marginLeft = props.marginLeft, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId, subMenuLogo = props.subMenuLogo, visible = props.visible, setVisible = props.setVisible, _a = props.defaultFixed, defaultFixed = _a === void 0 ? false : _a, hideSubMenuBg = props.hideSubMenuBg, subMenuItemLine = props.subMenuItemLine, openOnlyHasSubmenus = props.openOnlyHasSubmenus, _b = props.maxDeepIndex, maxDeepIndex = _b === void 0 ? 3 : _b;
+    var marginLeft = props.marginLeft, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId, subMenuLogo = props.subMenuLogo, visible = props.visible, setVisible = props.setVisible, _a = props.defaultFixed, defaultFixed = _a === void 0 ? false : _a, hideSubMenuBg = props.hideSubMenuBg, subMenuItemLine = props.subMenuItemLine, openOnlyHasSubmenus = props.openOnlyHasSubmenus, _b = props.maxDeepIndex, maxDeepIndex = _b === void 0 ? 3 : _b, persist = props.persist;
     var _c = useContext(LayoutMenuContext), mainMenuSelectedKeys = _c.mainMenuSelectedKeys, setMainMenuSelectedKeys = _c.setMainMenuSelectedKeys, activeTab = _c.activeTab, userMenus = _c.userMenus, userSubMenus = _c.userSubMenus, innerUserSubMenus = _c.innerUserSubMenus, drawerTitle = _c.drawerTitle, selectMainMenu = _c.selectMainMenu, getNewPath = _c.getNewPath, renderItem = _c.renderItem, filterMenuHandle = _c.filterMenuHandle;
     // 二级菜单当前选中项
     var subMenusSelectedKeys = useMemo(function () {
@@ -57,20 +57,39 @@ var SubMenu = function (props, ref) {
     // 提升到父组件
     // const [visible, setVisible] = useState<boolean>(defaultVisible);
     // 二级菜单是否固定
-    var _e = useState(defaultFixed), isFixed = _e[0], setIsFixed = _e[1];
+    var _e = useState(function () {
+        if (persist) {
+            try {
+                return localStorage.getItem(SUB_MENU_FIXED_STORAGE_KEY) === "true";
+            }
+            catch (_a) {
+                // ignore
+            }
+        }
+        return !!defaultFixed;
+    }), isFixed = _e[0], setIsFixed = _e[1];
     useMount(function () {
-        layoutSiderRef.current.style.marginRight = defaultFixed
+        layoutSiderRef.current.style.marginRight = isFixed
             ? "".concat(subMenuWidth, "px")
             : 0;
     });
     var onToggleSubMenuFixed = useCallback(function () {
         setIsFixed(function (preFixed) {
-            layoutSiderRef.current.style.marginRight = !preFixed
+            var nextFixed = !preFixed;
+            layoutSiderRef.current.style.marginRight = nextFixed
                 ? "".concat(subMenuWidth, "px")
                 : 0;
-            return !preFixed;
+            if (persist) {
+                try {
+                    localStorage.setItem(SUB_MENU_FIXED_STORAGE_KEY, String(nextFixed));
+                }
+                catch (_a) {
+                    // ignore
+                }
+            }
+            return nextFixed;
         });
-    }, [layoutSiderRef, subMenuWidth]);
+    }, [layoutSiderRef, subMenuWidth, persist]);
     // 底部按钮
     var footerDom = (jsxs(ButtonCom, __assign({ type: "link", onClick: onToggleSubMenuFixed }, { children: [jsx(SwapOutlined, { style: { fontSize: "14px", color: hideSubMenuBg ? "#4285f4" : "#fff" } }), isFixed ? "浮动" : "固定"] })));
     var hasMenuData = useRef(false);

package/dist/es/applayoutsider/menu/constants.js

@@ -1,4 +1,6 @@
 var MENU_SEARCH_KEY = "menu_search_key";
-var MENU_COLLECT_KEY = "menu_collect_key";
+var MENU_COLLECT_KEY = "menu_collect_key";
+/** 二级菜单固定状态的本地存储 key */
+var SUB_MENU_FIXED_STORAGE_KEY = "zmdms_submenu_fixed";
 
-export { MENU_COLLECT_KEY, MENU_SEARCH_KEY };
+export { MENU_COLLECT_KEY, MENU_SEARCH_KEY, SUB_MENU_FIXED_STORAGE_KEY };

package/dist/es/applayoutsider/menu/index.js

@@ -5,11 +5,22 @@ import Logo from './Logo.js';
 import SearchInput from './SearchInput.js';
 import MainMenu from './MainMenu.js';
 import SubMenu from './SubMenu.js';
+import { SUB_MENU_FIXED_STORAGE_KEY } from './constants.js';
 
 var MenuCom = function (props) {
-    var width = props.width, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, logo = props.logo, logoStyle = props.logoStyle, getPrefixByAppId = props.getPrefixByAppId, subMenuLogo = props.subMenuLogo, _a = props.defaultVisible, defaultVisible = _a === void 0 ? false : _a, openOnlyHasSubmenus = props.openOnlyHasSubmenus, defaultFixed = props.defaultFixed, isShowSearchInput = props.isShowSearchInput, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine, bottomContainer = props.bottomContainer, onLogoClick = props.onLogoClick, logoTitle = props.logoTitle, maxDeepIndex = props.maxDeepIndex;
+    var width = props.width, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, logo = props.logo, logoStyle = props.logoStyle, getPrefixByAppId = props.getPrefixByAppId, subMenuLogo = props.subMenuLogo, _a = props.defaultVisible, defaultVisible = _a === void 0 ? false : _a, openOnlyHasSubmenus = props.openOnlyHasSubmenus, defaultFixed = props.defaultFixed, isShowSearchInput = props.isShowSearchInput, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine, bottomContainer = props.bottomContainer, onLogoClick = props.onLogoClick, logoTitle = props.logoTitle, maxDeepIndex = props.maxDeepIndex, persist = props.persist;
     // 二级菜单是否显示
-    var _b = useState(defaultVisible), visible = _b[0], setVisible = _b[1];
+    var _b = useState(function () {
+        if (persist) {
+            try {
+                return localStorage.getItem(SUB_MENU_FIXED_STORAGE_KEY) === "true";
+            }
+            catch (_a) {
+                // ignore
+            }
+        }
+        return defaultVisible;
+    }), visible = _b[0], setVisible = _b[1];
     // 二级菜单Ref对象
     var subMenu = useRef({});
     // 一级菜单mouseEnter事件
@@ -27,7 +38,7 @@ var MenuCom = function (props) {
         var _a;
         (_a = subMenu.current) === null || _a === void 0 ? void 0 : _a.setVisible(false);
     }, []);
-    return (jsxs("div", __assign({ className: "zmdms-menu", onMouseLeave: onMouseLeave }, { children: [jsx(Logo, { logo: logo, showLine: visible && !hideSubMenuBg, style: logoStyle, onClick: onLogoClick, logoTitle: logoTitle }), isShowSearchInput && jsx(SearchInput, { setVisible: setVisible }), jsx(MainMenu, { onMouseEnter: onMouseEnter, addTab: addTab, getPrefixByAppId: getPrefixByAppId, subMenu: subMenu, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine }), jsx(SubMenu, { ref: subMenu, marginLeft: width, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, getPrefixByAppId: getPrefixByAppId, subMenuLogo: subMenuLogo, visible: visible, setVisible: setVisible, defaultFixed: defaultFixed, hideSubMenuBg: hideSubMenuBg, subMenuItemLine: subMenuItemLine, openOnlyHasSubmenus: openOnlyHasSubmenus, maxDeepIndex: maxDeepIndex }), bottomContainer] })));
+    return (jsxs("div", __assign({ className: "zmdms-menu", onMouseLeave: onMouseLeave }, { children: [jsx(Logo, { logo: logo, showLine: visible && !hideSubMenuBg, style: logoStyle, onClick: onLogoClick, logoTitle: logoTitle }), isShowSearchInput && jsx(SearchInput, { setVisible: setVisible }), jsx(MainMenu, { onMouseEnter: onMouseEnter, addTab: addTab, getPrefixByAppId: getPrefixByAppId, subMenu: subMenu, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine }), jsx(SubMenu, { ref: subMenu, marginLeft: width, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, getPrefixByAppId: getPrefixByAppId, subMenuLogo: subMenuLogo, visible: visible, setVisible: setVisible, defaultFixed: defaultFixed, hideSubMenuBg: hideSubMenuBg, subMenuItemLine: subMenuItemLine, openOnlyHasSubmenus: openOnlyHasSubmenus, maxDeepIndex: maxDeepIndex, persist: persist }), bottomContainer] })));
 };
 var Menu = memo(MenuCom);
 

package/dist/es/inputnumber/utils.js

@@ -134,6 +134,8 @@ function getFormatter(formatterType, currencySymbol, isFocusRef, precision) {
             return getValue(value, isFocusRef, precision);
         },
         parser: function (value) {
+            // 移除千分符（兼容粘贴带千分符的数字）
+            value = value.replace(/,/g, "");
             // 替换 。号
             value = value.replace(/。/g, ".");
             // 替换多个小数点

package/package.json

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