dashboard-shell-shell 3.0.5-test.18 → 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,7 @@ assignTo:
   workspace: 工作空间
 
 stateLabel:
+  VM error: 错误
   Locked: 锁定
   Bound: 已绑定
   Running: 运行中
@@ -3171,7 +3172,7 @@ login:
     label: 记住用户名
 
 logout:
-  message: 正在退出登陆...
+  message: 正在退出登录...
 
 managementNode:
   customName: 自定义名称
@@ -6512,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/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/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.18",
+  "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.118 ./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,12 +1,59 @@
 {
   "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": "角色已被锁定，不能再分配"
+      "replacement": "角色已被锁定，不能再分配",
+      "flags": "gi"
     },
     {
       "pattern": "invalid current password",
-      "replacement": "重复密码无效"
+      "replacement": "当前密码输入错误，请重新输入",
+      "flags": "gi"
     },
     {
       "pattern": "spec\\.template\\.spec\\.podaffinity\\.requiredduringschedulingignoredduringexecution\\[(\\d+)\\]\\.topologykey: required value: can not be empty[\\s\\S]*?regex used for validation is '([^']+)'",
@@ -163,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 加入",
@@ -1516,6 +1569,10 @@
       "pattern": ""备份" 是必填项。",
       "replacement": "\"快照/备份\" 是必填项"
     },
+    {
+      "pattern": "namespaces",
+      "replacement": "资源组"
+    },
     {
       "pattern": "%",
        "replacement": ""