dashboard-shell-shell 3.0.5-test.6 → 3.0.5-test.61

package/components/nav/Header.vue

@@ -77,7 +77,10 @@ export default {
       LOGGED_OUT,
       navHeaderRight:         null,
       extensionHeaderActions: getApplicableExtensionEnhancements(this, ExtensionPoint.ACTION, ActionLocation.HEADER, this.$route),
-      ctx:                    this
+      ctx:                    this,
+      showImportModal:        false,
+      showSearchModal:        false,
+      userIcon:               require('@shell/assets/images/logo.svg'),
     };
   },
 
@@ -273,6 +276,18 @@ export default {
   },
 
   methods: {
+
+    LogOutfn(type) {
+      sessionStorage.removeItem('TOPLEVELPERMISSIONS');
+      if (type === '1') {
+        this.$router.push({ name: 'account' });
+      } else if (type === '2') {
+        this.showSloModal();
+      } else if (type === '3') {
+        this.$router.push(this.generateLogoutRoute);
+      }
+    },
+
     showSloModal() {
       this.$store.dispatch('management/promptModal', {
         component:      'SloDialog',
@@ -398,152 +413,59 @@ export default {
 </script>
 
 <template>
+  <!-- 整个页面的顶部 header -->
   <header
     ref="header"
     data-testid="header"
   >
     <div>
+      <!-- 顶部一级菜单（根据不同产品/集群条件决定是否显示） -->
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
     </div>
 
-    <div
-      class="menu-spacer"
-      :class="{'isSingleProduct': isSingleProduct }"
-    >
+    <!-- ===== 左侧 logo 区域 ===== -->
+    <div class="menu-spacer">
+      <!-- 如果是单产品模式且不是 RancherInHarvester，就显示 logo 路由跳转 -->
       <router-link
         v-if="isSingleProduct && !isRancherInHarvester"
         :to="singleProductLogoRoute"
-        role="link"
-        :alt="t('branding.logos.home')"
       >
-        <BrandImage
-          v-if="isSingleProduct.supportCustomLogo && isHarvester"
-          class="side-menu-logo"
-          file-name="harvester.svg"
-          :support-custom-logo="true"
-          :alt="t('branding.logos.label')"
-        />
+        <!-- 显示用户头像或 logo 图片 -->
         <img
-          v-else
-          class="side-menu-logo"
-          :src="isSingleProduct.logo"
-          :alt="t('branding.logos.label')"
+          :src="userIcon"
         >
       </router-link>
     </div>
 
-    <div
-      v-if="!simple"
-      ref="product"
-      class="product"
-    >
-      <div
-        v-if="currentProduct && currentProduct.showClusterSwitcher"
-        v-clean-tooltip="nameTooltip"
-        class="cluster cluster-clipped"
-      >
-        <div
-          v-if="isSingleProduct && !isRancherInHarvester"
-          class="product-name"
-        >
-          <template v-if="isSingleProduct.supportCustomLogo">
-            {{ vendor }}
-          </template>
-          <template v-else>
-            {{ t(isSingleProduct.productNameKey) }}
-          </template>
-        </div>
-        <template v-else>
-          <ClusterProviderIcon
-            v-if="currentCluster"
-            :cluster="currentCluster"
-            class="mr-10"
-            :alt="t('branding.logos.label')"
-          />
-          <div
-            v-if="currentCluster"
-            ref="clusterName"
-            class="cluster-name"
-          >
-            {{ currentCluster.spec.displayName }}
-          </div>
-          <ClusterBadge
-            v-if="currentCluster"
-            :cluster="currentCluster"
-            class="ml-10"
-            :alt="t('branding.logos.label')"
-          />
-          <div
-            v-if="!currentCluster"
-            class="simple-title"
-          >
-            <BrandImage
-              class="side-menu-logo-img"
-              file-name="rancher-logo.svg"
-              :alt="t('branding.logos.label')"
-            />
-          </div>
-        </template>
-      </div>
-      <div
-        v-if="currentProduct && !currentProduct.showClusterSwitcher"
-        class="cluster"
-      >
-        <img
-          v-if="currentProduct.iconHeader"
-          v-bind="$attrs"
-          :src="currentProduct.iconHeader"
-          class="cluster-os-logo mr-10"
-          style="width: 44px; height: 36px;"
-          :alt="t('branding.logos.label')"
-        >
-        <div class="product-name">
-          {{ prod }}
-        </div>
-      </div>
-    </div>
-
-    <div
-      v-else
-      class="simple-title"
-    >
-      <div
-        v-if="isSingleProduct"
-        class="product-name"
-      >
-        {{ t(isSingleProduct.productNameKey) }}
-      </div>
-
-      <div
-        v-else
-        class="side-menu-logo"
-      >
-        <BrandImage
-          class="side-menu-logo-img"
-          data-testid="header__brand-img"
-          file-name="rancher-logo.svg"
-          :alt="t('branding.logos.label')"
-        />
-      </div>
-    </div>
-
+    <!-- ===== 中间占位符（把左右内容分开） ===== -->
     <div class="spacer" />
 
+    <!-- ===== 右侧功能区域 ===== -->
     <div class="rd-header-right">
+      <!-- 动态插入右侧自定义组件（例如插件扩展的 header） -->
       <component :is="navHeaderRight" />
+
+      <!-- ===== 集群/命名空间过滤器 ===== -->
       <div
         v-if="showFilter"
         class="top"
       >
+        <!-- 如果集群就绪 + 当前产品支持命名空间过滤器 或 Explorer 模式 -->
         <NamespaceFilter v-if="clusterReady && currentProduct && (currentProduct.showNamespaceFilter || isExplorer)" />
-        <WorkspaceSwitcher v-else-if="clusterReady && currentProduct && currentProduct.showWorkspaceSwitcher && showWorkspaceSwitcher" />
+
+        <!-- 否则显示工作空间切换器 -->
+        <WorkspaceSwitcher v-else-if="clusterReady && currentProduct && currentProduct.showWorkspaceSwitcher" />
       </div>
+
+      <!-- ===== 集群相关按钮（仅在有集群且不是 simple 模式下显示） ===== -->
       <div
         v-if="currentCluster && !simple"
         class="header-buttons"
       >
+        <!-- 如果当前产品支持集群切换器 -->
         <template v-if="currentProduct && currentProduct.showClusterSwitcher">
-          <button
+          <!-- 导入 YAML 按钮 -->
+          <!-- <button
             v-if="showImportYaml"
             v-clean-tooltip="t('nav.import')"
             :disabled="!importEnabled"
@@ -556,9 +478,9 @@ export default {
             @click="openImport()"
           >
             <i class="icon icon-upload icon-lg" />
-          </button>
+          </button> -->
 
-          <button
+          <!-- <button
             v-if="showKubeShell"
             id="btn-kubectl"
             v-clean-tooltip="t('nav.shellShortcut', {key: shellShortcut})"
@@ -573,9 +495,10 @@ export default {
             @click="currentCluster.openShell()"
           >
             <i class="icon icon-terminal icon-lg" />
-          </button>
+          </button> -->
 
-          <button
+          <!-- 下载 kubeconfig 按钮 -->
+          <!-- <button
             v-if="showKubeConfig"
             v-clean-tooltip="t('nav.kubeconfig.download')"
             :disabled="!kubeConfigEnabled"
@@ -588,9 +511,10 @@ export default {
             @click="currentCluster.downloadKubeConfig()"
           >
             <i class="icon icon-file icon-lg" />
-          </button>
+          </button> -->
 
-          <button
+          <!-- 复制 kubeconfig 按钮 -->
+          <!-- <button
             v-if="showCopyConfig"
             v-clean-tooltip="t('nav.kubeconfig.copy')"
             :disabled="!kubeConfigEnabled"
@@ -602,18 +526,22 @@ export default {
             :aria-label="t('nav.kubeconfig.copy')"
             @click="copyKubeConfig($event)"
           >
+
             <i
               v-if="kubeConfigCopying"
               class="icon icon-checkmark icon-lg"
             />
+
             <i
               v-else
               class="icon icon-copy icon-lg"
             />
-          </button>
+          </button> -->
         </template>
 
-        <button
+        <!-- 资源搜索按钮 -->
+        <!-- 2025/9/30 隐藏 -->
+        <!-- <button
           v-if="showSearch"
           id="header-btn-search"
           v-clean-tooltip="t('nav.resourceSearch.toolTip', {key: searchShortcut})"
@@ -628,53 +556,71 @@ export default {
           @click="openSearch()"
         >
           <i class="icon icon-search icon-lg" />
-        </button>
+        </button> -->
+
+        <!-- 搜索弹窗 -->
+        <app-modal
+          v-if="showSearch && showSearchModal"
+          class="search-modal"
+          name="searchModal"
+          width="50%"
+          height="auto"
+          :trigger-focus-trap="true"
+          return-focus-selector="#header-btn-search"
+          @close="hideSearch()"
+        />
       </div>
 
-      <!-- Extension header actions -->
+      <!-- ===== 插件扩展按钮区 ===== -->
       <div
         v-if="extensionHeaderActions.length"
         class="header-buttons"
       >
-        <button
+        <template
           v-for="action, i in extensionHeaderActions"
           :key="`${action.label}${i}`"
-          v-clean-tooltip="handleExtensionTooltip(action)"
-          v-shortkey="action.shortcutKey"
-          :disabled="action.enabled ? !action.enabled(ctx) : false"
-          type="button"
-          class="btn header-btn role-tertiary"
-          :data-testid="`extension-header-action-${ action.labelKey || action.label }`"
-          role="button"
-          tabindex="0"
-          :aria-label="action.labelKey ? t(action.labelKey) : action.label"
-          @shortkey="handleExtensionAction(action, $event)"
-          @click="handleExtensionAction(action, $event)"
         >
-          <IconOrSvg
-            class="icon icon-lg"
-            :icon="action.icon"
-            :src="action.svg"
-            :img-alt="action.tooltipKey ? t(action.tooltipKey) : action.labelKey ? t(action.labelKey) : action.label ? action.label : t('generic.imageAlt')"
-            color="header"
-          />
-        </button>
+          <!-- kubectl-explain.action | 2025/9/30隐藏 -->
+          <button
+            v-if="action.labelKey !== 'kubectl-explain.action'"
+            v-clean-tooltip="handleExtensionTooltip(action)"
+            v-shortkey="action.shortcutKey"
+            :disabled="action.enabled ? !action.enabled(ctx) : false"
+            type="button"
+            class="btn header-btn role-tertiary"
+            :data-testid="`extension-header-action-${ action.labelKey || action.label }`"
+            role="button"
+            tabindex="0"
+            :aria-label="action.label"
+            @shortkey="handleExtensionAction(action, $event)"
+            @click="handleExtensionAction(action, $event)"
+          >
+            <IconOrSvg
+              class="icon icon-lg"
+              :icon="action.icon"
+              :src="action.svg"
+              color="header"
+            />
+          </button>
+        </template>
       </div>
 
+      <!-- ===== 用户菜单（右上角头像 + 下拉） ===== -->
       <div class="center-self">
         <header-page-action-menu v-if="showPageActions" />
-        <NotificationCenter />
+
         <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
+            <!-- <img
               v-if="principal && principal.avatarSrc"
               :src="principal.avatarSrc"
               :class="{'avatar-round': principal.roundAvatar}"
@@ -685,10 +631,17 @@ export default {
             <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>
+
+          <!-- 下拉菜单内容 -->
           <template #dropdownCollection>
-            <template v-if="authEnabled">
+            <!-- <template v-if="authEnabled">
               <div class="user-info">
                 <div class="user-name">
                   <i class="icon icon-lg icon-user" /> {{ principal.loginName }}
@@ -700,28 +653,34 @@ export default {
                 </div>
               </div>
               <rc-dropdown-separator />
-            </template>
-            <rc-dropdown-item
+            </template> -->
+            <!-- <rc-dropdown-item
               v-if="showPreferencesLink"
               @click="$router.push({ name: 'prefs'})"
             >
               {{ t('nav.userMenu.preferences') }}
-            </rc-dropdown-item>
+            </rc-dropdown-item> -->
+
+            <!-- 退出登录（支持 SLO 弹窗） -->
             <rc-dropdown-item
               v-if="showAccountAndApiKeyLink"
-              @click="$router.push({ name: 'account'})"
+              @click="LogOutfn('1')"
             >
               {{ t('nav.userMenu.accountAndKeys', {}, true) }}
             </rc-dropdown-item>
+
+            <!-- 普通退出登录 -->
             <rc-dropdown-item
               v-if="authEnabled && shouldShowSloLogoutModal"
-              @click="showSloModal"
+              @click="LogOutfn('2')"
             >
               {{ t('nav.userMenu.logOut') }}
             </rc-dropdown-item>
+
+            <!-- 普通退出登录 -->
             <rc-dropdown-item
               v-else-if="authEnabled"
-              @click="$router.push(generateLogoutRoute)"
+              @click="LogOutfn('3')"
             >
               {{ t('nav.userMenu.logOut') }}
             </rc-dropdown-item>
@@ -739,6 +698,7 @@ export default {
   HEADER {
     display: flex;
     z-index: z-index('mainHeader');
+    box-shadow: 0px 3px 3px 1px rgba(0,0,0,0.12);
 
     > .spacer {
       flex: 1;
@@ -856,7 +816,7 @@ export default {
 
     > * {
       background-color: var(--header-bg);
-      border-bottom: var(--header-border-size) solid var(--header-border);
+      /* border-bottom: var(--header-border-size) solid var(--header-border); */
     }
 
     .rd-header-right {
@@ -869,7 +829,7 @@ export default {
       }
 
       > .top {
-        padding-top: 6px;
+        padding-top: 10px;
 
         INPUT[type='search']::placeholder,
         .vs__open-indicator,
@@ -906,6 +866,8 @@ export default {
         // Spacing between header buttons
         .btn:not(:last-of-type) {
           margin-right: 10px;
+          width: 30px;
+          min-width: 30px;
         }
 
         .btn:focus {
@@ -927,6 +889,8 @@ export default {
 
       .header-btn {
         width: 40px;
+        display: flex;
+        align-items: center;
       }
 
       :deep() div .btn.role-tertiary {
@@ -934,19 +898,21 @@ export default {
         border: none;
         background: var(--header-btn-bg);
         color: var(--header-btn-text);
-        padding: 0 10px;
+        padding: 0 10px 0 10px;
         line-height: 32px;
         min-height: 32px;
+        width: 30px;
+        min-width: 30px;
 
         i {
           // Ideally same height as the parent button, but this means tooltip needs adjusting (which is it's own can of worms)
           line-height: 20px;
         }
 
-        &:hover {
-          background: var(--primary);
-          color: #fff;
-        }
+        // &:hover {
+        //   background: var(--primary);
+        //   color: #fff;
+        // }
 
         &[disabled=disabled] {
           background-color: rgba(0,0,0,0.25) !important;
@@ -989,7 +955,7 @@ export default {
 
       > .user {
         outline: none;
-        width: var(--header-height);
+        /* width: var(--header-height); */
 
         .v-popper {
           display: flex;
@@ -1003,6 +969,10 @@ export default {
         .user-image {
           display: flex;
           align-items: center;
+          &:hover{
+            color: var(--primary);
+          }
+
         }
 
         &:focus {
@@ -1025,7 +995,6 @@ export default {
       > .center-self {
         align-self: center;
         display: flex;
-        gap: 1rem;
         align-items: center;
         padding-right: 1rem;
       }
@@ -1131,5 +1100,10 @@ export default {
       }
     }
   }
-
+  .login-name{
+    font-size: 14px;
+    margin-left: 5px;
+    // margin-top: 5px;
+    line-height: 20px;
+  }
 </style>

package/components/nav/HeaderPageActionMenu.vue

@@ -17,6 +17,7 @@ const pageAction = (_event: Event, action: string) => {
     :dropdown-aria-label="t('nav.actionMenu.button.label')"
     data-testid="page-actions-menu-action-button"
     button-role="tertiary"
+    :showIcon="true"
     @select="pageAction"
   />
 </template>