zmdms-webui 1.1.4 → 1.1.5

package/dist/es/applayoutsider/LayoutSiderContext.js

@@ -1,6 +1,8 @@
 import React__default from 'react';
 
-var ztxkMenuContext = {};
+var ztxkMenuContext = {
+    getNewPath: function () { return ""; },
+};
 /** 菜单相关Context */
 var LayoutMenuContext = React__default.createContext(ztxkMenuContext);
 

package/dist/es/applayoutsider/appLayoutSider.js

@@ -35,6 +35,26 @@ var AppLayoutSider = function (props) {
         }
         return null;
     }, [apps]);
+    /**
+     * 通过传入选项、和前缀，根据规则生成一个新的路由
+     * 因为有些路由是配置在非本系统下面的。比如：
+     * A系统下的页面把它的菜单配置在B系统菜单下。这个时候B系统的菜单路由就会携带上A系统的前缀。
+     * 这个时候在拼接前缀的时候，就不需要拼接系统前缀了
+     */
+    var getNewPath = useCallback(function (menuItem, prefix) {
+        var rulePath = "";
+        if (menuJoinRule) {
+            rulePath = menuJoinRule(menuItem, prefix);
+        }
+        var path = menuItem.path;
+        return rulePath
+            ? rulePath
+            : path === "/"
+                ? "/"
+                : prefix
+                    ? "/".concat(prefix).concat(path)
+                    : path;
+    }, [menuJoinRule]);
     return (jsx(Layout.Sider, __assign({ className: "zmdms-sider", collapsedWidth: "0", collapsible: true, trigger: null, width: siderWidth, ref: layoutSiderRef, style: {
             backgroundImage: "url(".concat(siderBg, ")"),
         } }, { children: jsx(LayoutMenuContext.Provider, __assign({ value: {
@@ -50,7 +70,9 @@ var AppLayoutSider = function (props) {
                 postMergeSystemIds: postMergeSystemIds,
                 drawerTitle: drawerTitle,
                 selectMainMenu: selectMainMenu,
+                // 这个方法封装到getNewPath里面了
                 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 }) })) })));
 };

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

@@ -10,7 +10,7 @@ import { Menu } from 'antd';
 // 是否隐藏菜单 isHiddenMenu 1 是 2 否
 var MainMenu = function (props) {
     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, menuJoinRule = _a.menuJoinRule, renderItem = _a.renderItem;
+    var _a = useContext(LayoutMenuContext), mainMenuSelectedKeys = _a.mainMenuSelectedKeys, setMainMenuSelectedKeys = _a.setMainMenuSelectedKeys, userMenus = _a.userMenus, apps = _a.apps, mergeSystemIds = _a.mergeSystemIds, postMergeSystemIds = _a.postMergeSystemIds, getNewPath = _a.getNewPath, renderItem = _a.renderItem;
     // 获取主菜单展开的内容
     var _b = useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, { apps: apps, mergeSystemIds: mergeSystemIds, postMergeSystemIds: postMergeSystemIds }), mainMenuOpenKeys = _b.mainMenuOpenKeys, onMainMenuOpenChange = _b.onMainMenuOpenChange;
     // 创建主菜单标签
@@ -19,17 +19,7 @@ var MainMenu = function (props) {
         // 获取当前菜单的系统id
         var system = menuItem.system, path = menuItem.path;
         var prefix = getPrefixByAppId(system);
-        var rulePath = "";
-        if (menuJoinRule) {
-            rulePath = menuJoinRule(menuItem, prefix);
-        }
-        var newPath = rulePath
-            ? rulePath
-            : path === "/"
-                ? "/"
-                : prefix
-                    ? "/".concat(prefix).concat(path)
-                    : path;
+        var newPath = getNewPath(menuItem, prefix);
         if (renderItem) {
             var result = renderItem(newPath, menuItem, addTab);
             if (result) {
@@ -64,7 +54,7 @@ var MainMenu = function (props) {
                         label: menuItem.name,
                     });
             } }, { children: menuItem.name })));
