dashboard-shell-shell 1.0.1000000117 → 1.0.1000000118

package/components/nav/Group.vue

@@ -8,11 +8,6 @@ export default {
   emits: ['expand', 'close'],
 
   props: {
-    loginName: {
-      type:    String,
-      default: '',
-    },
-
     depth: {
       type:    Number,
       default: 0,
@@ -51,16 +46,8 @@ export default {
 
   data() {
     const id = (this.idPrefix || '') + this.group.name;
-    const icons = {
-      '虚拟机管理': 'icon-backupandsnapshot',
-      '网络管理': 'icon-networks',
-      '镜像管理': 'icon-imagelist',
-      '资源管理': 'icon-sorcetype',
-      '运维管理': 'icon-monitoringandlogging'
-    }
-    
 
-    return { id, expanded: false, icons };
+    return { id, expanded: false };
   },
 
   computed: {
@@ -192,7 +179,8 @@ export default {
           const withoutQuery = withoutHash.split('?')[0];
           const itemFullPath = this.$router.resolve(item.route).fullPath;
 
-          if (matchesNavLevel || itemFullPath === withoutQuery) {
+          // if (matchesNavLevel || itemFullPath === withoutQuery) {
+          if (matchesNavLevel || itemFullPath === withoutQuery || withoutQuery.includes(itemFullPath)) {
             return true;
           } else if (parentPath && itemFullPath === parentPath) {
             return true;
@@ -234,7 +222,6 @@ export default {
     class="accordion"
     :class="{[`depth-${depth}`]: true, 'expanded': isExpanded, 'has-children': hasChildren, 'group-highlight': isGroupActive}"
   >
-    <!-- 分组标题区 -->
     <div
       v-if="showHeader"
       class="header"
@@ -246,37 +233,26 @@ export default {
       @keyup.enter="groupSelected()"
       @keyup.space="groupSelected()"
     >
-      
-    <!-- 具名插槽 header，允许外部自定义标题内容 -->
       <slot name="header">
-
-        <!-- 如果分组有概览页（overview） 跳转到第一个子路由 -->
-        <h6 v-if="hasOverview">
-          <router-link
-            class="menuRouterLink"
-            :to="group.children[0].route"
-            :exact="group.children[0].exact"
-            :tabindex="-1"
-          >
-            <i v-if="!group.labelDisplay || (group.labelDisplay && group.labelDisplay.indexOf('</i>') === -1)" class="icon" :class="icons[group.label] ? icons[group.label] + ' init_icon' : 'icon-globe'" style="color: var(--muted);width: 32px;" />
+        <router-link
+          v-if="hasOverview"
+          :to="group.children[0].route"
+          :exact="group.children[0].exact"
+          :tabindex="-1"
+        >
+          <h6>
             <span v-clean-html="group.labelDisplay || group.label" />
-          </router-link>
-        </h6>
-        <!-- 虚拟机管理：icon-backupandsnapshot -->
-        <!-- 网络管理：icon-networks -->
-        <!-- 镜像管理：icon-imagelist -->
-        <!-- 资源管理：icon-sorcetype -->
-        <!-- 运维管理：icon-monitoringandlogging -->
-        <!-- 没有概览页的情况 -->
+          </h6>
+        </router-link>
         <h6
           v-else
+           @click="peek($event, true)"
         >
-          <i v-if="!group.labelDisplay || (group.labelDisplay && group.labelDisplay.indexOf('</i>') === -1)" class="icon" :class="icons[group.label] ? icons[group.label] + ' init_icon' : 'icon-globe'" style="color: var(--muted);width: 32px;" />
-          <span v-clean-html="group.labelDisplay || group.label" />
+        <i :class="'nav-icon icon-'+group.name.replace(/\s+/g, '').toLowerCase()" />
+        {{ group.labelDisplay || group.label }}
+          <!-- <span v-clean-html="group.labelDisplay || group.label" /> -->
         </h6>
       </slot>
-      
-      <!-- 折叠/展开图标 -->
       <i
         v-if="!onlyHasOverview && canCollapse"
         class="icon toggle toggle-accordion"
@@ -289,8 +265,6 @@ export default {
         @keyup.space="peek($event, true)"
       />
     </div>
-
-    <!-- 子列表（Accordion 内容） -->
     <ul
       v-if="isExpanded"
       class="list-unstyled body"
@@ -300,7 +274,6 @@ export default {
         v-for="(child, idx) in group[childrenKey]"
         :key="idx"
       >
-        <!-- <template v-if="!(loginName && loginName !== 'admin' && child.label === '资源大盘')"></template> -->
         <li
           v-if="child.divider"
           :key="idx"
@@ -346,19 +319,14 @@ export default {
     position: relative;
     cursor: pointer;
     color: var(--body-text);
-    height: 50px;
+    height: 33px;
+    outline: none;
 
     H6 {
       color: var(--body-text);
       user-select: none;
       text-transform: none;
       font-size: 14px;
-      .menuRouterLink {
-        color: var(--body-text);
-        user-select: none;
-        text-transform: none;
-        font-size: 14px;
-      }
     }
 
     > A {
@@ -399,9 +367,6 @@ export default {
           /* padding: 8px 0 8px 16px;
           font-weight: bold; */
           color: var(--nav-hover-color);
-          .menuRouterLink {
-            color: var(--nav-hover-color);
-          }
         }
         I{
           color: var(--nav-hover-color);
@@ -416,9 +381,6 @@ export default {
         color: var(--nav-hover-color);
         h6{
           color: var(--nav-hover-color);
-          .menuRouterLink {
-            color: var(--nav-hover-color);
-          }
         }
       }
     }
@@ -460,7 +422,6 @@ export default {
 
     &.depth-1 {
       > .header {
-        line-height: 50px;
         > H6 {
           font-size: 13px;
           line-height: 16px;
@@ -470,13 +431,11 @@ export default {
           padding: 9px 7px 8px 7px !important;
         }
       }
-
     }
 
     &:not(.depth-0) {
       > .header {
-        padding-left: 30px;
-        line-height: 50px;
+        padding-left: 10px;
         > H6 {
           // Child groups that aren't linked themselves
           display: inline-block;
@@ -487,9 +446,7 @@ export default {
           position: absolute;
           right: 0;
           top: 0;
-          padding: 0px 20px 0px 0px !important;
-          user-select: none;
-          line-height: 50px;
+          padding: 6px 8px 6px 8px;
         }
       }
     }
@@ -502,9 +459,6 @@ export default {
     A, A I {
       /* color: var(--primary-hover-text); */
       color: var(--nav-hover-color);
-      .menuRouterLink {
-        color: var(--nav-hover-color);
-      }
     }
 
     A {
@@ -534,9 +488,9 @@ export default {
       }
     }
   }
-
-  .init_icon{
+  .nav-icon{
     font-size: 32px;
-    padding-left: 0px;
+    margin-top: -11px;
+    color: #a8abb2;
   }
 </style>

package/components/nav/Header.vue

@@ -277,18 +277,6 @@ 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',
@@ -409,15 +397,11 @@ export default {
 </script>
 
 <template>
-
-  <!-- 整个页面的顶部 header -->
   <header
     ref="header"
     data-testid="header"
   >
     <div>
-
-      <!-- 顶部一级菜单（根据不同产品/集群条件决定是否显示） -->
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
     </div>
 
@@ -542,54 +526,34 @@ export default {
       </div>
     </div> -->
 
-      <!-- ===== 左侧 logo 区域 ===== -->
-    <div class="menu-spacer">
-
-      <!-- 如果是单产品模式且不是 RancherInHarvester，就显示 logo 路由跳转 -->
+      <!-- logo -->
+      <div class="menu-spacer">
       <router-link
         v-if="isSingleProduct && !isRancherInHarvester"
         :to="singleProductLogoRoute"
       >
-
-        <!-- 显示用户头像或 logo 图片 -->
-        <!-- <img
+        <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" />
       </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')"
@@ -604,8 +568,6 @@ export default {
           >
             <i class="icon icon-upload icon-lg" />
           </button>
-
-          <!-- 导入 YAML 弹窗 -->
           <app-modal
             v-if="showImportModal"
             class="import-modal"
@@ -621,7 +583,6 @@ export default {
             />
           </app-modal>
 
-          <!-- KubeShell 终端按钮 -->
           <button
             v-if="showKubeShell"
             id="btn-kubectl"
@@ -639,7 +600,6 @@ export default {
             <i class="icon icon-terminal icon-lg" />
           </button>
 
-          <!-- 下载 kubeconfig 按钮 -->
           <button
             v-if="showKubeConfig"
             v-clean-tooltip="t('nav.kubeconfig.download')"
@@ -655,7 +615,6 @@ export default {
             <i class="icon icon-file icon-lg" />
           </button>
 
-          <!-- 复制 kubeconfig 按钮 -->
           <button
             v-if="showCopyConfig"
             v-clean-tooltip="t('nav.kubeconfig.copy')"
@@ -668,14 +627,10 @@ 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"
@@ -683,7 +638,6 @@ export default {
           </button>
         </template>
 
-        <!-- 资源搜索按钮 -->
         <button
           v-if="showSearch"
           id="header-btn-search"
@@ -700,8 +654,6 @@ export default {
         >
           <i class="icon icon-search icon-lg" />
         </button>
-
-        <!-- 搜索弹窗 -->
         <app-modal
           v-if="showSearch && showSearchModal"
           class="search-modal"
@@ -716,7 +668,7 @@ export default {
         </app-modal>
       </div>
 
-      <!-- ===== 插件扩展按钮区 ===== -->
+      <!-- Extension header actions -->
       <div
         v-if="extensionHeaderActions.length"
         class="header-buttons"
@@ -745,16 +697,12 @@ export default {
         </button>
       </div>
 
-      <!-- ===== 用户菜单（右上角头像 + 下拉） ===== -->
       <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
@@ -773,11 +721,9 @@ export default {
               v-else
               class="icon icon-user icon-3x avatar"
             /> -->
-            <i class="icon icon-usericon" style="padding-bottom: 5px;" />
+            <i class="icon icon-usericon" />
             <span class="login-name">{{ principal.loginName }}</span>
           </rc-dropdown-trigger>
-
-          <!-- 下拉菜单内容 -->
           <template #dropdownCollection>
             <!-- <template v-if="authEnabled">
               <div class="user-info">
@@ -798,27 +744,21 @@ export default {
             >
               {{ t('nav.userMenu.preferences') }}
             </rc-dropdown-item> -->
-
-            <!-- 退出登录（支持 SLO 弹窗） -->
             <rc-dropdown-item
               v-if="showAccountAndApiKeyLink"
-              @click="LogOutfn('1')"
+              @click="$router.push({ name: 'account'})"
             >
               {{ t('nav.userMenu.accountAndKeys', {}, true) }}
             </rc-dropdown-item>
-
-            <!-- 普通退出登录 -->
             <rc-dropdown-item
               v-if="authEnabled && shouldShowSloLogoutModal"
-              @click="LogOutfn('2')"
+              @click="showSloModal"
             >
               {{ t('nav.userMenu.logOut') }}
             </rc-dropdown-item>
-
-            <!-- 普通退出登录 -->
             <rc-dropdown-item
               v-else-if="authEnabled"
-              @click="LogOutfn('3')"
+              @click="$router.push(generateLogoutRoute)"
             >
               {{ t('nav.userMenu.logOut') }}
             </rc-dropdown-item>
@@ -1004,8 +944,6 @@ export default {
         // Spacing between header buttons
         .btn:not(:last-of-type) {
           margin-right: 10px;
-          width: 30px;
-          min-width: 30px;
         }
 
         .btn:focus {
@@ -1027,8 +965,6 @@ export default {
 
       .header-btn {
         width: 40px;
-        display: flex;
-        align-items: center;
       }
 
       :deep() div .btn.role-tertiary {
@@ -1036,21 +972,19 @@ export default {
         border: none;
         background: var(--header-btn-bg);
         color: var(--header-btn-text);
-        padding: 0 15px 0 10px;
+        padding: 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;
@@ -1133,6 +1067,7 @@ export default {
       > .center-self {
         align-self: center;
         display: flex;
+        gap: 1rem;
         align-items: center;
         padding-right: 1rem;
       }
@@ -1241,7 +1176,7 @@ export default {
   .login-name{
     font-size: 14px;
     margin-left: 5px;
-    // margin-top: 5px;
+    margin-top: 5px;
     line-height: 20px;
   }
 </style>

package/components/nav/HeaderPageActionMenu.vue

@@ -17,7 +17,6 @@ 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

@@ -145,6 +145,9 @@ export default {
 
       const params = { ...this.$route.params };
       let resource = params.resource;
+      if (params.resource) {
+        resource = resource
+      }
 
       // Sometimes, different pages may have different namespaces to filter
       const notFilterNamespaces = this.$store.getters[`type-map/optionsFor`](resource).notFilterNamespace || [];