zmdms-webui 0.0.62 → 0.0.63

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

@@ -22,6 +22,8 @@ interface ILayoutSiderProps {
     postMergeSystemIds?: (string | number)[];
     /** 二级菜单头部内容 */
     drawerTitle?: React__default.ReactNode;
+    /** 初始化选中菜单 */
+    selectMainMenu?: (activeTab: any) => any;
 }
 declare const _default: React__default.NamedExoticComponent<ILayoutSiderProps>;
 

package/dist/es/applayoutsider/appLayoutSider.js

@@ -10,7 +10,7 @@ import { Layout } from 'antd';
  */
 var AppLayoutSider = function (props) {
     // console.log("layout-sider- rerender");
-    var _a = props.siderWidth, siderWidth = _a === void 0 ? 118 : _a, _b = props.subMenuWidth, subMenuWidth = _b === void 0 ? 162 : _b, addTab = props.addTab, siderBg = props.siderBg, logo = props.logo, apps = props.apps, activeTab = props.activeTab, userMenus = props.userMenus, userSubMenus = props.userSubMenus, mergeSystemIds = props.mergeSystemIds, postMergeSystemIds = props.postMergeSystemIds, drawerTitle = props.drawerTitle;
+    var _a = props.siderWidth, siderWidth = _a === void 0 ? 118 : _a, _b = props.subMenuWidth, subMenuWidth = _b === void 0 ? 162 : _b, addTab = props.addTab, siderBg = props.siderBg, logo = props.logo, apps = props.apps, activeTab = props.activeTab, userMenus = props.userMenus, userSubMenus = props.userSubMenus, mergeSystemIds = props.mergeSystemIds, postMergeSystemIds = props.postMergeSystemIds, drawerTitle = props.drawerTitle, selectMainMenu = props.selectMainMenu;
     // 当前选中的主菜单item
     var _c = useState([]), mainMenuSelectedKeys = _c[0], setMainMenuSelectedKeys = _c[1];
     var layoutSiderRef = useRef();
@@ -36,6 +36,7 @@ var AppLayoutSider = function (props) {
                 mergeSystemIds: mergeSystemIds,
                 postMergeSystemIds: postMergeSystemIds,
                 drawerTitle: drawerTitle,
+                selectMainMenu: selectMainMenu,
             } }, { children: jsx(Menu, { width: siderWidth, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, logo: logo, getPrefixByAppId: getPrefixByAppId }) })) })));
 };
 AppLayoutSider.displayName = "ZTXK_WEBUI_AppLayoutSider";

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

@@ -8,7 +8,7 @@ import IconFont from '../../icon/index.js';
 import { Menu } from 'antd';
 
 var MainMenu = function (props) {
-    var onMouseEnter = props.onMouseEnter, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId;
+    var onMouseEnter = props.onMouseEnter, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId, subMenu = props.subMenu;
     var _a = useContext(LayoutMenuContext), mainMenuSelectedKeys = _a.mainMenuSelectedKeys, setMainMenuSelectedKeys = _a.setMainMenuSelectedKeys, userMenus = _a.userMenus, apps = _a.apps, mergeSystemIds = _a.mergeSystemIds, postMergeSystemIds = _a.postMergeSystemIds;
     // 获取主菜单展开的内容
     var _b = useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, { apps: apps, mergeSystemIds: mergeSystemIds, postMergeSystemIds: postMergeSystemIds }), mainMenuOpenKeys = _b.mainMenuOpenKeys, onMainMenuOpenChange = _b.onMainMenuOpenChange;
@@ -82,8 +82,11 @@ var MainMenu = function (props) {
     }, [userMenus, getLabel]);
     // 主菜单选中时调用
     var onSelectHandle = useCallback(function (info) {
+        var _a, _b;
         setMainMenuSelectedKeys && setMainMenuSelectedKeys(info.selectedKeys);
-    }, [setMainMenuSelectedKeys]);
+        // 选中主菜单修改openKeys
+        subMenu && ((_b = (_a = subMenu.current) === null || _a === void 0 ? void 0 : _a.onSubMenuOpenChange) === null || _b === void 0 ? void 0 : _b.call(_a, info.selectedKeys));
+    }, [setMainMenuSelectedKeys, subMenu]);
     return (jsx(Menu, { className: "zmdms-menu--main", items: items, inlineIndent: 10, mode: "inline", onMouseEnter: onMouseEnter, selectedKeys: mainMenuSelectedKeys, onSelect: onSelectHandle, openKeys: mainMenuOpenKeys, onOpenChange: onMainMenuOpenChange }));
 };
 

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

