zmdms-webui 1.4.6 → 1.4.8

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

@@ -6,6 +6,7 @@ interface ILayoutSiderProps {
     addTab?: any;
     siderBg?: any;
     logo?: any;
+    logoStyle?: React__default.CSSProperties;
     subMenuLogo?: any;
     /** 隐藏二级菜单背景 */
     hideSubMenuBg?: boolean;

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, 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, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine;
+    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, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine;
     // 当前选中的主菜单item
     var _e = useState([]), mainMenuSelectedKeys = _e[0], setMainMenuSelectedKeys = _e[1];
     // 内部二级菜单管理
@@ -74,7 +74,7 @@ var AppLayoutSider = function (props) {
                 menuJoinRule: menuJoinRule,
                 getNewPath: getNewPath,
                 renderItem: renderItem,
-            } }, { children: jsx(Menu, { width: siderWidth, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, logo: logo, subMenuLogo: subMenuLogo, getPrefixByAppId: getPrefixByAppId, defaultVisible: defaultVisible, defaultFixed: defaultFixed, isShowSearchInput: isShowSearchInput, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine, subMenuItemLine: subMenuItemLine }) })) })));
+            } }, { children: jsx(Menu, { width: siderWidth, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, logo: logo, logoStyle: logoStyle, subMenuLogo: subMenuLogo, getPrefixByAppId: getPrefixByAppId, defaultVisible: defaultVisible, defaultFixed: defaultFixed, isShowSearchInput: isShowSearchInput, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine, subMenuItemLine: subMenuItemLine }) })) })));
 };
 AppLayoutSider.displayName = "ZTXK_WEBUI_AppLayoutSider";
 var AppLayoutSider$1 = memo(AppLayoutSider);

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

@@ -4,11 +4,11 @@ import { memo } from 'react';
 import classNames from '../../node_modules/classnames/index.js';
 
 var Logo = function (_a) {
-    var logo = _a.logo, showLine = _a.showLine;
+    var logo = _a.logo, showLine = _a.showLine, style = _a.style;
     var classes = classNames("zmdms-logo", {
         "zmdms-logo--line": showLine,
     });
-    return (jsx("div", __assign({ className: classes }, { children: jsx("img", { src: logo, title: "\u6D59\u6C5F\u4EA4\u901A\u96C6\u56E2", alt: "cico_logo" }) })));
+    return (jsx("div", __assign({ className: classes }, { children: jsx("img", { src: logo, title: "\u6D59\u6C5F\u4EA4\u901A\u96C6\u56E2", alt: "cico_logo", style: style }) })));
 };
 var Logo$1 = memo(Logo);
 

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

@@ -101,6 +101,7 @@ var SubMenu = function (props, ref) {
             deep++;
             if (Array.isArray(arr)) {
                 filterMenu(arr).forEach(function (menuItem) {
+                    var _a;
                     // 获取当前菜单的系统id
                     var system = menuItem.system;
                     var prefix = getPrefixByAppId(system);
@@ -130,7 +131,12 @@ var SubMenu = function (props, ref) {
                         label: getLabel(),
                         title: menuItem.name,
                         // key: menuItem.id,
-                        key: newPath === "/" ? menuItem.id : newPath,
+                        // 这里为什么要用newPath 而不是menuItem.id
+                        // 因为如果要选到叶子节点，是直接拿路由去做匹配
+                        // 如果这个菜单有子元素，那么这个菜单是不需要跳转的，他的key应该取menuItem.id
+                        key: newPath === "/" || ((_a = menuItem.children) === null || _a === void 0 ? void 0 : _a.length) > 0
+                            ? menuItem.id
+                            : newPath,
                         // icon: menuItem.source ? (
                         //   <Icon type={menuItem.source} style={{ fontSize: "18px" }} />
                         // ) : null,

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

@@ -121,6 +121,7 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
                 return;
             }
         }
+        // 20250204 菜单逻辑修改
         // 如果当前activeTab直接与一级菜单匹配上，那么说明当前选中的是主菜单带路由
         var currentUserMenu = null;
         userMenus.find(function (userMenu) {
@@ -183,7 +184,10 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
                     // 默认展开所有菜单
                     // setOpenKeys([subMenuVal.parentId]);
                     if (Array.isArray(value)) {
-                        setOpenKeys(value.map(function (i) { return i.id; }));
+                        // 要先过滤掉没有子级的菜单，因为没有子级的菜单不需要展开
+                        setOpenKeys(value
+                            .filter(function (i) { return Array.isArray(i.children) && i.children.length > 0; })
+                            .map(function (i) { return i.id; }));
                     }
                     return true;
                 }
@@ -204,7 +208,11 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
                         // setOpenKeys([item.parentId]);
                         // 默认展开所有菜单
                         if (Array.isArray(value)) {
-                            setOpenKeys(value.map(function (i) { return i.id; }));
+                            setOpenKeys(value
+                                .filter(function (i) {
+                                return Array.isArray(i.children) && i.children.length > 0;
+                            })
+                                .map(function (i) { return i.id; }));
                         }
                         return true;
                     }
@@ -218,6 +226,7 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
                 return "break";
             }
         };
+        // 20250204 菜单逻辑修改
         // 遍历二级菜单
         for (var _i = 0, _a = Object.entries(userSubMenus); _i < _a.length; _i++) {
             var _b = _a[_i], key = _b[0], value = _b[1];

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

@@ -7,7 +7,7 @@ import MainMenu from './MainMenu.js';
 import SubMenu from './SubMenu.js';
 
 var MenuCom = function (props) {
-    var width = props.width, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, logo = props.logo, getPrefixByAppId = props.getPrefixByAppId, subMenuLogo = props.subMenuLogo, _a = props.defaultVisible, defaultVisible = _a === void 0 ? true : _a, defaultFixed = props.defaultFixed, isShowSearchInput = props.isShowSearchInput, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine;
+    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 ? true : _a, defaultFixed = props.defaultFixed, isShowSearchInput = props.isShowSearchInput, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine;
     // 二级菜单是否显示
     var _b = useState(defaultVisible), visible = _b[0], setVisible = _b[1];
     // 二级菜单Ref对象
@@ -22,7 +22,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 }), isShowSearchInput && jsx(SearchInput, {}), 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 })] })));
+    return (jsxs("div", __assign({ className: "zmdms-menu", onMouseLeave: onMouseLeave }, { children: [jsx(Logo, { logo: logo, showLine: visible && !hideSubMenuBg, style: logoStyle }), isShowSearchInput && jsx(SearchInput, {}), 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 })] })));
 };
 var Menu = memo(MenuCom);
 

