dashboard-shell-shell 3.0.5-test.8 → 3.0.5-tsh.1

package/scripts/build-pkg.sh

@@ -2,7 +2,6 @@
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
-SHELL_DIR=$BASE_DIR/shell/
 EXIT_CODE=0
 FORMATS="umd-min"
 
@@ -19,12 +18,18 @@ done
 
 shift $((OPTIND-1))
 
-# Use shell folder in node modules when we have @rancher/shell installed as a node module
-# rather than the use-case of the mono-repo with the shell folder at the top-level
-if [ ! -d ${SHELL_DIR} ]; then
-  SHELL_DIR=$BASE_DIR/node_modules/@rancher/shell/
-  SHELL_DIR=$(cd -P ${SHELL_DIR} && pwd)
+# ---- 修改这里 ----
+# 优先使用顶级 shell 文件夹，如果不存在则使用 node_modules/dashboard-shell-shell
+SHELL_DIR=$BASE_DIR/shell/
+if [ ! -d "${SHELL_DIR}" ]; then
+  SHELL_DIR=$BASE_DIR/node_modules/dashboard-shell-shell/
+  if [ ! -d "${SHELL_DIR}" ]; then
+    echo "Error: dashboard-shell-shell not found in node_modules"
+    exit 1
+  fi
 fi
+# 转为绝对路径，防止符号链接循环
+SHELL_DIR=$(cd -P "${SHELL_DIR}" && pwd)
 
 CREATE_TARBALL=${2}
 
@@ -46,18 +51,14 @@ if [ -d "${BASE_DIR}/pkg/${1}" ]; then
 
   pushd pkg/${1}
 
-  # Check that the .shell link exists and points to the correct place
-  if [ -e ".shell" ]; then
-    LINK=$(readlink .shell)
-    if [ "${LINK}" != "${SHELL_DIR}" ]; then
-      echo ".shell symlink exists but does not point to expected location - please check and fix"
-      popd
-      exit -1
-    fi
-  else
-    ln -s ${SHELL_DIR} .shell
+  # 删除旧的 .shell，防止循环
+  if [ -L ".shell" ] || [ -e ".shell" ]; then
+    rm -rf .shell
   fi
 
+  # 创建新的符号链接
+  ln -s "${SHELL_DIR}" .shell
+
   FILE=index.js
   if [ -f ./index.ts ]; then
     FILE=index.ts
