cfel-base-components 2.5.61 → 2.5.63

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules/typescript/lib"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "2.5.61",
+  "version": "2.5.63",
   "description": "cfel-base-components",
   "main": "/src/index.tsx",
   "types": "src/index.d.ts",

package/src/.umi/core/helmet.ts

@@ -2,7 +2,7 @@
 // This file is generated by Umi automatically
 // DO NOT CHANGE IT MANUALLY!
 import React from 'react';
-import { HelmetProvider } from '/Users/lionaillen/Documents/work/cfel/base-components/node_modules/.pnpm/@umijs+renderer-react@4.0.72_react-dom@18.1.0_react@18.1.0__react@18.1.0/node_modules/@umijs/renderer-react';
+import { HelmetProvider } from '/Users/wujingang/Desktop/workspace/base-components/node_modules/@umijs/renderer-react';
 import { context } from './helmetContext';
 
 export const innerProvider = (container) => {

package/src/components/layout/index.tsx

@@ -138,15 +138,23 @@ export default function LiosLayout(props: LiosLayoutlProps) {
     tenantId: false,
   })
 
+
   useEffect(() => {
     //在这里找到当前菜单的上层目录
     const paMenu = findParentMenu(menuList, '/' + location.pathname.split('/')[2])
+    //去重
+    const set = new Set(paMenu.map((item) => item.key))
 
-    setOpenKeys(paMenu.map((item) => item.key))
+    openKeys.forEach((element: string) => {
+      set.add(element)
+    })
+    setOpenKeys(Array.from(set))
 
+    // 设置选中的菜单项
     const selectedPath = findKeyPath('/' + location.pathname.split('/')[2])
     setSelectKey(selectedPath)
-  }, [location.pathname, collapsed])
+  }, [location.pathname])
+
 
   const onOpenChange: MenuProps['onOpenChange'] = (keys) => {
     // Find the last opened key