-    }, [addTab, getPrefixByAppId, menuJoinRule, renderItem]);
+    }, [addTab, getPrefixByAppId, getNewPath, renderItem]);
     var items = useMemo(function () {
         var _a;
         if (!Array.isArray(userMenus)) {

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

@@ -15,7 +15,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, subMenuLogo = props.subMenuLogo, visible = props.visible, setVisible = props.setVisible, _a = props.defaultFixed, defaultFixed = _a === void 0 ? true : _a;
-    var _b = useContext(LayoutMenuContext), mainMenuSelectedKeys = _b.mainMenuSelectedKeys, setMainMenuSelectedKeys = _b.setMainMenuSelectedKeys, activeTab = _b.activeTab, userSubMenus = _b.userSubMenus, innerUserSubMenus = _b.innerUserSubMenus, drawerTitle = _b.drawerTitle, selectMainMenu = _b.selectMainMenu, menuJoinRule = _b.menuJoinRule, renderItem = _b.renderItem;
+    var _b = useContext(LayoutMenuContext), mainMenuSelectedKeys = _b.mainMenuSelectedKeys, setMainMenuSelectedKeys = _b.setMainMenuSelectedKeys, activeTab = _b.activeTab, userSubMenus = _b.userSubMenus, innerUserSubMenus = _b.innerUserSubMenus, drawerTitle = _b.drawerTitle, selectMainMenu = _b.selectMainMenu, getNewPath = _b.getNewPath, renderItem = _b.renderItem;
     // 二级菜单当前选中项
     var subMenusSelectedKeys = useMemo(function () {
         return activeTab ? [activeTab] : [];
@@ -39,6 +39,7 @@ var SubMenu = function (props, ref) {
         setMainMenuSelectedKeys: setMainMenuSelectedKeys,
         selectMainMenu: selectMainMenu,
         isClickSubMenu: isClickSubMenu,
+        getNewPath: getNewPath,
     }), subMenuOpenKeys = _c.subMenuOpenKeys, onSubMenuOpenChange = _c.onSubMenuOpenChange;
     // 如果是搜索或者收藏 把二级菜单都展开
     useEffect(function () {
@@ -100,20 +101,10 @@ var SubMenu = function (props, ref) {
             if (Array.isArray(arr)) {
                 filterMenu(arr).forEach(function (menuItem) {
                     // 获取当前菜单的系统id
-                    var system = menuItem.system, path = menuItem.path;
+                    var system = menuItem.system;
                     var prefix = getPrefixByAppId(system);
-                    var rulePath = "";
-                    if (menuJoinRule) {
-                        rulePath = menuJoinRule(menuItem, prefix);
-                    }
                     // 二级菜单如果没有配置路由的 不需要跳转
-                    var newPath = rulePath
-                        ? rulePath
-                        : path === "/"
-                            ? "/"
-                            : prefix
-                                ? "/".concat(prefix).concat(path)
-                                : path;
+                    var newPath = getNewPath(menuItem, prefix);
                     var getLabel = function () {
                         if (renderItem) {
                             var result = renderItem(newPath, menuItem, function (info) {
@@ -153,7 +144,7 @@ var SubMenu = function (props, ref) {
         };
         var newSubMenusItems = dfn(subMenus);
         return newSubMenusItems;
-    }, [subMenus, addTab, getPrefixByAppId, menuJoinRule, renderItem]);
+    }, [subMenus, addTab, getPrefixByAppId, getNewPath, renderItem]);
     var classes = classNames("zmdms-menu--sub", {
         "zmdms-menu--sub-margin": !drawerTitle,
     });

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

@@ -82,7 +82,7 @@ function useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, options) {
 }
 // 需要打开的二级菜单
 function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
-    var getPrefixByAppId = options.getPrefixByAppId, setMainMenuSelectedKeys = options.setMainMenuSelectedKeys, selectMainMenu = options.selectMainMenu, isClickSubMenu = options.isClickSubMenu;
+    var getPrefixByAppId = options.getPrefixByAppId, setMainMenuSelectedKeys = options.setMainMenuSelectedKeys, selectMainMenu = options.selectMainMenu, isClickSubMenu = options.isClickSubMenu, getNewPath = options.getNewPath;
     // 展开指定的二级菜单
     var _a = useState([]), openKeys = _a[0], setOpenKeys = _a[1];
     var onOpenChange = useCallback(function (openKeys) {
@@ -126,12 +126,16 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
                 return "continue";
             }
             // 存放当前二级菜单的值
+            // 20240327 这里有一个问题，就是开发可能会再A系统配置B系统的菜单；
+            // 这个时候这个菜单的path 就会带上B系统的前缀；这里再去做拼接的话，就会比对不上activeTab当前选中的tab。所以这里要做下判断 如果当前菜单的path有前缀的话，那么不再做前缀的拼接
             // let currentSubMenu: any = null;
             var result = value.find(function (subMenuVal) {
-                var system = subMenuVal.system, path = subMenuVal.path;
+                var system = subMenuVal.system;
                 var prefix = getPrefixByAppId(system);
                 // 二级菜单如果没有配置路由的 不需要跳转
-                var newPath = path === "/" ? "/" : prefix ? "/".concat(prefix).concat(path) : path;
+                // const newPath =
+                //   path === "/" ? "/" : prefix ? `/${prefix}${path}` : path;
+                var newPath = getNewPath(subMenuVal, prefix);
                 // 如果值相等的话，说明这个就是目标值
                 // 即父级就是当前选中项
                 if (newPath === activeTab) {
@@ -187,6 +191,7 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
         setMainMenuSelectedKeys,
         selectMainMenu,
         isClickSubMenu,
+        getNewPath,
     ]);
     return {
         subMenuOpenKeys: openKeys,

package/package.json

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