@@ -72,7 +73,7 @@ if [ -d "${BASE_DIR}/pkg/${1}" ]; then
   cp -f ./package.json ${PKG_DIST}/package.json
   node ${SCRIPT_DIR}/pkgfile.js ${PKG_DIST}/package.json
   rm -rf ${PKG_DIST}/*.bak
-  rm .shell
+  rm -rf .shell
 
   popd  
 fi
@@ -81,22 +82,16 @@ if [ $EXIT_CODE -ne 0 ]; then
   exit $EXIT_CODE
 fi
 
-
 if [ -n "${CREATE_TARBALL}" ]; then
   echo $COMMIT $COMMIT_BRANCH > ${PKG_DIST}/version-commit.txt
 
   TARBALL=${NAME}.tar.gz
 
   pushd ${PKG_DIST}
-
   rm -f ../$TARBALL
-
   echo "Compressing to ${TARBALL}..."
-
   tar -czf ../${TARBALL} .
-
   popd
-
 fi
 
 exit $EXIT_CODE

package/scripts/publish-shell.sh

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

package/store/i18n.js

@@ -108,6 +108,7 @@ export const getters = {
         ...args
       };
 
+      moreArgs['count'] = moreArgs['count'] !== undefined ? moreArgs['count'] : 1
       return formatter.format(moreArgs);
     } else {
       return '?';

package/store/type-map.js

@@ -823,9 +823,7 @@ export const getters = {
         }
 
         if ( icon ) {
-          console.log(icon)
           label = `<i class="icon icon-fw icon-${ icon }"></i>${ label }`;
-          console.log(label)
         }
 
         return label;

package/utils/error.js

@@ -1,6 +1,7 @@
 import { isArray } from '@shell/utils/array';
 
 import translations from './errorTranslate.json';
+import errorTranslateNew from './errorTranslateNew.json';
 
 export class ClusterNotFoundError extends Error {
   static NAME = 'ClusterNotFoundError'
@@ -49,6 +50,7 @@ export class ApiError extends Error {
 }
 
 export function stringify(err) {
+  
   let str;
   if ( typeof err === 'string' ) {
     str = err;
@@ -146,8 +148,25 @@ export function translateError(error) {
   }).replace('internal error occurred: ', "");
   console.log('00044', error);
 
+    // 1. 资源配额错误（最高优先级）
+  if (originError.includes('exceeded quota')) {
+    return '资源配额超限：请求的资源超过了命名空间的配额限制';
+  }
+
+  // 2. 权限不足错误
+  const permissionDeniedPatterns = [
+    /"\S+" is forbidden:.*cannot.*(patch|update|create|delete|get|list|watch).*resource/i,
+    /is forbidden:.*user.*cannot.*(patch|update|create|delete|get|list|watch)/i
+  ];
+  
+  if (permissionDeniedPatterns.some(pattern => pattern.test(originError))) {
+    return "权限不足";
+  }
+
 
-  if (error.includes('spec and status of disks on node') && error.includes('are being syncing and please retry later')) {
+  if (error.includes("a lowercase rfc 1123 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character")) {
+    error =  "无效的名称不符合 RFC 1123 命名规则。名称只能包含小写字母、数字或 '-'，并且必须以字母或数字开头和结尾（例如 'my-name' 或 '123-abc'）。"
+  } else if (error.includes('spec and status of disks on node') && error.includes('are being syncing and please retry later')) {
     error = error.replace('spec and status of disks on node','').replace('are being syncing and please retry later','')
     error = '节点' + error + '上的硬盘规格和状态正在同步，请稍后重试'
   } else if (error.includes('same granularity as schedule') && error.includes('and offset less than')) {
@@ -174,7 +193,7 @@ export function translateError(error) {
 
     error = `子网 '${subnetName}' 配置无效：1) 名称禁止以数字开头；2) 排除IP[${idx}] 不能为空且必须是合法 IPv4/IPv6 地址或地址段`;
   }
-  
+
   // error = error.replace(/admission webhook(.*?)denied the request:/g, (match, p1) => {
   //   return '';
   // })
@@ -187,8 +206,9 @@ export function translateError(error) {
     error =  error.substring(errorIndex + 4);
   }
 
+  const translationsList = [...errorTranslateNew.translations, ...translations.translations]
   
-  for (const translation of translations.translations) {
+  for (const translation of translationsList) {
    
     // if (error.includes(translation.pattern)) { 
     //   error = error.replace(translation.pattern, translation.replacement);

package/utils/errorTranslate.json

@@ -1,5 +1,366 @@
 {
   "translations": [
+    {
+      "pattern": "can't delete vlanconfig (\\S+) because the storage network nad (\\S+) is still attached",
+      "replacement": "无法删除 VLAN 配置 '$1'：存储网络附加定义 '$2' 仍在使用",
+      "flags": "gi"
+    },
+    {
+      "pattern": "please stop all workloads before configuring the storage-network setting",
+      "replacement": "配置存储网络设置前，请先停止所有工作负载",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failure while starting vmi:  arm64 not support this disk bus type, please use virtio or scsi",
+      "replacement": "启动虚拟机实例失败：ARM64 架构不支持此磁盘总线类型，请使用 virtio 或 scsi",
+      "flags": "gi"
+    },
+    {
+      "pattern": "the server could not find the requested resource",
+      "replacement": "服务器无法找到请求的资源",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failed to create vm backup, error:  provisioner nfs.csi.k8s.io is not supported for type backup",
+      "replacement": "创建虚拟机备份失败, 错误：nfs存储不支持备份",
+      "flags": "gi"
+    },
+    {
+      "pattern": "maximum call stack size exceeded",
+      "replacement": "超出最大调用堆栈大小",
+      "flags": "gi"
+    },
+    {
+      "pattern": "([^\\s]+) in excludeips is not a valid ip range",
+      "replacement": "excludeIPs 中的地址段 '$1' 不是有效的 IP 范围",
+      "flags": "gi"
+    },
+    {
+      "pattern": "fail to create service, error: service "([^&]+)" is invalid: metadata\\.name: invalid value: "([^&]+)": a dns-1035 label must consist of lower case alphanumeric characters or '-', start with an alphabetic character, and end with an alphanumeric character",
+      "replacement": "创建服务失败：服务名称 \"$2\" 不符合 DNS-1035 规则，只能使用小写字母、数字或 '-'，并以字母开头、字母或数字结尾",
+      "flags": "gi"
+    },
+    {
+      "pattern": "(\\S+) \"(\\S+)\" is forbidden: user \"(\\S+)\" cannot update resource \"(\\S+)\" in api group \"(\\S+)\" at the cluster scope",
+      "replacement": "$1 \"$2\" 被禁止：用户 \"$3\" 无权在集群范围内更新 API 组 \"$5\" 中的资源 \"$4\"",
+      "flags": "gi"
+    },
+    {
+      "pattern": "virtualmachine\\.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": "failed to list objects with param:[\\s\\S]*?invalidaccesskeyid[\\s\\S]*?the access key id you provided does not exist in our records(?:[\\s\\S]*?403 [a-f0-9]+)?",
+      "replacement": "列举对象失败：AccessKey ID 不存在，请检查密钥是否正确",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failed to list objects with param:[\\s\\S]*?signaturedoesnotmatch[\\s\\S]*?check your key and signing method(?:[\\s\\S]*?403 [a-f0-9]+)?",
+      "replacement": "列举对象失败：签名不匹配，请确认 AccessKey、SecretKey 及签名方法配置正确",
+      "flags": "gi"
+    },
+    {
+      "pattern": "ip (\\S+) in excludeips is not a valid address",
+      "replacement": "排除 IP中的地址 '$1' 无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "name part必须 consist of alphanumeric characters, '-', '_'或'.',和must开始and end with an alphanumeric character",
+      "replacement": "只能包含字母、数字、'-','_'或'.'，且以字母/数字开头和结尾",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failure while starting vmi: ",
+      "replacement": "虚拟机启动失败：",
+      "flags": "gi"
+    },
+    {
+      "pattern": "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": "failed calling webhook \"([^\"]+)\": failed to call webhook: post \"([^\"]+)\": no endpoints available for service \"([^\"]+)\"",
+      "replacement": "调用准入钩子 '$1' 失败：服务 '$3' 无可用端点，请检查对应服务状态",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failed to list objects with param:[\\s\\S]*?unsupported protocol scheme \"([^\"]+)\"",
+      "replacement": "列举对象失败：不支持协议方案 \"$1\"，请检查 URL 协议是否正确",
+      "flags": "gi"
+    },
+    {
+      "pattern": "subnet (\\S+) cidr (\\S+) is conflict with subnet (\\S+) cidr (\\S+)",
+      "replacement": "子网 '$1' CIDR $2 与子网 '$3' CIDR $4 冲突",
+      "flags": "gi"
+    },
+    {
+      "pattern": "virtualmachine\\.kubevirt\\.io \"([^\"]+)\" is invalid: metadata\\.annotations: 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": "storage class must contain (csi\\.storage\\.k8s\\.io/(?:provisioner|node-stage|node-publish)-secret-(?:name|namespace)(?:,\\s*|$))+",
+      "replacement": "密钥不能为空",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't delete vlanconfig (\\S+) because it is blocked by vm\\(s\\) ([^,]+(?:,\\s*[^,\\s]+)*) which must be stopped at first",
+      "replacement": "无法删除 VLAN 配置 '$1'：需先停止虚拟机 '$2'",
+      "flags": "gi"
+    },
+    {
+      "pattern": "spec\\.template\\.spec\\.podaffinity\\.requiredduringschedulingignoredduringexecution\\[(\\d+)\\]\\.topologykey: required value: can not be empty[\\s\\S]*?invalid value: \"\"[\\s\\S]*?must start and end with an alphanumeric character",
+      "replacement": "拓扑键不能为空",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't delete vlanconfig (\\S+) because it is blocked by vm\\(s\\) ([^,]+(?:,\\s*[^,\\s]+)*) which must be stopped at first",
+      "replacement": "无法删除 VLAN 配置 '$1'：需先停止虚拟机 '$2'",
+      "flags": "gi"
+    },
+    {
+      "pattern": "spec\\.template\\.spec\\.podaffinity\\.requiredduringschedulingignoredduringexecution\\[(\\d+)\\]\\.topologykey: required value: can not be empty[\\s\\S]*?invalid value: \"\"[\\s\\S]*?must start and end with an alphanumeric character",
+      "replacement": "拓扑键不能为空",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failed to list objects with param:[\\s\\S]*?authorizationheadermalformed[\\s\\S]*?the region is wrong; expecting '([^']+)'[\\s\\S]*",
+      "replacement": "参数错误，无法连接到服务器",
+       "flags": "gi"
+    },
+    {
+      "pattern": "has timed out progressing.",
+      "replacement": "状态更新超时。",
+      "flags": "gi"
+    },
+    {
+      "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' 创建成功。",
+      "flags": "gi"
+    },
+    {
+      "pattern": "delete virtual machine snapshot ([^\\s]+) successfully\\.",
+      "replacement": "虚拟机快照 '$1' 删除成功。",
+      "flags": "gi"
+    },
+    {
+      "pattern": "restore virtual machine snapshot ([^\\s]+) successfully\\.",
+      "replacement": "虚拟机快照 '$1' 恢复成功。",
+      "flags": "gi"
+    },
+    {
+      "pattern": "update virtual machine snapshot ([^\\s]+) successfully\\.",
+      "replacement": "虚拟机快照 '$1' 更新成功。",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failed to create subnet ([^\\s]+), conflict with existing subnet ([^\\s]+)",
+      "replacement": "创建子网 '$1' 失败，地址段与现有子网 '$2' 冲突",
+      "flags": "gi"
+    },  
+    {
+      "pattern": "subnet\\.kubeovn\\.io \"([^\"]*)\" is invalid: metadata\\.name: invalid value: \"([^\"]*)\": metadata\\.name in body should match '\\^\\[\\^0-9\\]'",
+      "replacement": "子网名称 '$1' 无效：名称不能以数字开头",
+      "flags": "gi"
+    },
+    {
+      "pattern": "(\\S+) conflict with v4 loopback cidr (\\S+)",
+      "replacement": "地址段 $1 与 IPv4 回环地址段 $2 冲突",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't delete subnet when any ips in using",
+      "replacement": "子网中仍有 IP 地址正在使用，无法删除",
+      "flags": "gi"
+    },
+    {
+      "pattern": "subnet ([^\\s]+) is still using the nad ([^\\s]+) default",
+      "replacement": "子网 '$1' 正在使用虚拟网络 '$2'，请先删除子网 '$1' ",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't delete vpc when any subnet in the vpc",
+      "replacement": "VPC 内仍存在子网，无法删除该 VPC",
+      "flags": "gi"
+    },
+    {
+      "pattern": "(\\S+) in allowsubnets is not a valid address",
+      "replacement": "允许互通子网地址 $1 无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "gateway (\\S+) is not in cidr (\\S+)",
+      "replacement": "网关地址 $1 不在 CIDR $2 范围内",
+      "flags": "gi"
+    },
+    {
+      "pattern": "subnet ([^\\s]+) is using the provider ([^\\s]+) already",
+      "replacement": "子网 '$1' 已使用虚拟网络 '$2'",
+      "flags": "gi"
+    },
+    {
+      "pattern": "invalid next hop ip",
+      "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 加入",
+      "flags": "gi"
+    },
     {
       "pattern": "subnet ([^\\s]+) cidr ([^\\s]+) is invalid, due to invalid cidr address: ([^\\s]+)",
       "replacement": "子网 '$1' 的 CIDR 地址 '$2' 无效：不是合法的 CIDR 格式",
@@ -7,12 +368,12 @@
     },
     {
       "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"
     },
     {
       "pattern": "validation 失败 in api",
-      "replacement": "API 校验失败",
+      "replacement": "校验失败",
       "flags": "gi"
     },
     {
@@ -832,11 +1193,11 @@
     },
     {
       "pattern": "virtualmachinebackup.harvesterhci.io",
-      "replacement": "虚拟机备份"
+      "replacement": "虚拟机备份恢复"
     },
     {
       "pattern": "virtualmachinebackup.cloudhci.io",
-      "replacement": "虚拟机备份"
+      "replacement": "虚拟机备份恢复"
     },
     {
       "pattern": "vlanconfigs.network.harvesterhci.io",
@@ -1191,6 +1552,10 @@
       "pattern": "could not",
       "replacement": "无法"
     },
+    {
+      "pattern": "MissingRequired",
+      "replacement": "缺少"
+    },
     {
       "pattern": "cannot",
       "replacement": "不能"
@@ -1259,10 +1624,6 @@
       "pattern": "nad ",
       "replacement": "虚拟网络"
     },
-    {
-      "pattern": " is",
-      "replacement": "是"
-    },
     {
       "pattern": "please ",
       "replacement": "请"
@@ -1343,6 +1704,14 @@
       "pattern": ""备份" 是必填项。",
       "replacement": "\"快照/备份\" 是必填项"
     },
+    {
+      "pattern": "namespaces",
+      "replacement": "资源组"
+    },
+    {
+      "pattern": "replicaset",
+      "replacement": "副本集"
+    },
     {
       "pattern": "%",
        "replacement": ""

package/utils/errorTranslateNew.json

@@ -0,0 +1,39 @@
+{
+  "translations": [
+        {
+      "pattern": "Method (POST|GET|CREATE|DELETE|PUT|PATCH|OPTIONS|HEAD|TRACE|CONNECT) not supported",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "Cluster agent is not connected",
+      "replacement": "集群agent未连接",
+      "flags": "gi"
+    },
+    {
+      "pattern": "waiting for api to be available",
+      "replacement": "等待api可用",
+      "flags": "gi"
+    },
+    {
+      "pattern": "MissingRequired Cluster name",
+      "replacement": "缺少集群名称",
+      "flags": "gi"
+    },
+    {
+      "pattern": "users\\.management\\.cattle\\.io.*forbidden.*user.*cannot update resource.*users.*management\\.cattle\\.io.*cluster scope",
+      "replacement": "权限不足：当前用户无权修改用户资源。",
+      "flags": "gi"
+    },
+    {
+      "pattern": "Cluster agent is not connected",
+      "replacement": "集群agent未连接",
+      "flags": "gi"
+    },
+    {
+      "pattern": "waiting for api to be available",
+      "replacement": "等待api可用",
+      "flags": "gi"
+    }
+  ]
+}

package/vue.config.js

@@ -157,7 +157,7 @@ const getLoaders = (SHELL_ABS) => [
     test:    /\.m?[tj]sx?$/,
     // This excludes no modules except for node_modules/@rancher/... so that plugins can properly compile
     // when referencing @rancher/shell
-    exclude: /node_modules\/(?!(@rancher)\/).*/,
+    exclude: /node_modules\/(?!(dashboard-shell-shell)\/).*/,
     use:     [
       {
         loader:  'cache-loader',