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

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.png'),
     };
   },
 
@@ -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,15 +413,19 @@ export default {
 </script>
 
 <template>
+
+  <!-- 整个页面的顶部 header -->
   <header
     ref="header"
     data-testid="header"
   >
     <div>
+
+      <!-- 顶部一级菜单（根据不同产品/集群条件决定是否显示） -->
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
     </div>
 
-    <div
+    <!-- <div
       class="menu-spacer"
       :class="{'isSingleProduct': isSingleProduct }"
     >
@@ -525,24 +544,55 @@ export default {
           :alt="t('branding.logos.label')"
         />
       </div>
-    </div>
+    </div> -->
 
+      <!-- ===== 左侧 logo 区域 ===== -->
+    <div class="menu-spacer">
+      <!-- 如果是单产品模式且不是 RancherInHarvester，就显示 logo 路由跳转 -->
+      <router-link
+        v-if="isSingleProduct && !isRancherInHarvester"
+        :to="singleProductLogoRoute"
+      >
+
+        <!-- 显示用户头像或 logo 图片 -->
+        <img
+          :src="userIcon"
+        >
+      </router-link>
+    </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">
+
+          <!-- 导入 YAML 按钮 -->
           <button
             v-if="showImportYaml"
             v-clean-tooltip="t('nav.import')"
@@ -575,6 +625,7 @@ export default {
             <i class="icon icon-terminal icon-lg" />
           </button>
 
+          <!-- 下载 kubeconfig 按钮 -->
           <button
             v-if="showKubeConfig"
             v-clean-tooltip="t('nav.kubeconfig.download')"
@@ -590,6 +641,7 @@ export default {
             <i class="icon icon-file icon-lg" />
           </button>
 
+          <!-- 复制 kubeconfig 按钮 -->
           <button
             v-if="showCopyConfig"
             v-clean-tooltip="t('nav.kubeconfig.copy')"
@@ -602,10 +654,14 @@ 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"
@@ -613,6 +669,7 @@ export default {
           </button>
         </template>
 
+        <!-- 资源搜索按钮 -->
         <button
           v-if="showSearch"
           id="header-btn-search"
@@ -629,9 +686,22 @@ export default {
         >
           <i class="icon icon-search icon-lg" />
         </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()"
+        >
+        </app-modal>
       </div>
 
-      <!-- Extension header actions -->
+      <!-- ===== 插件扩展按钮区 ===== -->
       <div
         v-if="extensionHeaderActions.length"
         class="header-buttons"
@@ -647,7 +717,7 @@ export default {
           :data-testid="`extension-header-action-${ action.labelKey || action.label }`"
           role="button"
           tabindex="0"
-          :aria-label="action.labelKey ? t(action.labelKey) : action.label"
+          :aria-label="action.label"
           @shortkey="handleExtensionAction(action, $event)"
           @click="handleExtensionAction(action, $event)"
         >
@@ -655,26 +725,28 @@ export default {
             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>
       </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 +757,14 @@ 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 +776,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 +821,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 +939,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 +952,7 @@ export default {
       }
 
       > .top {
-        padding-top: 6px;
+        padding-top: 10px;
 
         INPUT[type='search']::placeholder,
         .vs__open-indicator,
@@ -906,6 +989,8 @@ export default {
         // Spacing between header buttons
         .btn:not(:last-of-type) {
           margin-right: 10px;
+          width: 30px;
+          min-width: 30px;
         }
 
         .btn:focus {
@@ -927,6 +1012,8 @@ export default {
 
       .header-btn {
         width: 40px;
+        display: flex;
+        align-items: center;
       }
 
       :deep() div .btn.role-tertiary {
@@ -934,19 +1021,21 @@ export default {
         border: none;
         background: var(--header-btn-bg);
         color: var(--header-btn-text);
-        padding: 0 10px;
+        padding: 0 15px 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 +1078,7 @@ export default {
 
       > .user {
         outline: none;
-        width: var(--header-height);
+        /* width: var(--header-height); */
 
         .v-popper {
           display: flex;
@@ -1003,6 +1092,10 @@ export default {
         .user-image {
           display: flex;
           align-items: center;
+          &:hover{
+            color: var(--primary);
+          }
+
         }
 
         &:focus {
@@ -1025,7 +1118,6 @@ export default {
       > .center-self {
         align-self: center;
         display: flex;
-        gap: 1rem;
         align-items: center;
         padding-right: 1rem;
       }
@@ -1131,5 +1223,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>

package/components/nav/NamespaceFilter.vue

@@ -949,7 +949,6 @@ export default {
   .ns-filter {
     width: 280px;
     display: inline-block;
-    border-radius: var(--border-radius);
 
     .ns-glass {
       top: 0;
@@ -968,15 +967,19 @@ export default {
     }
 
     .ns-clear {
-      padding: 0 5px;
       &:hover {
         color: var(--primary);
+        cursor: pointer;
       }
     }
 
     .ns-singleton-info, .ns-clear {
       align-items: center;
       display: flex;
+      > i {
+        padding-right: 5px;
+        font-size: 10px;
+      }
     }
 
     .ns-input {
@@ -987,26 +990,24 @@ export default {
 
     .ns-filter-input {
       height: 24px;
+      border: 1px solid #d7d7d7;
+      padding: 0px 5px;
     }
 
     .ns-filter-clear {
       cursor: pointer;
       position: absolute;
       right: 10px;
-      top: 10px;
+      top: 5px;
       line-height: 24px;
       text-align: center;
-      width: 14px;
-      min-height: 14px;
-    }
-
-    .ns-chip-button {
-      min-height: 14px;
+      width: 24px;
     }
 
     .ns-dropdown-menu {
       background-color: var(--header-bg);
-      border: 1px solid var(--primary-border);
+      /* border: 1px solid var(--primary-border); */
+      border: 1px solid #d7d7d7;;
       border-bottom-left-radius: var(--border-radius);
       border-bottom-right-radius: var(--border-radius);
       color: var(--header-btn-text);
@@ -1026,10 +1027,10 @@ export default {
       }
 
       .ns-divider {
-        border-top: 1px solid var(--border);
+        /* border-top: 1px solid var(--border); */
         cursor: default;
-        margin-top: 10px;
-        padding-bottom: 10px;
+        /* margin-top: 10px; */
+        /* padding-bottom: 10px; */
       }
 
       .ns-option {
@@ -1069,7 +1070,7 @@ export default {
           &.ns-selected:not(:hover) {
             .ns-item {
               > * {
-                color: var(--primary);
+                /* color: var(--primary); */
               }
             }
 
@@ -1122,7 +1123,7 @@ export default {
       border-radius: var(--border-radius);
       color: var(--header-btn-text);
       cursor: pointer;
-      height: 40px;
+      height: 32px;
       padding: 0 10px;
       position: relative;
       z-index: z-index('dropdownOverlay');
@@ -1130,7 +1131,8 @@ export default {
       &.ns-open {
         border-bottom-left-radius: 0;
         border-bottom-right-radius: 0;
-        border-color: var(--primary-border);
+        /* border-color: var(--primary-border); */
+        border-color: #d7d7d7;
       }
 
       > .ns-values {
@@ -1169,12 +1171,13 @@ export default {
           border-radius: 5px;
           color: var(--tag-text);
           display: flex;
-          line-height: 20px;
+          /* line-height: 20px; */
           padding: 2px 5px;
           white-space: nowrap;
 
           > i {
             margin-left: 5px;
+            font-size: 8px;
 
             &:hover {
               color: var(--primary);