dashboard-shell-shell 3.0.5-logtest.2 → 3.0.5-order.1

package/components/nav/Header.vue

@@ -14,6 +14,7 @@ import { LOGGED_OUT, IS_SSO } from '@shell/config/query-params';
 import NamespaceFilter from './NamespaceFilter';
 import WorkspaceSwitcher from './WorkspaceSwitcher';
 import TopLevelMenu from './TopLevelMenu';
+import TopLevelMenuNew from './TopLevelMenuNew';
 
 import { allHash } from '@shell/utils/promise';
 import { ActionLocation, ExtensionPoint } from '@shell/core/types';
@@ -29,12 +30,17 @@ import {
   RcDropdownSeparator,
   RcDropdownTrigger
 } from '@components/RcDropdown';
+import configurationApps from './configurationApps'
+import menuDropdown from './menuDropdown'
 
 export default {
 
   components: {
+    menuDropdown,
+    configurationApps,
     NamespaceFilter,
     WorkspaceSwitcher,
+    TopLevelMenuNew,
     TopLevelMenu,
     BrandImage,
     ClusterBadge,
@@ -81,6 +87,7 @@ export default {
       showImportModal:        false,
       showSearchModal:        false,
       userIcon:               require('@shell/assets/images/logo.png'),
+      homeIcon:               require('@shell/assets/images/home.svg'),
     };
   },
 
@@ -228,14 +235,21 @@ export default {
 
     singleProductLogoRoute() {
       const cluster = this.$store.getters.defaultClusterId;
-
-      return {
-        ...this.isSingleProduct.logoRoute,
+      let objs = {
         params: {
-          cluster,
-          ...this.isSingleProduct.logoRoute.params,
+          cluster
         }
-      };
+      }
+      if (this.isSingleProduct?.logoRoute?.params) {
+        objs = {
+          ...this.isSingleProduct.logoRoute,
+          params: {
+            cluster,
+            ...this.isSingleProduct.logoRoute.params,
+          }
+        };
+      }
+      return objs
     },
 
     isHarvester() {
@@ -420,19 +434,33 @@ export default {
     data-testid="header"
   >
     <div>
-
       <!-- 顶部一级菜单（根据不同产品/集群条件决定是否显示） -->
-      <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
+      <!-- <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" /> -->
     </div>
 
     <!-- ===== 左侧 logo 区域 ===== -->
-    <div class="menu-spacer">
+    <div v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" class="menu-spacer">
+      <!-- <div class="menu_home_img">
+        <router-link
+          class="option cluster selector home"
+          :to="{ name: 'home' }"
+          role="link"
+          :aria-label="t('nav.ariaLabel.homePage')"
+        >
+          <img :src="homeIcon" >
+        </router-link>
+      </div> -->
+      <!-- 显示用户头像或 logo 图片 -->
+      <img
+        :src="userIcon"
+      >
+    </div>
+
+    <div v-else>
       <!-- 如果是单产品模式且不是 RancherInHarvester，就显示 logo 路由跳转 -->
       <router-link
-        v-if="isSingleProduct && !isRancherInHarvester"
         :to="singleProductLogoRoute"
       >
-
         <!-- 显示用户头像或 logo 图片 -->
         <img
           :src="userIcon"
@@ -446,6 +474,8 @@ export default {
     <!-- ===== 右侧功能区域 ===== -->
     <div class="rd-header-right">
 
+      <TopLevelMenuNew  v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct"/>
+
       <!-- 动态插入右侧自定义组件（例如插件扩展的 header） -->
       <component :is="navHeaderRight" />
 
@@ -612,57 +642,26 @@ export default {
 
       <!-- ===== 用户菜单（右上角头像 + 下拉） ===== -->
       <div class="center-self">
-        <header-page-action-menu v-if="showPageActions" />
 
-        <rc-dropdown
-          v-if="showUserMenu"
-          :aria-label="t('nav.userMenu.label')"
-        >
-          
-          <!-- 头像触发按钮 -->
-          <rc-dropdown-trigger
-            ghost
-            small
-            data-testid="nav_header_showUserMenu"
-            :aria-label="t('nav.userMenu.button.label')"
-          >
-            <!-- <img
-              v-if="principal && principal.avatarSrc"
-              :src="principal.avatarSrc"
-              :class="{'avatar-round': principal.roundAvatar}"
-              width="36"
-              height="36"
-              :alt="t('nav.alt.userAvatar')"
-            >
-            <i
-              v-else
-              class="icon icon-user icon-3x avatar"
-            /> -->
-            <i class="icon icon-usericon" style="padding-bottom: 5px;" />
-            <span class="login-name">{{ principal.loginName }}</span>
-          </rc-dropdown-trigger>
+        <configurationApps  style="margin-left: 10px;"/>
 
+        <!-- <header-page-action-menu v-if="showPageActions" /> -->
+
+        <menuDropdown :position="'bottom-right'">
+          <template #title>
+            <!-- 头像触发按钮 -->
+            <rc-dropdown-trigger
+              ghost
+              small
+              data-testid="nav_header_showUserMenu"
+              :aria-label="t('nav.userMenu.button.label')"
+            >
+              <i class="icon icon-usericon" style="padding-bottom: 5px;" />
+              <span class="login-name">{{ principal.loginName }}</span>
+            </rc-dropdown-trigger>
+          </template>
           <!-- 下拉菜单内容 -->
           <template #dropdownCollection>
-            <!-- <template v-if="authEnabled">
-              <div class="user-info">
-                <div class="user-name">
-                  <i class="icon icon-lg icon-user" /> {{ principal.loginName }}
-                </div>
-                <div class="text-small">
-                  <template v-if="principal.loginName !== principal.name">
-                    {{ principal.name }}
-                  </template>
-                </div>
-              </div>
-              <rc-dropdown-separator />
-            </template> -->
-            <!-- <rc-dropdown-item
-              v-if="showPreferencesLink"
-              @click="$router.push({ name: 'prefs'})"
-            >
-              {{ t('nav.userMenu.preferences') }}
-            </rc-dropdown-item> -->
 
             <!-- 退出登录（支持 SLO 弹窗） -->
             <rc-dropdown-item
@@ -688,7 +687,7 @@ export default {
               {{ t('nav.userMenu.logOut') }}
             </rc-dropdown-item>
           </template>
-        </rc-dropdown>
+        </menuDropdown>
       </div>
     </div>
   </header>
@@ -698,6 +697,17 @@ export default {
   // It would be nice to grab this from `Group.vue`, but there's margin, padding and border, which is overkill to var
   $side-menu-group-padding-left: 16px;
 
+  .menu_home_img {
+    width: 51px;
+    display: flex;
+    align-items: center;
+    padding: 0 15px;
+    border-right: 1px solid rgb(215, 215, 215);
+    box-sizing: border-box;
+    height: 100%;
+    cursor: pointer;
+  }
+
   HEADER {
     display: flex;
     z-index: z-index('mainHeader');
@@ -708,6 +718,7 @@ export default {
     }
 
     > .menu-spacer {
+      display: flex;
       flex: 0 0 15px;
 
       &.isSingleProduct  {

package/components/nav/TopLevelMenu.vue

@@ -749,7 +749,6 @@ export default {
                   :data-testid="`top-level-menu-cluster-${index}`"
                   @click="hide()"
                 >
-                  
                   <!-- 可用集群 -->
                   <span
                     v-if="c.ready"