@@ -1,6 +1,6 @@
 import { __assign } from '../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { memo, forwardRef, useContext, useMemo, useState, useCallback, useImperativeHandle } from 'react';
+import { memo, forwardRef, useContext, useMemo, useRef, useState, useCallback, useImperativeHandle } from 'react';
 import { Link } from 'react-router-dom';
 import { useSubMenuOpenKeys } from './hook.js';
 import { LayoutMenuContext } from '../LayoutSiderContext.js';
@@ -12,7 +12,7 @@ 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;
-    var _a = useContext(LayoutMenuContext), mainMenuSelectedKeys = _a.mainMenuSelectedKeys, setMainMenuSelectedKeys = _a.setMainMenuSelectedKeys, activeTab = _a.activeTab, userSubMenus = _a.userSubMenus, drawerTitle = _a.drawerTitle;
+    var _a = useContext(LayoutMenuContext), mainMenuSelectedKeys = _a.mainMenuSelectedKeys, setMainMenuSelectedKeys = _a.setMainMenuSelectedKeys, activeTab = _a.activeTab, userSubMenus = _a.userSubMenus, drawerTitle = _a.drawerTitle, selectMainMenu = _a.selectMainMenu;
     // 二级菜单当前选中项
     var subMenusSelectedKeys = useMemo(function () {
         return activeTab ? [activeTab] : [];
@@ -25,9 +25,12 @@ var SubMenu = function (props, ref) {
         return defaultSubMenu;
     }, [mainMenuSelectedKeys, userSubMenus]);
     // 展开指定的二级菜单
+    var isClickSubMenu = useRef(false); // 是否用户点击二级菜单
     var _b = useSubMenuOpenKeys(userSubMenus, activeTab, {
         getPrefixByAppId: getPrefixByAppId,
         setMainMenuSelectedKeys: setMainMenuSelectedKeys,
+        selectMainMenu: selectMainMenu,
+        isClickSubMenu: isClickSubMenu,
     }), subMenuOpenKeys = _b.subMenuOpenKeys, onSubMenuOpenChange = _b.onSubMenuOpenChange;
     // 二级菜单是否显示
     var _c = useState(), visible = _c[0], setVisible = _c[1];
@@ -50,6 +53,14 @@ var SubMenu = function (props, ref) {
                     setVisible(visible);
                 }
             },
