dashboard-shell-shell 3.0.5-test.9 → 3.0.5-tsh.10

package/components/form/ValueFromResource.vue

@@ -284,128 +284,141 @@ export default {
 
 <template>
   <div class="var-row">
-    <div class="type">
-      <LabeledSelect
-        v-model:value="type"
-        :mode="mode"
-        :multiple="false"
-        :options="options"
-        option-label="label"
-        :searchable="false"
-        :reduce="e=>e.value"
-        :label="t('workload.container.command.fromResource.type')"
-        @update:value="updateRow"
-      />
-    </div>
-
-    <div
-      v-if="!hideVariableName"
-      class="name"
-    >
-      <LabeledInput
-        v-model:value="name"
-        :label="nameLabel"
-        :placeholder="t('workload.container.command.fromResource.name.placeholder')"
-        :mode="mode"
-        @update:value="updateRow"
-      />
-    </div>
-
-    <div
-      v-if="type==='simple'"
-      class="single-value"
-    >
-      <LabeledInput
-        v-model:value="valStr"
-        :label="t('workload.container.command.fromResource.value.label')"
-        :placeholder="t('workload.container.command.fromResource.value.placeholder')"
-        :mode="mode"
-        @update:value="updateRow"
-      />
+    <div class="row">
+      <div class="remove">
+        <button
+          v-if="!isView"
+          type="button"
+          class="btn role-link"
+          @click.stop="$emit('remove')"
+        >
+          {{ t('generic.remove') }}
+        </button>
+      </div>
     </div>
 
-    <template v-else-if="needsSource">
-      <div :class="{'single-value': type === 'configMapRef' || type === 'secretRef'}">
+    <div class="row">
+      <div class="type span-6 col">
         <LabeledSelect
-          v-model:value="referenced"
-          :options="sourceOptions"
-          :multiple="false"
-          :get-option-label="opt=>get(opt, 'metadata.name') || opt"
-          :get-option-key="opt=>opt.id|| opt"
+          v-model:value="type"
           :mode="mode"
-          :label="sourceLabel"
-          :loading="loading"
-        />
-      </div>
-      <div v-if="type!=='secretRef' && type!== 'configMapRef'">
-        <LabeledSelect
-          v-model:value="key"
           :multiple="false"
-          :options="keys"
-          :mode="mode"
+          :options="options"
           option-label="label"
-          :label="t('workload.container.command.fromResource.key.label')"
-          :loading="loading"
+          :searchable="false"
+          :reduce="e=>e.value"
+          :label="t('workload.container.command.fromResource.type')"
           @update:value="updateRow"
         />
       </div>
-    </template>
-
-    <template v-else-if="type==='resourceFieldRef'">
-      <div>
+  
+      <div
+        v-if="!hideVariableName"
+        class="name span-6 col"
+      >
         <LabeledInput
-          v-model:value="refName"
-          :label="t('workload.container.command.fromResource.containerName')"
-          :placeholder="t('workload.container.command.fromResource.source.placeholder')"
+          v-model:value="name"
+          :label="nameLabel"
+          :placeholder="t('workload.container.command.fromResource.name.placeholder')"
           :mode="mode"
           @update:value="updateRow"
         />
       </div>
-      <div>
-        <LabeledSelect
-          v-model:value="key"
-          :label="t('workload.container.command.fromResource.key.label')"
-          :multiple="false"
-          :options="resourceKeyOpts"
-          :mode="mode"
-          :searchable="false"
-          :placeholder="t('workload.container.command.fromResource.key.placeholder', null, true)"
-          @update:value="updateRow"
-        />
-      </div>
-    </template>
+    </div>
 
-    <template v-else>
-      <div class="single-value">
+    <div class="row">
+      <div
+        v-if="type==='simple'"
+        class="single-value span-6 col"
+      >
         <LabeledInput
-          v-model:value="fieldPath"
-          :placeholder="t('workload.container.command.fromResource.key.placeholder', null, true)"
-          :label="t('workload.container.command.fromResource.key.label')"
+          v-model:value="valStr"
+          :label="t('workload.container.command.fromResource.value.label')"
+          :placeholder="t('workload.container.command.fromResource.value.placeholder')"
           :mode="mode"
           @update:value="updateRow"
         />
       </div>
-    </template>
-    <div class="remove">
-      <button
-        v-if="!isView"
-        type="button"
-        class="btn role-link"
-        @click.stop="$emit('remove')"
-      >
-        {{ t('generic.remove') }}
-      </button>
+  
+      <template v-else-if="needsSource">
+        <div
+          :class="{'single-value': type === 'configMapRef' || type === 'secretRef'}"
+          class="span-6 col"
+        >
+          <LabeledSelect
+            v-model:value="referenced"
+            :options="sourceOptions"
+            :multiple="false"
+            :get-option-label="opt=>get(opt, 'metadata.name') || opt"
+            :get-option-key="opt=>opt.id|| opt"
+            :mode="mode"
+            :label="sourceLabel"
+            :loading="loading"
+          />
+        </div>
+        <div
+          v-if="type!=='secretRef' && type!== 'configMapRef'"
+          class="span-6 col"
+        >
+          <LabeledSelect
+            v-model:value="key"
+            :multiple="false"
+            :options="keys"
+            :mode="mode"
+            option-label="label"
+            :label="t('workload.container.command.fromResource.key.label')"
+            :loading="loading"
+            @update:value="updateRow"
+          />
+        </div>
+      </template>
+  
+      <template v-else-if="type==='resourceFieldRef'">
+        <div class="span-6 col">
+          <LabeledInput
+            v-model:value="refName"
+            :label="t('workload.container.command.fromResource.containerName')"
+            :placeholder="t('workload.container.command.fromResource.source.placeholder')"
+            :mode="mode"
+            @update:value="updateRow"
+          />
+        </div>
+        <div class="span-6 col">
+          <LabeledSelect
+            v-model:value="key"
+            :label="t('workload.container.command.fromResource.key.label')"
+            :multiple="false"
+            :options="resourceKeyOpts"
+            :mode="mode"
+            :searchable="false"
+            :placeholder="t('workload.container.command.fromResource.key.placeholder', null, true)"
+            @update:value="updateRow"
+          />
+        </div>
+      </template>
+  
+      <template v-else>
+        <div class="single-value span-6 col">
+          <LabeledInput
+            v-model:value="fieldPath"
+            :placeholder="t('workload.container.command.fromResource.key.placeholder', null, true)"
+            :label="t('workload.container.command.fromResource.key.label')"
+            :mode="mode"
+            @update:value="updateRow"
+          />
+        </div>
+      </template>
     </div>
   </div>
 </template>
 
 <style lang='scss' scoped>
 .var-row{
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr 1fr 100px;
-  grid-column-gap: 20px;
-  margin-bottom: 10px;
-  align-items: center;
+  // display: grid;
+  // grid-template-columns: 1fr 1fr 1fr 1fr 100px;
+  // grid-column-gap: 20px;
+  // margin-bottom: 10px;
+  // align-items: center;
 
   .single-value {
     grid-column: span 2;
@@ -413,6 +426,7 @@ export default {
 
   .remove BUTTON {
     padding: 0px;
+    min-width: auto;
   }
 }
 

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',
 
@@ -56,7 +58,8 @@ export default {
       '网络管理': 'icon-networks',
       '镜像管理': 'icon-imagelist',
       '资源管理': 'icon-sorcetype',
-      '运维管理': 'icon-monitoringandlogging'
+      '运维管理': 'icon-monitoringandlogging',
+      '日志管理': 'icon-new-Logging'
     }
     
 
@@ -178,6 +181,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 +205,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

@@ -80,7 +80,7 @@ export default {
       ctx:                    this,
       showImportModal:        false,
       showSearchModal:        false,
-      userIcon:               require('@shell/assets/images/logo.png'),
+      userIcon:               require('@shell/assets/images/logo.svg'),
     };
   },
 
@@ -277,14 +277,14 @@ export default {
 
   methods: {
 
-    LogOutfn (type) {
-      sessionStorage.removeItem('TOPLEVELPERMISSIONS')
+    LogOutfn(type) {
+      sessionStorage.removeItem('TOPLEVELPERMISSIONS');
       if (type === '1') {
-        this.$router.push({ name: 'account'})
+        this.$router.push({ name: 'account' });
       } else if (type === '2') {
-        this.showSloModal()
+        this.showSloModal();
       } else if (type === '3') {
-        this.$router.push(this.generateLogoutRoute)
+        this.$router.push(this.generateLogoutRoute);
       }
     },
 
@@ -413,160 +413,35 @@ 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 }"
-    >
-      <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
         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" />
 
@@ -575,10 +450,9 @@ export default {
         v-if="showFilter"
         class="top"
       >
-
         <!-- 如果集群就绪 + 当前产品支持命名空间过滤器 或 Explorer 模式 -->
         <NamespaceFilter v-if="clusterReady && currentProduct && (currentProduct.showNamespaceFilter || isExplorer)" />
-        
+
         <!-- 否则显示工作空间切换器 -->
         <WorkspaceSwitcher v-else-if="clusterReady && currentProduct && currentProduct.showWorkspaceSwitcher" />
       </div>
@@ -588,12 +462,10 @@ export default {
         v-if="currentCluster && !simple"
         class="header-buttons"
       >
-
         <!-- 如果当前产品支持集群切换器 -->
         <template v-if="currentProduct && currentProduct.showClusterSwitcher">
-
           <!-- 导入 YAML 按钮 -->
-          <button
+          <!-- <button
             v-if="showImportYaml"
             v-clean-tooltip="t('nav.import')"
             :disabled="!importEnabled"
@@ -606,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})"
@@ -623,10 +495,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 +511,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"
@@ -654,23 +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})"
@@ -685,7 +556,7 @@ export default {
           @click="openSearch()"
         >
           <i class="icon icon-search icon-lg" />
-        </button>
+        </button> -->
 
         <!-- 搜索弹窗 -->
         <app-modal
@@ -697,8 +568,7 @@ export default {
           :trigger-focus-trap="true"
           return-focus-selector="#header-btn-search"
           @close="hideSearch()"
-        >
-        </app-modal>
+        />
       </div>
 
       <!-- ===== 插件扩展按钮区 ===== -->
@@ -706,28 +576,33 @@ export default {
         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.label"
-          @shortkey="handleExtensionAction(action, $event)"
-          @click="handleExtensionAction(action, $event)"
         >
-          <IconOrSvg
-            class="icon icon-lg"
-            :icon="action.icon"
-            :src="action.svg"
-            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>
 
       <!-- ===== 用户菜单（右上角头像 + 下拉） ===== -->
@@ -738,7 +613,6 @@ export default {
           v-if="showUserMenu"
           :aria-label="t('nav.userMenu.label')"
         >
-          
           <!-- 头像触发按钮 -->
           <rc-dropdown-trigger
             ghost
@@ -758,7 +632,10 @@ 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"
+              style="padding-bottom: 5px;"
+            />
             <span class="login-name">{{ principal.loginName }}</span>
           </rc-dropdown-trigger>
 
@@ -1021,7 +898,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;