dashboard-shell-shell 3.0.5-test.4 → 3.0.5-test.40

package/components/form/WorkloadPorts.vue

@@ -280,145 +280,163 @@ export default {
         'show-ipam': showIpam,
       }"
     >
-      <div class="service-type">
-        <LabeledSelect
-          v-model:value="row._serviceType"
-          :mode="mode"
-          :label="t('workload.container.ports.createService')"
-          :options="serviceTypes"
-          :disabled="canNotAccessService"
-          :tooltip="serviceTypeTooltip"
-          @update:value="queueUpdate"
-        />
-      </div>
-
-      <div class="portName">
-        <LabeledInput
-          ref="name"
-          v-model:value="row.name"
-          :mode="mode"
-          :label="t('workload.container.ports.name')"
-          @update:value="queueUpdate"
-        />
-      </div>
+    
+      <div class="row mt-20">
+        <div
+          v-if="!row._showHost && row._serviceType !== 'LoadBalancer' && row._serviceType !== 'NodePort'"
+          class="add-host col"
+        >
+          <button
+            :disabled="mode==='view'"
+            type="button"
+            class="btn btn-sm role-tertiary"
+            @click="row._showHost = true"
+          >
+            {{ t('workloadPorts.addHost') }}
+          </button>
+        </div>
 
-      <div class="port">
-        <LabeledInput
-          v-model:value.number="row.containerPort"
-          :mode="mode"
-          type="number"
-          min="1"
-          max="65535"
-          placeholder="e.g. 8080"
-          :label="t('workload.container.ports.containerPort')"
-          :required="row._serviceType === 'LoadBalancer' "
-          @update:value="queueUpdate"
-        />
-      </div>
+        <div
+          v-if="showRemove"
+          class="remove"
+        >
+          <button
+            type="button"
+            class="btn role-link"
+            @click="remove(idx)"
+          >
+            {{ t('workloadPorts.remove') }}
+          </button>
+        </div>
 
-      <div class="protocol col">
-        <LabeledSelect
-          v-model:value="row.protocol"
-          :mode="mode"
-          :options="workloadPortOptions"
-          :multiple="false"
-          :label="t('workload.container.ports.protocol')"
-          @update:value="queueUpdate"
-        />
       </div>
 
-      <div
-        v-if="row._showHost"
-        class="targetPort"
-      >
-        <LabeledInput
-          ref="port"
-          v-model:value.number="row.hostPort"
-          :mode="mode"
-          type="number"
-          min="1"
-          max="65535"
-          placeholder="e.g. 80"
-          :label="t('workload.container.ports.hostPort')"
-          @update:value="queueUpdate"
-        />
+      <div class="row">
+        <div class="service-type col span-6">
+          <LabeledSelect
+            v-model:value="row._serviceType"
+            :mode="mode"
+            :label="t('workload.container.ports.createService')"
+            :options="serviceTypes"
+            :disabled="canNotAccessService"
+            :tooltip="serviceTypeTooltip"
+            @update:value="queueUpdate"
+          />
+        </div>
+    
+        <div class="portName col span-6">
+          <LabeledInput
+            ref="name"
+            v-model:value="row.name"
+            :mode="mode"
+            :label="t('workload.container.ports.name')"
+            @update:value="queueUpdate"
+          />
+        </div>
       </div>
 
-      <div
-        v-if="row._showHost"
-        class="hostip"
-      >
-        <LabeledInput
-          ref="port"
-          v-model:value="row.hostIP"
-          :mode="mode"
-          placeholder="e.g. 1.1.1.1"
-          :label="t('workload.container.ports.hostIP')"
-          @update:value="queueUpdate"
-        />
+      <div class="row">
+        <div class="port col span-6">
+          <LabeledInput
+            v-model:value.number="row.containerPort"
+            :mode="mode"
+            type="number"
+            min="1"
+            max="65535"
+            placeholder="e.g. 8080"
+            :label="t('workload.container.ports.containerPort')"
+            :required="row._serviceType === 'LoadBalancer' "
+            @update:value="queueUpdate"
+          />
+        </div>
+    
+        <div class="protocol col span-6">
+          <LabeledSelect
+            v-model:value="row.protocol"
+            :mode="mode"
+            :options="workloadPortOptions"
+            :multiple="false"
+            :label="t('workload.container.ports.protocol')"
+            @update:value="queueUpdate"
+          />
+        </div>
       </div>
 
-      <div
-        v-if="!row._showHost && row._serviceType !== 'LoadBalancer' && row._serviceType !== 'NodePort'"
-        class="add-host"
-      >
-        <button
-          :disabled="mode==='view'"
-          type="button"
-          class="btn btn-sm role-tertiary"
-          @click="row._showHost = true"
+      <div class="row">
+        <div
+          v-if="row._showHost"
+          class="targetPort col span-6"
         >