+            onSubMenuOpenChange: function (keys) {
+                if (keys && keys.length > 0) {
+                    var r = userSubMenus[keys[0]];
+                    if (Array.isArray(r)) {
+                        onSubMenuOpenChange(r.map(function (i) { return i.id; }));
+                    }
+                }
+            },
         };
     });
     var items = useMemo(function () {
@@ -70,6 +81,7 @@ var SubMenu = function (props, ref) {
                     var newPath = path === "/" ? "/" : prefix ? "/".concat(prefix).concat(path) : path;
                     var subMenuItem = {
                         label: newPath === "/" ? (menuItem.name) : (jsx(Link, __assign({ to: newPath, onClick: function () {
+                                isClickSubMenu.current = true;
                                 // 增加一个页签
                                 addTab({
                                     key: newPath,

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

@@ -81,7 +81,7 @@ function useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, options) {
 }
 // 需要打开的二级菜单
 function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
-    var getPrefixByAppId = options.getPrefixByAppId, setMainMenuSelectedKeys = options.setMainMenuSelectedKeys;
+    var getPrefixByAppId = options.getPrefixByAppId, setMainMenuSelectedKeys = options.setMainMenuSelectedKeys, selectMainMenu = options.selectMainMenu, isClickSubMenu = options.isClickSubMenu;
     // 展开指定的二级菜单
     var _a = useState([]), openKeys = _a[0], setOpenKeys = _a[1];
     var onOpenChange = function (openKeys) {
@@ -89,14 +89,27 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
     };
     // 选中的页签 需要展开指定的父级菜单
     useEffect(function () {
+        if (isClickSubMenu.current) {
+            isClickSubMenu.current = false;
+            return;
+        }
         if (!userSubMenus) {
             return;
         }
-        // 遍历二级菜单
-        for (var _i = 0, _a = Object.entries(userSubMenus); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b[0], value = _b[1];
+        // 如果没有选中页签
+        if (!activeTab) {
+            return;
+        }
+        if (selectMainMenu) {
+            var mainMainId = selectMainMenu(activeTab);
+            if (mainMainId) {
+                setMainMenuSelectedKeys && setMainMenuSelectedKeys([mainMainId]);
+                return;
+            }
+        }
+        var _loop_1 = function (key, value) {
             if (!Array.isArray(value)) {
-                continue;
+                return "continue";
             }
             // 存放当前二级菜单的值
             // let currentSubMenu: any = null;
@@ -110,7 +123,11 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
                 if (newPath === activeTab) {
                     // currentSubMenu = { ...subMenuVal };
                     // 这里可能有点问题  应该是当前的id
-                    setOpenKeys([subMenuVal.parentId]);
+                    // 默认展开所有菜单
+                    // setOpenKeys([subMenuVal.parentId]);
+                    if (Array.isArray(value)) {
+                        setOpenKeys(value.map(function (i) { return i.id; }));
+                    }
                     return true;
                 }
                 // 如果没有子元素，或者子元素不是数组 直接下一轮遍历
@@ -124,7 +141,12 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
                     var newPath = path === "/" ? "/" : prefix ? "/".concat(prefix).concat(path) : path;
                     if (newPath === activeTab) {
                         // currentSubMenu = { ...item };
-                        setOpenKeys([item.parentId]);
+                        // 只打开当前级
+                        // setOpenKeys([item.parentId]);
+                        // 默认展开所有菜单
+                        if (Array.isArray(value)) {
+                            setOpenKeys(value.map(function (i) { return i.id; }));
+                        }
                         return true;
                     }
                     return false;
@@ -134,10 +156,24 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
             if (result) {
                 // 设置一级菜单选中的key
                 setMainMenuSelectedKeys && setMainMenuSelectedKeys([key]);
-                break;
+                return "break";
             }
+        };
+        // 遍历二级菜单
+        for (var _i = 0, _a = Object.entries(userSubMenus); _i < _a.length; _i++) {
+            var _b = _a[_i], key = _b[0], value = _b[1];
+            var state_1 = _loop_1(key, value);
+            if (state_1 === "break")
+                break;
         }
-    }, [userSubMenus, activeTab, getPrefixByAppId, setMainMenuSelectedKeys]);
+    }, [
+        userSubMenus,
+        activeTab,
+        getPrefixByAppId,
+        setMainMenuSelectedKeys,
+        selectMainMenu,
+        isClickSubMenu,
+    ]);
     return {
         subMenuOpenKeys: openKeys,
         onSubMenuOpenChange: onOpenChange,

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

@@ -19,7 +19,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 }), jsx(MainMenu, { onMouseEnter: onMouseEnter, addTab: addTab, getPrefixByAppId: getPrefixByAppId }), jsx(SubMenu, { ref: subMenu, marginLeft: width, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, getPrefixByAppId: getPrefixByAppId })] })));
+    return (jsxs("div", __assign({ className: "zmdms-menu", onMouseLeave: onMouseLeave }, { children: [jsx(Logo, { logo: logo }), jsx(MainMenu, { onMouseEnter: onMouseEnter, addTab: addTab, getPrefixByAppId: getPrefixByAppId, subMenu: subMenu }), jsx(SubMenu, { ref: subMenu, marginLeft: width, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, getPrefixByAppId: getPrefixByAppId })] })));
 };
 var Menu = memo(MenuCom);
 

package/package.json

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