package/dist/es/login/index.d.ts

@@ -25,6 +25,8 @@ interface IProps {
     prefixRender?: React__default.ReactElement;
     /** 后置内容 */
     suffixRender?: React__default.ReactElement;
+    /** 登录组件ref */
+    loginHandleRef?: React__default.RefObject<any>;
 }
 interface ILoginChildrenProps {
     form: FormInstance<any>;

package/dist/es/login/index.js

@@ -1,6 +1,6 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useImperativeHandle } from 'react';
 import { Form, Checkbox } from 'antd';
 import { decrypt, encrypt } from './utils.js';
 import ForgetPassword from './forget-password.js';
@@ -14,7 +14,7 @@ var USERNAME_KEY = "PUsvG";
 var USERPWS_KEY = "kVhfO";
 var KEY = "simide";
 var Login = function (props) {
-    var loginLogo = props.loginLogo, loginBg = props.loginBg, onFinishHandle = props.onFinishHandle, loading = props.loading, customRender = props.customRender, checkUserPhone = props.checkUserPhone, sendCode = props.sendCode, submitRequest = props.submitRequest, captcha = props.captcha, getCaptcha = props.getCaptcha, prefixRender = props.prefixRender, suffixRender = props.suffixRender;
+    var loginLogo = props.loginLogo, loginBg = props.loginBg, onFinishHandle = props.onFinishHandle, loading = props.loading, customRender = props.customRender, checkUserPhone = props.checkUserPhone, sendCode = props.sendCode, submitRequest = props.submitRequest, captcha = props.captcha, getCaptcha = props.getCaptcha, prefixRender = props.prefixRender, suffixRender = props.suffixRender, loginHandleRef = props.loginHandleRef;
     var _a = useState(false), open = _a[0], setOpen = _a[1];
     var form = Form.useForm()[0];
     useEffect(function () {
@@ -53,7 +53,12 @@ var Login = function (props) {
         // 内部处理
         onFinishHandle && onFinishHandle(values);
     };
-    return customRender ? (customRender({ form: form, rememberPsd: rememberPsd })) : (jsx("div", __assign({ className: "login-wrap", style: { backgroundImage: "url(".concat(loginBg, ")") } }, { children: jsxs(Form, __assign({ form: form, requiredMark: false, layout: "vertical", className: "login-form", onFinish: onFinish }, { children: [jsx("div", __assign({ className: "login-logo" }, { children: jsx("img", { src: loginLogo, title: "\u6D59\u5546\u4E2D\u62D3ERP", alt: "zszt_logo" }) })), prefixRender, jsx(Item, __assign({ label: "\u8BF7\u8F93\u5165\u60A8\u7684\u8D26\u53F7", name: "username", rules: [
+    useImperativeHandle(loginHandleRef, function () {
+        return {
+            form: form,
+        };
+    });
+    return customRender ? (customRender({ form: form, rememberPsd: rememberPsd })) : (jsx("div", __assign({ className: "login-wrap", style: { backgroundImage: "url(".concat(loginBg, ")") } }, { children: jsxs(Form, __assign({ form: form, requiredMark: false, layout: "vertical", className: "login-form", onFinish: onFinish }, { children: [loginLogo ? (jsx("div", __assign({ className: "login-logo" }, { children: jsx("img", { src: loginLogo, title: "\u6D59\u5546\u4E2D\u62D3ERP", alt: "zszt_logo" }) }))) : null, prefixRender, jsx(Item, __assign({ label: "\u8BF7\u8F93\u5165\u60A8\u7684\u8D26\u53F7", name: "username", rules: [
                         {
                             required: true,
                             message: "请输入您的账号",

package/package.json

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