beer-assembly-biz 1.1.5 → 1.1.6

package/layout/AppLayout.d.ts

@@ -62,6 +62,10 @@ export declare type UserInfo = {
  * 布局属性
  */
 export declare type LayoutProps = {
+    /**
+     * 基础名称.
+     */
+    basename?: string;
     /**
      * App
      */

package/layout/AppLayout.js

@@ -25,6 +25,7 @@ export const AppLayout = (props) => {
     const [isMobile, setIsMobile] = useState(false);
     // 菜单的选择
     const [pathKeys, setPathKeys] = useState([]);
+    const [openKeys, setOpenKeys] = useState([]);
     // 获取参数参数
     const [appParams, setAppParams] = useState();
     // 菜单列表
@@ -50,6 +51,16 @@ export const AppLayout = (props) => {
         return result;
     };
     // 基于路径刷新页面菜单
+    const getOpenKeys = (key) => {
+        if (key === undefined) {
+            return [];
+        }
+        const parent = menus?.find(it => it.children?.find(child => child.key === key) !== undefined);
+        if (parent === undefined || parent?.key === undefined || parent?.key === '') {
+            return [];
+        }
+        return [parent.key];
+    };
     const refreshPath = async () => {
         if (menus === undefined || menus.length <= 0) {
             return;
@@ -65,24 +76,31 @@ export const AppLayout = (props) => {
             }) || [])])
             .flat()
             .filter(it => it !== undefined);
-        let result = items.find(it => it.path === window.location.pathname);
+        let { pathname } = window.location;
+        if (props?.basename !== undefined && props?.basename !== '' && pathname.startsWith(props.basename)) {
+            pathname = pathname.substring(props.basename.length);
+        }
+        let result = items.find(it => it.path === pathname);
         if (result !== undefined) {
+            setOpenKeys(getOpenKeys(result.key));
             setPathKeys(result.key === undefined ? [] : [result.key]);
             return;
         }
         // 如果匹配到分割符号
-        const locationPath = window.location.pathname.toUpperCase();
+        const locationPath = pathname.toUpperCase();
         const partition = (props?.pathPartition || []).find(path => locationPath.indexOf(`/${path}/`) > -1);
         if (partition !== undefined) {
             const partitionPath = locationPath.split(`/${partition}/`)[0].toLowerCase();
             result = items.find(it => it.path === partitionPath);
             if (result !== undefined) {
+                setOpenKeys(getOpenKeys(result.key));
                 setPathKeys(result.key === undefined ? [] : [result.key]);
                 return;
             }
         }
-        result = items.find(it => it !== undefined && it.path !== undefined && window.location.pathname.startsWith(it.path));
+        result = items.find(it => it !== undefined && it.path !== undefined && pathname.startsWith(it.path));
         if (result !== undefined) {
+            setOpenKeys(getOpenKeys(result.key));
             setPathKeys(result.key === undefined ? [] : [result.key]);
         }
     };
@@ -164,7 +182,9 @@ export const AppLayout = (props) => {
           }
       `, style: {
                 minWidth: 1000
-            }, selectedKeys: pathKeys, locale: "zh-CN", navTheme: "light", fixSiderbar: true, layout: "mix", contentWidth: "Fluid", splitMenus: false, bgLayoutImgList: [
+            }, selectedKeys: pathKeys, openKeys: openKeys, onOpenChange: (menus) => {
+                setOpenKeys(menus);
+            }, locale: "zh-CN", navTheme: "light", fixSiderbar: true, layout: "mix", contentWidth: "Fluid", splitMenus: false, bgLayoutImgList: [
                 {
                     src: ImageLayout01,
                     left: 85,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "beer-assembly-biz",
   "private": false,
-  "version": "1.1.5",
+  "version": "1.1.6",
   "scripts": {
     "pub-w": "tsc && copy package.json .\\dist\\package.json && npm publish ./dist",
     "copy": "cp -a src/rich/AIEditor.css dist/rich/AIEditor.css && cp -a src/icon dist/icon && cp -a src/images dist/images",