dashboard-shell-shell 3.0.5-test.5 → 3.0.5-test.51

package/components/formatter/WorkloadHealthScale.vue

@@ -204,6 +204,7 @@ export default {
     <div
       :id="id"
       class="hs-popover__content"
+      style="width: auto;padding-right: 10px;"
       :class="{expanded, [id]:true}"
     >
       <div>
@@ -212,14 +213,14 @@ export default {
           :key="i"
           class="counts"
         >
-          <span class="counts-label">{{ obj.label }}</span>
-          <span>{{ obj.value }}</span>
+          <span class="counts-label" style="white-space: normal;">{{ obj.label }}</span>
+          <span style="white-space: normal;">{{ obj.value }}</span>
         </div>
         <div
           v-if="canScale"
           class="text-center scale"
         >
-          <span>{{ t('tableHeaders.scale') }} </span>
+          <span style="white-space: nowrap;margin-right: 5px;">{{ t('tableHeaders.scale') }} </span>
           <PlusMinus
             :value="row.spec.replicas"
             :disabled="disabled"

package/components/nav/Group.vue

@@ -1,5 +1,7 @@
 <script>
 import Type from '@shell/components/nav/Type';
+import { menuRouteMap } from '@shell/config/menuRouteMap';
+
 export default {
   name: 'Group',
 
@@ -178,6 +180,7 @@ export default {
 
       let parentPath = '';
       const cluster = this.$route.params?.cluster;
+      const resource = this.$route?.params?.resource || ''
 
       // Where we use nested route configuration, consider the parent route when trying to identify the nav location
       if (this.$route.matched.length > 1) {
@@ -201,6 +204,9 @@ export default {
             return true;
           } else if (parentPath && itemFullPath === parentPath) {
             return true;
+          // === 新增映射逻辑 ===
+          } else if (menuRouteMap[item.name] && menuRouteMap[item.name].includes(resource)) {
+            return true;
           }
         }
       }

package/components/nav/Header.vue

@@ -425,128 +425,7 @@ export default {
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
     </div>
 
-    <!-- <div
-      class="menu-spacer"
-      :class="{'isSingleProduct': isSingleProduct }"
-    >
-      <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')"
-        />
-        <img
-          v-else
-          class="side-menu-logo"
-          :src="isSingleProduct.logo"
-          :alt="t('branding.logos.label')"
-        >
-      </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> -->
-
-      <!-- ===== 左侧 logo 区域 ===== -->
+    <!-- ===== 左侧 logo 区域 ===== -->
     <div class="menu-spacer">
       <!-- 如果是单产品模式且不是 RancherInHarvester，就显示 logo 路由跳转 -->
       <router-link
@@ -593,7 +472,7 @@ export default {
         <template v-if="currentProduct && currentProduct.showClusterSwitcher">
 
           <!-- 导入 YAML 按钮 -->
-          <button
+          <!-- <button
             v-if="showImportYaml"
             v-clean-tooltip="t('nav.import')"
             :disabled="!importEnabled"
@@ -606,9 +485,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})"
@@ -623,10 +502,10 @@ export default {
             @click="currentCluster.openShell()"
           >
             <i class="icon icon-terminal icon-lg" />
-          </button>
+          </button> -->
 
           <!-- 下载 kubeconfig 按钮 -->
-          <button
+          <!-- <button
             v-if="showKubeConfig"
             v-clean-tooltip="t('nav.kubeconfig.download')"
             :disabled="!kubeConfigEnabled"
@@ -639,10 +518,10 @@ export default {
             @click="currentCluster.downloadKubeConfig()"
           >
             <i class="icon icon-file icon-lg" />
-          </button>
+          </button> -->
 
           <!-- 复制 kubeconfig 按钮 -->
-          <button
+          <!-- <button
             v-if="showCopyConfig"
             v-clean-tooltip="t('nav.kubeconfig.copy')"
             :disabled="!kubeConfigEnabled"
@@ -655,22 +534,21 @@ export default {
             @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})"
@@ -685,7 +563,7 @@ export default {
           @click="openSearch()"
         >
           <i class="icon icon-search icon-lg" />
-        </button>
+        </button> -->
 
         <!-- 搜索弹窗 -->
         <app-modal
@@ -706,9 +584,10 @@ export default {
         v-if="extensionHeaderActions.length"
         class="header-buttons"
       >
+      <template v-for="action, i in extensionHeaderActions" :key="`${action.label}${i}`">
+        <!-- kubectl-explain.action | 2025/9/30隐藏 -->
         <button
-          v-for="action, i in extensionHeaderActions"
-          :key="`${action.label}${i}`"
+          v-if="action.labelKey !== 'kubectl-explain.action'"
           v-clean-tooltip="handleExtensionTooltip(action)"
           v-shortkey="action.shortcutKey"
           :disabled="action.enabled ? !action.enabled(ctx) : false"
@@ -728,6 +607,7 @@ export default {
             color="header"
           />
         </button>
+      </template>
       </div>
 
       <!-- ===== 用户菜单（右上角头像 + 下拉） ===== -->
@@ -1021,7 +901,7 @@ export default {
         border: none;
         background: var(--header-btn-bg);
         color: var(--header-btn-text);
-        padding: 0 15px 0 10px;
+        padding: 0 10px 0 10px;
         line-height: 32px;
         min-height: 32px;
         width: 30px;

package/components/nav/NamespaceFilter.vue

@@ -748,7 +748,7 @@ export default {
         data-testid="namespaces-values-label"
         class="ns-values"
       >
-        {{ value[0].label }}
+        {{ value[0].label.replace('harvester', 'cloud') }}
       </div>
 
       <!-- All the selected namespaces -->
@@ -774,20 +774,18 @@ export default {
           :data-testid="`namespaces-value-${j}`"
           class="ns-value"
         >
-          <div>{{ ns.label }}</div>
+          <div>{{ ns.label.replace('harvester', 'cloud') }}</div>
           <!-- block user from removing the last selection if ns forced filtering is on -->
-          <RcButton
+          <i
             v-if="!namespaceFilterMode || value.length > 1"
             small
             ghost
-            class="ns-chip-button"
+            class="ns-chip-button icon icon-close"
             :data-testid="`namespaces-values-close-${j}`"
             @click="removeOption(ns, $event)"
             @keydown.enter.space.stop="removeOption(ns, $event)"
             @mousedown="handleValueMouseDown(ns, $event)"
-          >
-            <i class="icon icon-close" />
-          </RcButton>
+          />
         </div>
       </div>
 
@@ -836,19 +834,15 @@ export default {
             @click="focusFilter"
             @keydown="inputKeyHandler($event)"
           >
-          <RcButton
+          <i
             v-if="hasFilter"
             small
             ghost
-            class="ns-filter-clear"
+            class="ns-filter-clear icon icon-close"
             :aria-label="t('namespaceFilter.button.clearFilter')"
             @click="clearFilter"
             @keydown.enter.stop="clearFilter"
-          >
-            <i
-              class="icon icon-close"
-            />
-          </RcButton>
+          />
         </div>
         <div
           v-if="namespaceFilterMode"
@@ -859,7 +853,7 @@ export default {
             class="icon icon-info"
           />
         </div>
-        <RcButton
+        <div
           v-else
           small
           ghost
@@ -871,8 +865,9 @@ export default {
         >
           <i
             class="icon icon-close"
+            @click="clear()"
           />
-        </RcButton>
+        </div>
       </div>
       <div class="ns-divider mt-0" />
       <div
@@ -889,12 +884,12 @@ export default {
           v-for="(opt, i) in cachedFiltered"
           :key="opt.id"
         >
-          <hr
+          <div
             v-if="opt.kind === NAMESPACE_FILTER_KINDS.DIVIDER"
             role="separator"
             aria-orientation="horizontal"
             class="ns-divider"
-          >
+          />
           <div
             v-else
             :id="opt.elementId"
@@ -919,7 +914,7 @@ export default {
                 v-if="opt.kind === NAMESPACE_FILTER_KINDS.NAMESPACE"
                 class="icon icon-folder"
               />
-              <div>{{ opt.label }}</div>
+              <div>{{ opt.label.replace('harvester', 'cloud') }}</div>
               <i
                 v-if="opt.selected"
                 class="icon icon-checkmark"
@@ -949,7 +944,6 @@ export default {
   .ns-filter {
     width: 280px;
     display: inline-block;
-    border-radius: var(--border-radius);
 
     .ns-glass {
       top: 0;
@@ -968,9 +962,9 @@ export default {
     }
 
     .ns-clear {
-      padding: 0 5px;
       &:hover {
         color: var(--primary);
+        cursor: pointer;
       }
     }