dashboard-shell-shell 3.0.5-test.17 → 3.0.5-test.19

package/assets/styles/base/_variables.scss

@@ -12,8 +12,8 @@ $unlabeled-input-height: 40px;
 $unlabaled-select-padding: 3px 0;
 $footer-height: 60px;
 
-$input-height: 32px;
-$unlabeled-input-height: 32px;
+$input-height: 30px;
+$unlabeled-input-height: 30px;
 $input-width: 400px;
 
 

package/assets/styles/global/_select.scss

@@ -56,7 +56,7 @@
 
       .vs__dropdown-toggle{
         border: solid var(--border-width) var(--input-border);
-        height: 30px;
+        // height: 30px;
       }
       // .vs__dropdown-toggle,
       .vs__dropdown-toggle > * {

package/assets/translations/zh-hans.yaml

@@ -593,6 +593,8 @@ assignTo:
   workspace: 工作空间
 
 stateLabel:
+  VM error: 错误
+  Locked: 锁定
   Bound: 已绑定
   Running: 运行中
   Off: 关闭
@@ -3170,7 +3172,7 @@ login:
     label: 记住用户名
 
 logout:
-  message: 正在退出登陆...
+  message: 正在退出登录...
 
 managementNode:
   customName: 自定义名称
@@ -6511,6 +6513,11 @@ typeDescription:
   management.cattle.io.user: 用于管理用户账号，支持创建、维护用户信息，可设置用户权限、管理密码等，保障系统资源仅由授权用户访问，提升系统安全性。
   harvesterhci.io.management.cluster: 提供虚拟化集群的实时健康状态监控、版本号管理及资源负载管理，支持批量导入/删除集群、配置调优与权限分级功能，实现高效运维管控。
 typeLabel:
+  management.cattle.io.project: |-
+    {count, plural,
+      one { 项目 }
+      other { 项目 }
+    }
   management.cattle.io.token: |-
     {count, plural,
       one { API 密钥 }

package/components/Resource/Detail/TitleBar/composables.ts

@@ -14,7 +14,22 @@ export const useDefaultTitleBarProps = (resource: any, resourceSubtype?: Ref<str
     const resourceSubtypeValue = toValue(resourceSubtype);
     const currentStore = store.getters['currentStore'](resourceValue.type);
     const schema = store.getters[`${ currentStore }/schemaFor`](resourceValue.type);
-    const resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+    let resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+
+    // 转换为中文
+    const displayName_zh_hans: Record<string, string> = {
+      'GlobalRole': '全局角色',
+      'RoleTemplate': '集群角色',
+    }
+
+    if (displayName_zh_hans[resourceTypeLabel]) {
+      resourceTypeLabel = displayName_zh_hans[resourceTypeLabel]
+    }
+    
+    if (resourceTypeLabel == '集群角色' && (route.query?.roleContext == 'NAMESPACE' || resource?.parentLocationOverride?.hash == '#NAMESPACE')) {
+      resourceTypeLabel = '项目或资源组角色'
+    }
+    
     const resourceName = resourceSubtypeValue ? `${ resourceSubtypeValue } - ${ resourceValue.nameDisplay }` : resourceValue.nameDisplay;
     const resourceTo = resourceValue.listLocation || {
       name:   'c-cluster-product-resource',

package/components/Resource/Detail/TitleBar/index.vue

@@ -119,7 +119,7 @@ watch(
 
 <template>
   <div class="title-bar">
-    <breadcrumb :resource="resource"/>
+    <breadcrumb :resourceTypeLabel="resourceTypeLabel" :resource="resource"/>
     <Top>
       <Title class="title">
         <span class="detailIcon-span">

package/components/SideNav.vue

@@ -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/auth/RoleDetailEdit.vue

@@ -705,12 +705,12 @@ export default {
             <!-- 列表头部 -->
             <template #column-headers>
               <div class="column-headers row">
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <span class="text-label">{{ t('rbac.roletemplate.tabs.grantResources.tableHeaders.verbs') }}
                     <span class="required">*</span>
                   </span>
                 </div>
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <span class="text-label">
                     {{ t('rbac.roletemplate.tabs.grantResources.tableHeaders.resources') }}
                     <i
@@ -723,7 +723,7 @@ export default {
                     >*</span>
                   </span>
                 </div>
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <span class="text-label">{{ t('rbac.roletemplate.tabs.grantResources.tableHeaders.apiGroups') }}</span>
                 </div>
                 <div
@@ -740,7 +740,7 @@ export default {
               <div class="columns row mr-20">
 
                 <!-- 动作（verbs）选择 -->
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <!-- Select verbs -->
                   <Select
                     :value="props.row.value.verbs"
@@ -758,7 +758,7 @@ export default {
                 </div>
 
                 <!-- 资源（resources）选择 -->
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <Select
                     style="width: auto;"
                     :value="getRule('resources', props.row.value)"
@@ -776,7 +776,7 @@ export default {
                 </div>
 
                 <!-- API Groups 输入 -->
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <LabeledInput
                     :value="getRule('apiGroups', props.row.value)"
                     :disabled="isBuiltin"
@@ -788,6 +788,7 @@ export default {
 
                 <!-- 非命名空间 URL 输入（仅非命名空间模式显示） -->
                 <div
+                  class="arrayListCls"
                   v-if="!isNamespaced"
                   :class="ruleClass"
                 >
@@ -859,6 +860,9 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+  .arrayListCls {
+    min-width: 360px;
+  }
   .ruleCls {
     margin-right: 10px;
   }

package/components/breadcrumb/index.vue

@@ -1,54 +1,18 @@
 <script>
-import { Banner } from '@components/Banner';
 import { get } from '@shell/utils/object';;
-import {
-  AS, _DETAIL, _CONFIG, _YAML, MODE, _CREATE, _EDIT, _VIEW, _UNFLAG, _GRAPH
-} from '@shell/config/query-params';
-import { ExtensionPoint, PanelLocation } from '@shell/core/types';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import { useStore } from 'vuex';
 
-// i18n-uses resourceDetail.header.*
-
-/**
- * Resource Detail Masthead component.
- *
- * ToDo: this component seem to be picking up a lot of logic from special cases, could be simplified down to parameters and then customized per use-case via wrapper component
- */
 export default {
 
-  name: 'MastheadResourceDetail',
+  name: 'MastheadBreadcrumb',
 
   components: {
-    // BadgeState,
-    Banner,
   },
   props: {
-    value: {
-      type:    Object,
-      default: () => {
-        return {};
-      }
-    },
-
-    mode: {
-      type:    String,
-      default: 'view'
-    },
-
-    realMode: {
-      type:    String,
-      default: 'view'
-    },
-
-    as: {
+    resourceTypeLabel: {
       type:    String,
-      default: _YAML,
-    },
-
-    storeOverride: {
-      type:    String,
-      default: null,
+      default: ''
     },
 
     resource: {
@@ -56,15 +20,10 @@ export default {
       default: null,
     },
 
-    resourceSubtype: {
-      type:    String,
-      default: null,
-    },
-
-    parentRouteOverride: {
+    realMode: {
       type:    String,
-      default: null,
-    },
+      default: 'view',
+    }
 
   },
 
@@ -77,82 +36,10 @@ export default {
 
   data() {
     return {
-      DETAIL_VIEW:       _DETAIL,
-      extensionType:     ExtensionPoint.PANEL,
-      extensionLocation: PanelLocation.DETAILS_MASTHEAD,
-      Svg:               require('~shell/assets/images/API.svg')
     };
   },
 
   computed: {
-    dev() {
-      return this.$store.getters['prefs/dev'];
-    },
-
-    schema() {
-      const inStore = this.storeOverride || this.$store.getters['currentStore'](this.resource);
-
-      return this.$store.getters[`${ inStore }/schemaFor`]( this.resource );
-    },
-
-    isProjectHelmChart() {
-      return this.schema?.id === HELM.PROJECTHELMCHART;
-    },
-
-    shouldHifenize() {
-      return (this.mode === 'view' || this.mode === 'edit') && this.resourceSubtype?.length && this.value?.nameDisplay?.length;
-    },
-
-    parent() {
-      const displayName = this.value?.parentNameOverride || this.$store.getters['type-map/labelFor'](this.schema);
-      const product = this.$store.getters['currentProduct'].name;
-
-      const defaultLocation = {
-        name:   'c-cluster-product-resource',
-        params: {
-          resource: this.resource,
-          product,
-        }
-      };
-
-      const location = this.value?.parentLocationOverride || defaultLocation;
-
-      if (this.parentRouteOverride) {
-        location.name = this.parentRouteOverride;
-      }
-
-      const typeOptions = this.$store.getters[`type-map/optionsFor`]( this.resource );
-
-      // 转换为中文
-      const displayName_zh_hans = {
-        'GlobalRole': '全局角色',
-        'RoleTemplate': '集群角色',
-      }
-      if (displayName_zh_hans[displayName]) {
-        displayName = displayName_zh_hans[displayName]
-      }
-      
-      if (displayName == '集群角色' && (this.$route.query?.roleContext == 'NAMESPACE' || location.hash == '#NAMESPACE')) {
-        displayName = '项目或资源组角色'
-      }
-
-      const out = {
-        displayName, location, ...typeOptions
-      };
-
-      return out;
-    },
-
-
-    displayName() {
-      let displayName = this.value.nameDisplay;
-
-      if (this.isProjectHelmChart) {
-        displayName = this.value.projectDisplayName;
-      }
-
-      return this.shouldHifenize ? ` - ${ displayName }` : displayName;
-    },
 
     demoDisplay() {
 
@@ -177,12 +64,6 @@ export default {
       return partsEn;
     },
 
-    location() {
-      const { parent } = this;
-
-      return parent?.location;
-    },
-
   },
 
   methods: {
@@ -206,7 +87,7 @@ export default {
           <span>/</span>
         </span>
         <span class="excram-last-name">
-          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent.displayName }}
+          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + resourceTypeLabel }}
         </span>
       </div>
     </div>
@@ -215,71 +96,6 @@ export default {
 
 <style lang='scss' scoped>
 
-  HEADER {
-    margin: 0;
-  }
-
-  .primaryheader {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    font-size:14px;
-    height: 50px;
-
-    h1 {
-      margin: 0;
-    }
-  }
-
-  .subheader{
-    display: flex;
-    flex-direction: row;
-    color: var(--input-label);
-    & > * {
-      margin: 5px 20px 5px 0px;
-    }
-
-    .live-data {
-      color: var(--body-text)
-    }
-  }
-
-  .state-banner {
-    margin: 3px 0 0 0;
-  }
-
-  .masthead-state {
-    font-size: initial;
-    display: inline-block;
-    position: relative;
-    /* top: -2px; */
-    font-size: 12px;
-    margin-left: 5px;
-  }
-
-  .masthead-istio {
-    .icon {
-      vertical-align: middle;
-      color: var(--primary);
-    }
-  }
-
-  .left-right-split {
-    display: grid;
-    align-items: center;
-
-    .left-half {
-      grid-column: 1;
-    }
-
-    .right-half {
-      grid-column: 2;
-    }
-  }
-
-  .resource-external {
-    font-size: 18px;
-  }
   .excram-list{
     font-size: 14px;
     margin-bottom: 20px;
@@ -287,10 +103,7 @@ export default {
   .excram-last-name{
     color: var(--link);
   }
-  .valid{
-    color: #d7d7d7;
-    margin: 0px 10px;
-  }
+
   .detailIcon-span{
     width: 24px;
     height: 24px;
@@ -306,11 +119,5 @@ export default {
     left: 4px;
     top: -2px;
   }
-  .primary-title{
-    display: flex;
-    align-items: center;
-  }
-  .detailIcon-span-title{
-    font-weight: bold;
-  }
+
 </style>

package/components/form/Select.vue

@@ -392,6 +392,10 @@ export default {
   .unlabeled-select {
     position: relative;
 
+    :deep() .vs__actions:after {
+      padding-top: 2px;
+    }
+
     :deep() .v-select.select-input-view {
       .vs__actions {
         visibility: hidden;
@@ -409,7 +413,8 @@ export default {
 
     :deep() .vs__selected-options {
       display: flex;
-      margin: 3px;
+      align-items: center;
+      margin: 0px;
 
       .vs__selected {
           width: initial;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.5-test.17",
+  "version": "3.0.5-test.19",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/scripts/publish-shell.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 执行命令示例：
-# TAG=shell-pkg-v3.0.5-test.17 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-test.19 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail
 

package/utils/errorTranslate.json

@@ -1,5 +1,145 @@
 {
   "translations": [
+    {
+      "pattern": "The new password must not be the same as the current password",
+      "replacement": "新密码不能与当前密码相同，请重新设置",
+      "flags": "gi"
+    },
+    {
+      "pattern": "guest memory is greater than the configured maxguest memory",
+      "replacement": "内存已超过所配置的最大客户机内存",
+      "flags": "gi"
+    },
+    {
+      "pattern": "memory hotplug is only available for vms with at least (\\d+[a-z]*) of guest memory",
+      "replacement": "内存热插拔仅适用于客户机内存至少为 $1 的虚拟机",
+      "flags": "gi"
+    },
+    {
+      "pattern": "storage class must contain csi\\.storage\\.k8s\\.io/(provisioner-secret-name|provisioner-secret-namespace|node-stage-secret-name|node-stage-secret-namespace|node-publish-secret-name|node-publish-secret-namespace)(?:,\\s*)?(.*)",
+      "replacement": "存储池必须包含以下 CSI 密钥注解：$1$2",
+      "flags": "gi"
+    },
+    {
+      "pattern": "sourceimagename is required when image source type is \"clone\"",
+      "replacement": "镜像来源类型为“克隆”时，必须填写源镜像名称",
+      "flags": "gi"
+    },
+    {
+      "pattern": "([^\"\\s]+) exceeds the file size limit of (\\d+) bytes",
+      "replacement": "文件 '$1' 超过大小限制 $2 字节",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failure while starting vmi: virtualmachineinstance\\.kubevirt\\.io \"([^\"]+)\" is invalid: metadata\\.labels: invalid value: \"([^\"]+)\": name part must consist of alphanumeric characters, '-', '_' or '\\.', and must start and end with an alphanumeric character",
+      "replacement": "启动虚拟机实例失败：'$1' 标签值 '$2' 无效，只能包含字母、数字、'-','_'或'.'，且以字母/数字开头和结尾",
+      "flags": "gi"
+    },
+    {
+      "pattern": "virtualmachine\\.kubevirt\\.io \"([^\"]+)\" is invalid:[\\s\\S]*?metadata\\.labels: invalid value: \"([^\"]*)\"[\\s\\S]*?regex used for validation is '([^']+)'",
+      "replacement": "虚拟机 '$1' 标签值 '$2' 无效：只能包含字母、数字、'-','_' 或 '.'，且以字母/数字开头结尾（正则：$3）",
+      "flags": "gi"
+    },
+    {
+      "pattern": "virtualmachine\\.kubevirt\\.io \"([^\"]+)\" is invalid:[\\s\\S]*?spec\\.template: Invalid value: corev1\\.PodTemplateSpec \\{[\\s\\S]*?spec: corev1\\.PodSpec \\{[\\s\\S]*?containers: \\[corev1\\.Container \\{[\\s\\S]*?image: \"([^\"]*)\",[\\s\\S]*?\\}\\],[\\s\\S]*?nodeSelector: map\\[([^:]+): ([^\\]]+)\\],[\\s\\S]*?\\},[\\s\\S]*?\\},[\\s\\S]*?\\},[\\s\\S]*?regex used for validation is '([^']+)'",
+      "replacement": "虚拟机 '$1' 的镜像 '$2' 无法在节点标签 '$3=$4' 的节点上运行（正则：$5）",
+      "flags": "gi"
+    },
+    {
+      "pattern": "role is locked and cannot be assigned",
+      "replacement": "角色已被锁定，不能再分配",
+      "flags": "gi"
+    },
+    {
+      "pattern": "invalid current password",
+      "replacement": "当前密码输入错误，请重新输入",
+      "flags": "gi"
+    },
+    {
+      "pattern": "spec\\.template\\.spec\\.podaffinity\\.requiredduringschedulingignoredduringexecution\\[(\\d+)\\]\\.topologykey: required value: can not be empty[\\s\\S]*?regex used for validation is '([^']+)'",
+      "replacement": "拓扑键不能为空",
+      "flags": "gi"
+    },
+    {
+      "pattern": "pcidevice ([^\\s]+) has no iommugroup available",
+      "replacement": "PCI 设备 '$1' 没有可用的 IOMMU 组",
+      "flags": "gi"
+    },
+    {
+    "pattern": "invalidbodycontent 422: failed to parse totalsnapshotsizequota: quantities must match the regular expression '\\^\\(\\[\\+\\-\\]\\?\\[0-9\\.\\]\\+\\)\\(\\[eeinumkkmgtp\\]\\*\\[\\-\\+\\]\\?\\[0-9\\]\\*\\)\\$'",
+    "replacement": "快照配额不能为空",
+    "flags": "gi"
+    },
+    {
+      "pattern": "secrets \"([^\"]+)\" already exists",
+      "replacement": "密钥 \"$1\" 已存在",
+      "flags": "gi"
+    },
+    {
+      "pattern": "backup target is invalid",
+      "replacement": "备份目标无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failed to list objects with param:[\\s\\S]*?server gave http response to https client",
+      "replacement": "列举对象失败：服务器返回 HTTP 响应，但客户端使用 HTTPS，请检查协议配置",
+      "flags": "gi"
+    },
+    {
+      "pattern": "clusternetwork\\.network\\.harvesterhci\\.io \"([^\"]+)\" is invalid: metadata\\.name: invalid value: \"([^\"]*)\": a lowercase rfc 1123 subdomain must consist of lower case alphanumeric characters, '-' or '\\.', and must start and end with an alphanumeric character",
+      "replacement": "集群网络名称 '$1' 无效：须符合 RFC 1123 子域名规则，只能使用小写字母、数字、'-' 或 '.'，且以字母或数字开头和结尾",
+      "flags": "gi"
+    },
+    {
+      "pattern": "loadbalancer\\.loadbalancer\\.harvesterhci\\.io \"([^\"]+)\" is invalid: \\[spec\\.listeners\\[(\\d+)\\]\\.(backendport|port): required value[^\\]]*\\]",
+      "replacement": "负载均衡器 '$1' 配置无效：第 $2 个监听器的 $3 为必填项",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't delete cluster network (\\S+) because vlanconfig\\(s\\) \\[(.*?)\\] under this clusternetwork are still existing",
+      "replacement": "无法删除集群网络 '$1'，因其下仍存在 VLAN 配置 [$2]",
+      "flags": "gi"
+    },
+    {
+      "pattern": "value: (\\d+) must be in range \\[1 \\.\\. (\\d+)\\]",
+      "replacement": "值 $1 超出范围，必须在 1–$2 之间",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't delete vlanconfig (\\S+) because it is blocked by vm\\(s\\) ([^/]+)/(\\S+) which must be stopped at first",
+      "replacement": "无法删除 VLAN 配置 '$1'：需先停止虚拟机 '$2/$3'",
+      "flags": "gi"
+    },
+    {
+      "pattern": "cannot find nfs path",
+      "replacement": "无法找到 NFS 路径",
+      "flags": "gi"
+    },
+    {
+      "pattern": "get \"([^\"]+)\": unsupported protocol scheme \"\"",
+      "replacement": "url 无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "cannot mount nfs ([^\\s]+)[\\s\\S]*?no such file or directory[\\s\\S]*?cannot mount using nfsv4",
+      "replacement": "备份存储的端点无法访问",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't create nad ([^/]+)/([^\\s]+) because the gateway ([^\\s]+) is invalid",
+      "replacement": "无法创建虚拟网络 '$1/$2'，因为网关 '$3' 无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't create nad ([^/]+)/([^\\s]+) because the cidr ([^\\s]+) is invalid",
+      "replacement": "无法创建虚拟网络 '$1/$2'，因为 CIDR '$3' 无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "no matching backup found for url ([^\\s]+) and backing image ([^\\s]+)",
+      "replacement": "未找到与 URL $1 和镜像 $2 匹配的备份",
+      "flags": "gi"
+    },
     {
       "pattern": "take virtual machine snapshot ([^\\s]+) successfully\\.",
       "replacement": "虚拟机快照 '$1' 创建成功。",
@@ -70,11 +210,17 @@
       "replacement": "无效的下一跳地址",
       "flags": "gi"
     },
+    {
+      "pattern": "number of sockets in cpu topology is greater than the maximum sockets allowed, number of sockets in cpu topology is greater than the maximum sockets allowed",
+      "replacement": "CPU 拓扑中的 socket 数量已超过最大允许值",
+      "flags": "gi"
+    },
     {
       "pattern": "number of sockets in cpu topology is greater than the maximum sockets allowed",
       "replacement": "CPU 拓扑中的 socket 数量已超过最大允许值",
       "flags": "gi"
     },
+    
     {
       "pattern": "not a default subnet join as provider is ([^\\s]+)",
       "replacement": "非默认子网，当前以提供者 $1 加入",
@@ -87,7 +233,7 @@
     },
     {
       "pattern": "validation failed in api: vpc.kubeovn.io \"([^\"]*)\" is invalid: metadata\\.name: invalid value: \"([^\"]*)\": a lowercase rfc 1123 subdomain must consist of lower case alphanumeric characters, '-' or '\\.', and must start and end with an alphanumeric character \\(e\\.g\\..*?\\)",
-      "replacement": "API 校验失败：VPC 名称 \"$1\" 不符合 RFC 1123 子域名规则，只能使用小写字母、数字、'-' 或 '.'，且必须以字母/数字开头和结尾",
+      "replacement": "校验失败：VPC 名称 \"$1\" 不符合 RFC 1123 子域名规则，只能使用小写字母、数字、'-' 或 '.'，且必须以字母/数字开头和结尾",
       "flags": "gi"
     },
     {
@@ -1423,6 +1569,10 @@
       "pattern": ""备份" 是必填项。",
       "replacement": "\"快照/备份\" 是必填项"
     },
+    {
+      "pattern": "namespaces",
+      "replacement": "资源组"
+    },
     {
       "pattern": "%",
        "replacement": ""