Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 6171c93b54a3968b47f3ee48ad4a730a31976122
+  newTag: 7a35ad78f6d1b06acf5213f3b912971dbcc3a5a0

src/components/layout/menu/index.tsx

@@ -94,7 +94,6 @@ export function MenuView() {
       const brr = getItem(value)?.filter((i: any) => i?.children?.length) || [];
       // 设置要展示的菜单列表
       setItems([...arr, ...brr]);
-      await getMessageNumber();
     });
   }, []);
 
@@ -103,6 +102,7 @@ export function MenuView() {
     setOpenKeys([getRoutePid(routerList, location.pathname).toString()]);
     // 设置当前选中的项目的subMenu
     setSelectedKeys([getRouteID(routerList, location.pathname).toString()]);
+    getMessageNumber().then();
   }, [location.pathname]);
   return (
     <Layout.Sider
@@ -123,7 +123,8 @@ export function MenuView() {
         // items={items}
         style={{ backgroundColor: ' #F3F6FF ' }}
       >
-        {items?.map((i: any) => (
+        {items?.map((i: any) =>
+          i?.children ? (
             <Menu.SubMenu title={i.label} key={i.key} icon={i.icon}>
               {i?.children?.map((n: any) => (
                 <Menu.Item title={n.label} key={n.key} icon={n.icon}>
@@ -132,7 +133,13 @@ export function MenuView() {
                 </Menu.Item>
               ))}
             </Menu.SubMenu>
-        ))}
+          ) : (
+            <Menu.Item title={i.label} key={i.key} icon={i.icon}>
+              {i.label}
+              {!!getTag(i.key) && <div className={'menu-subTag'}>{getTag(i.key)}</div>}
+            </Menu.Item>
+          ),
+        )}
       </Menu>
     </Layout.Sider>
   );