-          {{ t('workloadPorts.addHost') }}
-        </button>
-      </div>
-
-      <div v-if="row._serviceType === 'LoadBalancer' || row._serviceType === 'NodePort'">
-        <LabeledInput
-          ref="port"
-          v-model:value.number="row._listeningPort"
-          type="number"
-          :mode="mode"
-          :label="t('workload.container.ports.listeningPort')"
-          :required="row._serviceType === 'LoadBalancer' "
-          @update:value="queueUpdate"
-        />
-      </div>
-
-      <div v-if="showIpam && row._serviceType === 'LoadBalancer' && row.protocol === 'TCP'">
-        <div v-if="idx === ipamIndex">
-          <LabeledSelect
-            v-model:value="row._ipam"
+          <LabeledInput
+            ref="port"
+            v-model:value.number="row.hostPort"
             :mode="mode"
-            :options="ipamOptions"
-            :label="t('servicesPage.harvester.ipam.label')"
-            :disabled="mode === 'edit'"
+            type="number"
+            min="1"
+            max="65535"
+            placeholder="e.g. 80"
+            :label="t('workload.container.ports.hostPort')"
             @update:value="queueUpdate"
           />
         </div>
-        <div v-else>
-          <LabeledSelect
-            v-model:value="rows[ipamIndex]._ipam"
+    
+        <div
+          v-if="row._showHost"
+          class="hostip col span-6"
+        >
+          <LabeledInput
+            ref="port"
+            v-model:value="row.hostIP"
             :mode="mode"
-            :options="ipamOptions"
-            :label="t('servicesPage.harvester.ipam.label')"
-            :disabled="true"
+            placeholder="e.g. 1.1.1.1"
+            :label="t('workload.container.ports.hostIP')"
             @update:value="queueUpdate"
           />
         </div>
       </div>
 
-      <div
-        v-if="showRemove"
-        class="remove"
-      >
-        <button
-          type="button"
-          class="btn role-link"
-          @click="remove(idx)"
+      <div class="row">
+        <div
+          v-if="row._serviceType === 'LoadBalancer' || row._serviceType === 'NodePort'"
+          class="col"
         >
-          {{ t('workloadPorts.remove') }}
-        </button>
+          <LabeledInput
+            ref="port"
+            v-model:value.number="row._listeningPort"
+            type="number"
+            :mode="mode"
+            :label="t('workload.container.ports.listeningPort')"
+            :required="row._serviceType === 'LoadBalancer' "
+            @update:value="queueUpdate"
+          />
+        </div>
       </div>
+
+      <div class="row">
+        <div v-if="showIpam && row._serviceType === 'LoadBalancer' && row.protocol === 'TCP'">
+          <div v-if="idx === ipamIndex">
+            <LabeledSelect
+              v-model:value="row._ipam"
+              :mode="mode"
+              :options="ipamOptions"
+              :label="t('servicesPage.harvester.ipam.label')"
+              :disabled="mode === 'edit'"
+              @update:value="queueUpdate"
+            />
+          </div>
+          <div v-else>
+            <LabeledSelect
+              v-model:value="rows[ipamIndex]._ipam"
+              :mode="mode"
+              :options="ipamOptions"
+              :label="t('servicesPage.harvester.ipam.label')"
+              :disabled="true"
+              @update:value="queueUpdate"
+            />
+          </div>
+        </div>
+      </div>
+
     </div>
     <div
       v-if="showAdd"
@@ -447,11 +465,11 @@ $checkbox: 75;
   }
 }
 .ports-headers, .ports-row{
-  display: grid;
-  grid-template-columns: 28% 28% 15% 10% 75px 0.5fr;
-  grid-column-gap: $column-gutter;
-  margin-bottom: 10px;
-  align-items: center;
+  // display: grid;
+  // grid-template-columns: 28% 28% 15% 10% 75px 0.5fr;
+  // grid-column-gap: $column-gutter;
+  // margin-bottom: 20px;
+  // align-items: center;
   & .port{
     display: flex;
     justify-content: space-between;
@@ -475,6 +493,7 @@ $checkbox: 75;
 }
 
 .add-host {
+  margin-right: 20px;
   justify-self: center;
 }
 
@@ -492,6 +511,7 @@ $checkbox: 75;
 
 .remove BUTTON {
   padding: 0px;
+  min-width: auto;
 }
 
 .ports-row INPUT {

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

@@ -670,7 +670,8 @@ export default {
         </template>
 
         <!-- 资源搜索按钮 -->
-        <button
+        <!-- 2025/9/30 隐藏 -->
+        <!-- <button
           v-if="showSearch"
           id="header-btn-search"
           v-clean-tooltip="t('nav.resourceSearch.toolTip', {key: searchShortcut})"
@@ -685,7 +686,7 @@ export default {
           @click="openSearch()"
         >
           <i class="icon icon-search icon-lg" />
-        </button>
+        </button> -->
 
         <!-- 搜索弹窗 -->
         <app-modal
@@ -706,9 +707,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 +730,7 @@ export default {
             color="header"
           />
         </button>
+      </template>
       </div>
 
       <!-- ===== 用户菜单（右上角头像 + 下拉） ===== -->

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;
       }
     }