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

package/components/ResourceDetail/Masthead/legacy.vue

@@ -254,7 +254,7 @@ export default {
     },
 
     parent() {
-      const displayName = this.value?.parentNameOverride || this.$store.getters['type-map/labelFor'](this.schema);
+      let displayName = this.value?.parentNameOverride || this.$store.getters['type-map/labelFor'](this.schema);
       const product = this.$store.getters['currentProduct'].name;
 
       const defaultLocation = {
@@ -418,14 +418,14 @@ export default {
     demoDisplay() {
       const product = this.$store.getters['productId'];
 
-      const resources = this.location?.params?.resource || ''
+      const resources = this.location?.params?.resource || this.$route.params?.resource || ''
 
       const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], resources);
 
       if (productId === undefined) {
         return '';
       }
-      const parts = productId.split('::');
+      const parts = productId?.split('::') || [];
       const newString = 'root';
 
       if (!parts?.includes(newString)) {
@@ -441,9 +441,10 @@ export default {
     menuIcon() {
       const product = this.$store.getters['productId'];
 
-      const resources = this.location?.params?.resource || ''
+      const resources = this.location?.params?.resource || this.$route.params?.resource || ''
 
-      return this.$store.getters['type-map/groupsForVirTypes'](product, resources);
+
+      return this.$store.getters['type-map/groupsForVirTypes'](product, resources) || 'default menuIcon';
     },
 
     location() {
@@ -506,7 +507,7 @@ export default {
           <span>/</span>
         </span>
         <span class="excram-last-name">
-          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent.displayName }}
+          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent?.displayName }}
         </span>
       </div>
     <header>
@@ -530,7 +531,7 @@ export default {
                   :class="'icon-'+ menuIcon + ' detailIcon'"
                 />
               </span>
-              <span class="detailIcon-span-title">{{ realMode=== 'create'? '创建': '' }}{{ parent.displayName }}{{ realMode=== 'create'? '': '名称:' }}</span>
+              <span class="detailIcon-span-title">{{ realMode=== 'create'? '创建': '' }}{{ parent?.displayName }}{{ realMode=== 'create'? '': '名称:' }}</span>
               <span v-if="realMode !== 'create'">
                 <span v-if="value.detailPageHeaderActionOverride && value.detailPageHeaderActionOverride(realMode)">{{ value.detailPageHeaderActionOverride(realMode) }}</span>
                 <t

package/components/ResourceDetail/legacy.vue

@@ -523,21 +523,21 @@ export default {
     />
 
     <component
-      :is="showComponent"
-      v-else
-      ref="comp"
-      v-model:value="value"
-      v-bind="$data"
-      :done-params="doneParams"
-      :done-route="doneRoute"
-      :mode="mode"
-      :initial-value="initialModel"
-      :live-value="liveModel"
-      :real-mode="realMode"
-      :class="{'flex-content': flexContent}"
-      @update:value="$emit('input', $event)"
-      @update:mode="setMode"
-      @set-subtype="setSubtype"
+    :is="showComponent"
+    v-else
+    ref="comp"
+    v-model:value="value"
+    v-bind="$data"
+    :done-params="doneParams"
+    :done-route="doneRoute"
+    :mode="mode"
+    :initial-value="initialModel"
+    :live-value="liveModel"
+    :real-mode="realMode"
+    :class="{'flex-content': flexContent}"
+    @update:value="$emit('input', $event)"
+    @update:mode="setMode"
+    @set-subtype="setSubtype"
     />
 
     <button

package/components/ResourceList/Masthead.vue

@@ -156,37 +156,36 @@ export default {
     demoDisplay() {
 
       const product = this.$store.getters['productId'];
-      const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], this._createLocation.params.resource);
-      const parts = productId?.split('::');
-      const newString = 'root';
-
-      // const product = this.$store.getters['productId'];
-      // const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], this._createLocation.params.resource);
+      const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], this._createLocation?.params?.resource);
+      console.log(product, 'product')
+      console.log(productId, 'productId')
+      console.log(this._createLocation?.params?.resource, 'this._createLocation?.params?.resource')
 
-      // const parts = productId?.split('::') || [];
-      // const newString = 'root';
+      const parts = productId?.split('::') || [];
+      const newString = 'root';
 
+      if (!parts) {
+        if (this.$route.path.includes('/c/local/explorer/secret')) {
+          parts = ['storage']          
+        }
+      }
       
       const breadcrumbList = {
         'harvesterhci.io.management.cluster': {
           origin: 'Harvester 集群',
           bread: ['虚拟化管理'],
-          description: '提供虚拟化集群的实时健康状态监控、版本号管理及资源负载管理，支持批量导入/删除集群、配置调优与权限分级功能，实现高效运维管控。'
         },
         'management.cattle.io.user': {
           origin: '用户',
           bread: ['用户 & 认证'],
-          description: '用于管理用户账号，支持创建、维护用户信息，可设置用户权限、管理密码等，保障系统资源仅由授权用户访问，提升系统安全性。'
         },
         'management.cattle.io.setting':{
           origin: '基础设置',
           bread: ['全局设置'],
-          description: '统一配置平台基础选项与全局设置，支持CA证书、密码规则、域名、Token时效等核心配置。'
         },
         'management.cattle.io.feature':{
           origin: '功能开关',
           bread: ['全局设置'],
-          description: '还没有添加描述。。。。'
         },
       }
       const resourcePath = this.$route.params.resource || ''
@@ -194,7 +193,6 @@ export default {
       const breadcrumb = []
       if (breadcrumbList[resourcePath] && Object.keys(breadcrumbList[resourcePath]).length > 0) {
         breadcrumb.push(...breadcrumbList[resourcePath].bread)
-        this.description = breadcrumbList[resourcePath].description
         return breadcrumb
       } else {
         if (!parts?.includes(newString)) {
@@ -261,8 +259,6 @@ export default {
         for (const entry of entries) {
           const width = entry?.contentRect?.width && entry.contentRect.width > 0 ? entry.contentRect.width + 10 : 0
 
-          console.log(width, ' width----------------------------')
-
           this.$store.commit('type-map/setActionsWidth', width)
         }
       })

package/components/ResourceTable.vue

@@ -689,6 +689,22 @@ export default {
       />
     </template>
 
+    <template
+      v-if="showGrouping"
+      #header-button-left
+    >
+      <slot
+        name="header-button-left"
+      />
+    </template>
+
+    <template #banner>
+      <slot
+        name="banner"
+      />
+    </template>
+
+
     <template
       v-if="externalPaginationEnabled"
       #watch-controls

package/components/SideNav.vue

@@ -244,31 +244,31 @@ export default {
 
       replaceWith(this.groups, ...sortBy(out, ['weight:desc', 'label']));
 
-      // if (this.principal.loginName !== 'admin') {
-      //   // 递归过滤函数（根据 label）
-      //   this.groups = this.filterMenus(this.groups);
-      // }
+
+      if (sessionStorage.getItem('TOPLEVELPERMISSIONS') !== 'superadmin') {
+        // 递归过滤函数（根据 label）
+        this.groups = this.filterMenus(this.groups);
+      }
       
 
       this.gettingGroups = false;
     },
 
-    // filterMenus(menus) {
-    //   return menus
-    //     .filter(item => item.label !== 'RBAC') // 过滤掉顶层 RBAC
-    //     .map(item => {
-    //       let newItem = { ...item };
-    //       if (newItem.children) {
-    //         // 过滤掉 children 里的 "资源大盘"
-    //         newItem.children = newItem.children.filter(
-    //           child => child.label !== '资源大盘'
-    //         );
-    //         // 递归处理剩下的 children
-    //         newItem.children = filterMenus(newItem.children);
-    //       }
-    //       return newItem;
-    //     });
-    // },
+    filterMenus(menus) {
+      return menus.filter(item => item.name !== 'inUse' && item.name !== 'apps') // 过滤掉顶层 inUse 和 apps
+        // .map(item => {
+        //   let newItem = { ...item };
+        //   if (newItem.children) {
+        //     // 过滤掉 children 里的 "资源大盘"
+        //     newItem.children = newItem.children.filter(
+        //       child => child.label !== '资源大盘'
+        //     );
+        //     // 递归处理剩下的 children
+        //     newItem.children = filterMenus(newItem.children);
+        //   }
+        //   return newItem;
+        // });
+    },
 
     getProductsGroups(out, loadProducts, namespaceMode, productMap) {
       const clusterId = this.$store.getters['clusterId'];
@@ -436,7 +436,7 @@ export default {
     :aria-label="t('nav.ariaLabel.sideNav')"
   >
     <div class="side-all-title">
-      {{ prod == 'Cloud' && currentCluster ? '控制台' : prod }}
+      {{ (prod == 'Cloud' || prod == 'Harvester') && currentCluster ? '控制台' : prod }}
     </div>
 
     <!-- Actual nav -->

package/components/SingleClusterInfo.vue

@@ -148,7 +148,8 @@ export default {
           :to="clusterToolsLink"
           class="cluster-link"
         >
-          {{ t('nav.clusterTools') }}
+          <!-- 禅道 3539 隐藏集群工具 -->
+          <!-- {{ t('nav.clusterTools') }} -->
         </router-link>
       </div>
     </div>

package/components/SortableTable/THead.vue

@@ -208,9 +208,54 @@ export default {
         return null;
       }
 
+      // 创建英文到中文的映射
+      const tooltipMap = {
+        'The minimum number of pods that must be available': '必须可用的 Pod 最小数量',
+        'The maximum number of pods that may be unavailable': '允许不可用的 Pod 最大数量',
+        'Calculated number of pods that may be disrupted at this time': '当前允许中断的 Pod 数量',
+        'Request represents a minimum amount of cpu/memory that a container may consume': 'Request 表示容器必须保证的最小 CPU/内存资源量',
+        'Limits control the maximum amount of cpu/memory that a container may use independent of contention on the node': 'Limits 控制容器可使用的 CPU/内存最大资源量，该限制与节点上的资源竞争情况无关',
+        'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object': '如果引用对象的一部分而不是整个对象，则此字符串应包含有效的JSON/Go字段访问语句，例如desiredState.manifest.containers[2]。例如，如果对象引用指向pod中的一个容器，则其值为：“spec.containers{name}”（其中“name”表示触发事件的容器的名称），或者如果没有指定容器名称，则为“spec.containers[2]”（此pod中索引为2的容器）。选择此语法只是为了有一些定义良好的方式来引用对象的一部分',
+        'The number of times this event has occurred': '此事件发生的次数',
+        'The component reporting this event. Should be a short machine understandable string': '用于报告此事件的组件名称，应为简短且可被程序识别的字符串',
+        'The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)': '事件首次被记录的时间。（服务器接收时间为TypeMeta。）',
+        'Information when was the last time the job was successfully scheduled': '上次成功调度的任务信息',
+        'The schedule in Cron format, see https://en.wikipedia.org/wiki/Cron': '以 Cron 格式表示的调度，详见 https://en.wikipedia.org/wiki/Cron',
+        'The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and ready': '运行该守护 Pod 且至少有一个 Pod 就绪的节点数量',
+        'The number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/': '运行至少一个守护 Pod 且应运行该 Pod 的节点数量。详情：https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/',
+        'The total number of nodes that should be running the daemon pod (including nodes correctly running the daemon pod). More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/': '应运行该守护 Pod 的节点总数（含已正确运行的节点）。详情：https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/',
+        'Number of the pod with ready state': '就绪 Pod 数量',
+        'Total number of non-terminated pods targeted by this deployment that have the desired template spec': '该 Deployment 管理的符合模板规范的未终止 Pod 总数',
+        'Total number of available pods (ready for at least minReadySeconds) targeted by this deployment': '该 Deployment 管理的可用 Pod 数（至少就绪 minReadySeconds 秒）',
+        'The number of pods which reached phase Succeeded. The value increases monotonically for a given spec. However, it may decrease in reaction to scale down of elastic indexed jobs': '已完成（Succeeded）的 Pod 数量，通常单调增加，但弹性索引 Job 缩减时可能减少。',
+        'The aggregate readiness state of this pod for accepting traffic': 'Pod 接收流量的就绪状态',
+        'The number of times the containers in this pod have been restarted and when the last container in this pod has restarted': 'Pod 容器重启次数及最后重启时间',
+        'podIP address allocated to the pod. Routable at least within the cluster. Empty if not yet allocated': 'Pod 分配的 IP 地址（集群内可路由），未分配时为空。',
+        'phase represents the current phase of PersistentVolumeClaim': 'phase 表示 PersistentVolumeClaim 的当前阶段',
+        'volumeName is the binding reference to the PersistentVolume backing this claim': 'volumeName是支持此声明的持久卷的绑定引用',
+        'capacity represents the actual resources of the underlying volume': 'capacity 表示底层卷的实际资源',
+        'accessModes contains the actual access modes the volume backing the PVC has. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1': '卷的实际访问模式（支撑该 PVC）。详情：https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1',
+        'StorageClass of the pvc': 'PVC 的存储类',
+        'VolumeAttributesClass of the pvc': 'PVC 的卷属性类',
+        'volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec': 'PVC 卷模式，未指定时默认为 Filesystem',
+        'Selects the pods to which this NetworkPolicy object applies.  The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods.  In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace': '选择此 NetworkPolicy 作用的 Pod。所选 Pod 会应用所有 ingress 规则。多个 NetworkPolicy 可选择同一 Pod 集合，其 ingress 规则会叠加。该字段必填，空 podSelector 匹配命名空间内所有 Pod。',
+        'CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata ': '对象创建时间的时间戳（UTC，RFC3339 格式），表示对象创建时的服务器时间。  系统自动填充，仅可读，客户端不可设置，不保证跨操作的先后顺序。列表对象该字段为 null。  更多信息：https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata',
+        'The time at which the most recent occurrence of this event was recorded': '事件最近记录时间',
+      };
+
       const exists = this.$store.getters['i18n/exists'];
 
-      return exists(col.tooltip) ? this.t(col.tooltip) : col.tooltip;
+      // 如果 tooltip 是语言包键名
+      if (exists(col.tooltip)) {
+        return this.t(col.tooltip);
+      }
+
+      // 如果 tooltip 是英文文本，使用映射
+      if (tooltipMap[col.tooltip]) {
+        return tooltipMap[col.tooltip];
+      }
+      
+      return col.tooltip; // 回退到原始文本
     },
   }
 

package/components/SortableTable/index.vue

@@ -654,6 +654,14 @@ export default {
     namespaces() {
       return this.$store.getters['activeNamespaceCache'];
     },
+    
+    // 正确的总数显示
+    totalCount() {
+      if (this.externalPaginationEnabled && this.externalPaginationResult) {
+        return this.externalPaginationResult.total || this.externalPaginationResult.count || 0;
+      }
+      return this.rows ? this.rows.length : 0;
+    },
 
     initalLoad() {
       return !!(!this.isLoading && !this._didinit && this.rows?.length);
@@ -884,6 +892,14 @@ export default {
     //     this.$router.replace(route);
     //   }
     // },
+    // 设置当前页码
+    setPage(pageNum) {
+      if (pageNum >= 1 && pageNum <= this.totalPages) {
+        this.page = pageNum;
+        this.inputPage = ''; // 清空输入框
+        this.debouncedPaginationChanged();
+      }
+    },
     onTableScroll(table, e) {
       // 记录最后滚动的距离
       let lastScrollTop = 0;
@@ -1074,12 +1090,22 @@ export default {
       if ( col.labelKey ) {
         return this.t(col.labelKey, undefined, true);
       } else if ( col.label ) {
-        return col.label;
+        // 判断 label 是否为中文
+        if (this.isChinese(col.label)) {
+          return col.label;
+        } else {
+          return this.t(`tableHeaders.${col.label.replace(/\s+/g, '').toLowerCase()}`, undefined, true);
+        }
       }
 
       return ucFirst(col.name);
     },
 
+    // 判断字符串是否包含中文
+    isChinese(str) {
+      return /[\u4e00-\u9fa5]/.test(str);
+    },
+
     valueFor(row, col, isLabel) {
       if (typeof col.value === 'function') {
         return col.value(row);
@@ -1259,15 +1285,15 @@ export default {
   >
      <!-- 主标题和过滤器区域 -->
     <div
-      :class="{'titled': $slots.title && $slots.title.length,  'mb-40': isFilterLabel}"
-      class="sortable-table-header  mb-20"
+      :class="{'titled': $slots.title && $slots.title.length,  'mb-40': isFilterLabel }"
+      class="sortable-table-header"
     >
       <slot name="title" />
 
       <!-- 顶部功能行区域 -->
       <div
         v-if="showHeaderRow"
-        class="fixed-header-table-actions"
+        class="fixed-header-table-actions mb-20"
         :class="{button: !!$slots['header-button'], 'advanced-filtering': hasAdvancedFiltering, }"
         style="display: flex;"
       >
@@ -1280,6 +1306,8 @@ export default {
           style="max-height: 32px;"
         >
 
+          <slot name="search-main-button" />
+
           <!-- 已应用的高级筛选 -->
           <ul
             v-if="hasAdvancedFiltering"
@@ -1367,9 +1395,6 @@ export default {
           <slot name="header-button" />
 
           <div style="display: flex;">
-
-            <slot name="search-main-button" />
-
             <!-- 搜索输入框 -->
             <input
               v-if="search"
@@ -1398,14 +1423,18 @@ export default {
          
         </div>
 
-        <!-- 中间区域插槽 -->
-        <div
-          v-if="!hasAdvancedFiltering && $slots['header-middle']"
-          class="middle"
-          style="margin-left: 10px;"
-        >
-          <slot name="header-middle" />
-        </div>
+        <div style="display: flex;">
+          <slot name="header-button-left" />
+          
+          <!-- 中间区域插槽 -->
+          <div
+             v-if="!hasAdvancedFiltering && $slots['header-middle']"
+             class="middle"
+             style="margin-left: 10px;"
+           >
+             <slot name="header-middle" />
+           </div>
+         </div>
       </div>
     </div>
 
@@ -1841,7 +1870,7 @@ export default {
         class="paging"
       >
         <div style="height: 100%; align-content: center;">
-          共 {{ filteredRows.length }} 条
+          共 {{ totalCount ? totalCount : 0 }} 条
         </div>
 
         <button
@@ -2201,6 +2230,9 @@ export default {
     td {
       padding: 8px 5px;
       border: 0;
+      white-space: normal;
+      word-break: break-all;
+      overflow-wrap: break-word;
 
       &:first-child {
         padding-left: 10px;
@@ -2217,8 +2249,9 @@ export default {
 
     tbody {
       tr {
-        border-bottom: 1px solid var(--sortable-table-top-divider);
+        border-bottom: 1px solid var(--sortable-table-top-divider) !important;
         background-color: var(--sortable-table-row-bg);
+        height: 60px;
 
         &.main-row.has-sub-row {
           border-bottom: 0;
@@ -2282,6 +2315,7 @@ export default {
 
         &:first-child {
           border-bottom: 2px solid var(--sortable-table-row-bg);
+          height: 40px;
         }
 
         &:not(:first-child) {
@@ -2658,7 +2692,9 @@ export default {
 
   .pageSelect{
     &:deep() .vs__actions:after{
-      padding-top: 10px;
+      // padding-top: 10px;
+      display: flex;
+      align-items: center;
     }
   } 
   .sort-table-div{

package/components/Tabbed/index.vue

@@ -384,12 +384,13 @@ export default {
 
   &.horizontal {
     border: solid thin var(--border);
-    border-bottom: 0;
+    // border-bottom: 0;
     display: flex;
     flex-direction: row;
 
     + .tab-container {
       border: solid thin var(--border);
+      border-top: 0px;
     }
 
     .tab.active {
@@ -504,6 +505,8 @@ margin: 0px -20px;
     display: flex;
     border-bottom:1px solid #d7d7d7;
     padding: 0 0 0 20px;
+    // overflow: auto;
+    // overflow-y: hidden;
     /* flex: 1 0; */
     /* flex-direction: column; */
 
@@ -571,6 +574,8 @@ margin: 0px -20px;
       li {
         display: flex;
         flex: 1;
+        border-left: 1px solid var(--border);
+        border-right: 1px solid var(--border);
 
         .btn {
           flex: 1 1;

package/components/auth/Principal.vue

@@ -3,6 +3,10 @@ import { NORMAN } from '@shell/config/types';
 
 export default {
   props: {
+    userLogo: {
+      type:    Boolean,
+      default: false,
+    },
     value: {
       type:     String,
       required: true,
@@ -20,7 +24,11 @@ export default {
     isShowPass: {
       type:    Boolean,
       default: false,
-    }
+    },
+    userLogoSize: {
+      type:    Number,
+      default: 20,
+    },
   },
 
   async fetch() {
@@ -90,8 +98,9 @@ export default {
     </template>
 
     <template v-else-if="principal">
-      <div class="avatar">
+      <div v-if="userLogo" :style="userLogoSize === 79 ? { width: '287px' } : {}" class="avatar">
         <img
+          :style="{ width: userLogoSize + 'px', height: userLogoSize + 'px', marginRight: '10px' }"
           src="@shell/assets/images/user.png"
           :class="{'round': principal.roundAvatar}"
           :alt="t('principal.alt.avatar')"
@@ -166,16 +175,15 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-  $size: 20px;
+  $size: 24px;
 
   .principal {
     display: grid;
     grid-template-areas:
       "avatar name"
       "avatar description";
-    grid-template-columns: $size auto;
+    grid-template-columns: min-content auto;
     // grid-template-rows: auto math.div($size, 2);
-    column-gap: 10px;
 
     th {
       text-align: left;
@@ -209,7 +217,7 @@ export default {
     .avatar {
       /* grid-area: avatar;
       text-align: center; */
-      width: 287px;
+      // width: 287px;
       display: flex;
       justify-content: center;
       align-items: center;
@@ -231,13 +239,13 @@ export default {
 
     .name {
       grid-area: name;
-      line-height: math.div($size, 2);
+      line-height: 16px;
       overflow-wrap: anywhere;
     }
 
     .description {
       grid-area: description;
-      line-height: math.div($size, 2);
+      line-height: 16px;
     }
   }
 </style>