Merge branch 'beta' into develop

apps/agent/src/Layout/Workspace/components/TipisTab/index.tsx

@@ -1,5 +1,5 @@
 import Icon from "@ant-design/icons"
-import { App, Button } from "antd"
+import { App, Button, Tooltip } from "antd"
 import { FC, MouseEventHandler } from "react"
 import { useTranslation } from "react-i18next"
 import { useDispatch, useSelector } from "react-redux"
@@ -94,7 +94,7 @@ const TipisTab: FC<ITipsTab> = (props) => {
     dispatch(recentTabActions.updateCurrentRecentTabIDReducer(tabID))
   }
 
-  return (
+  const navLinkComp = (
     <NavLink
       to={genTabNavigateLink(
         currentTeamInfo?.identifier,
@@ -138,6 +138,20 @@ const TipisTab: FC<ITipsTab> = (props) => {
       )}
     </NavLink>
   )
+
+  return isMiniSize ? (
+    <Tooltip
+      title={getTabName(tabName, tabType, tabID)}
+      placement="right"
+      align={{
+        offset: [6, 0],
+      }}
+    >
+      {navLinkComp}
+    </Tooltip>
+  ) : (
+    navLinkComp
+  )
 }
 
 export default TipisTab

apps/agent/src/Layout/Workspace/pc/modules/Menu/MiniMenu/index.tsx

@@ -1,11 +1,11 @@
 import Icon from "@ant-design/icons"
-import { Button, Divider } from "antd"
+import { Button, Divider, Tooltip } from "antd"
 import { FC, useCallback, useContext } from "react"
-import { NextDoubleIcon } from "@illa-public/icon"
 import { TipisTrack } from "@illa-public/track-utils"
 import UserInfoContent from "@/Layout/Workspace/components/UserInfoContent"
 import RecentTabs from "@/Layout/Workspace/modules/RecentTabs"
 import LogoIcon from "@/assets/public/logo.svg?react"
+import MenuExpandIcon from "@/assets/workspace/menuExpand.svg?react"
 import { MenuStatusUIContext } from "../context"
 import {
   dividerContainerStyle,
@@ -35,11 +35,19 @@ const MiniMenu: FC = () => {
             <Icon component={LogoIcon} />
           </div>
           <div css={miniMenuLockSideBarContainerStyle}>
-            <Button
-              icon={<Icon component={NextDoubleIcon} />}
-              type="text"
-              onClick={onClickFoldButton}
-            />
+            <Tooltip
+              title="展開"
+              placement="right"
+              align={{
+                offset: [16, 0],
+              }}
+            >
+              <Button
+                icon={<Icon component={MenuExpandIcon} />}
+                type="text"
+                onClick={onClickFoldButton}
+              />
+            </Tooltip>
           </div>
           <div css={dividerContainerStyle}>
             <Divider

apps/agent/src/Layout/Workspace/pc/modules/MenuHeader/index.tsx

@@ -3,7 +3,7 @@ import { Button } from "antd"
 import { FC, useCallback, useContext } from "react"
 import { TipisTrack } from "@illa-public/track-utils"
 import TextAndLogo from "@/assets/public/textLogo.svg?react"
-import MenuFoldIcon from "@/assets/workspace/menuFold.svg?react"
+import MenuCollapseIcon from "@/assets/workspace/menuCollapse.svg?react"
 import { MenuStatusUIContext } from "../Menu/context"
 import { logoAndProjectNameContainerStyle, menuHeaderStyle } from "./style"
 
@@ -23,7 +23,7 @@ const MenuHeader: FC = () => {
       </div>
       <div>
         <Button
-          icon={<Icon component={MenuFoldIcon} />}
+          icon={<Icon component={MenuCollapseIcon} />}
           type="text"
           onClick={onClickFoldButton}
         />