dashboard-shell-shell 3.0.5-test.2 → 3.0.5-test.21

package/rancher-components/BadgeState/BadgeState.vue

@@ -63,60 +63,41 @@ export default defineComponent({
 </script>
 
 <template>
-  <span :class="['badge-state', bg]">
-    <i
-      v-if="icon"
-      class="icon"
-      :class="{[icon]: true, 'mr-5': !!msg}"
-    />{{ msg }}
-  </span>
+  <div style="display: flex;flex-direction: row;align-items: center;font-size: 12px;">
+    <div :class="{ [bg]: true }"></div>
+    <span style="margin-left: 5px;">{{ msg }}</span>
+    
+  </div>
 </template>
-
 <style lang="scss" scoped>
-  .badge-state {
-    align-items: center;
-    display: inline-flex;
-    padding: 2px 10px;
-    border: 1px solid transparent;
-    border-radius: 20px;
-
-    &.bg-info {
-      border-color: var(--info);
-    }
-
-    &.bg-error {
-      border-color: var(--error);
-    }
-
-    &.bg-warning {
-      border-color: var(--warning);
-    }
-
-    // Successful states are de-emphasized by using [text-]color instead of background-color
-    &.bg-success {
-      color: var(--success);
-      background: transparent;
-      border-color: var(--success);
-    }
-
-    // Added badge-disabled instead of bg-disabled since bg-disabled is used in other places with !important styling, an investigation is needed to make the naming consistent
-    &.badge-disabled {
-      color: var(--badge-state-disabled-text);
-      background-color: var( --badge-state-disabled-bg);
-      border: 1px solid var(--badge-state-disabled-border);
-    }
+  .bg-error {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #DD0C17; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
   }
-</style>
-<style lang="scss">
-  // TODO: #6005
-  // Investigate why this is here.. I don't think that styles for sortable table should belong here
-  .sortable-table TD .badge-state {
-    @include clip;
-    display: inline-block;
-    max-width: 100%;
-    position: relative;
-    max-width: 110px;
-    font-size: .85em;
-    vertical-align: middle;
+  .bg-darker {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #DD0C17; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
+  }
+  .bg-success {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #95F204 !important; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
+  }
+  .bg-warning {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #DAC342; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
+  }
+  .bg-info {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #1890FF; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
   }
 </style>

package/rancher-components/Banner/Banner.vue

@@ -164,6 +164,7 @@ $icon-size: 24px;
   margin: 0px 0px 20px 0px;
   position: relative;
   width: 100%;
+  min-height: 32px;
   color: var(--body-text);
 
   &__icon {
@@ -201,13 +202,15 @@ $icon-size: 24px;
   }
 
   &__content {
-    padding: 9px 10px; 
+    padding: 0px 10px; 
     transition: all 0.2s ease;
     line-height: 12px;
     width: 100%;
     border-left: solid $left-border-size transparent;
     display: flex;
     gap: 3px;
+    height: 32px;
+    align-items: center;
     word-wrap:break-word; 
     word-break:break-all; 
 
@@ -227,8 +230,8 @@ $icon-size: 24px;
     }
 
     .info & {
-      background: var(--info-banner-bg);
-      // background: #f2f2f2;
+      // background: var(--info-banner-bg);
+      background: #f2f2f2;
       border-color: var(--info);
     }
 

package/rancher-components/LabeledTooltip/LabeledTooltip.vue

@@ -123,8 +123,8 @@ export default defineComponent({
     &.null {
 
         .status-icon {
-          top: 5px;
-          right: -20px;
+          top: 8px !important;
+          right: 25px !important;
         }
     }
 
@@ -146,6 +146,35 @@ export default defineComponent({
     }
 }
 
+.labeled-select{
+  .labeled-tooltip{
+    &.null {
+        .status-icon {
+          top: 10px !important;
+          right: 25px !important;
+        }
+    }
+
+    &.error {
+
+        .status-icon {
+          top: 9px !important;
+          right: 20px;
+        }
+    }
+  }
+}
+.labeled-input{
+  .labeled-tooltip{
+    &.null {
+        .status-icon {
+          top: 10px !important;
+          right: 10px !important;
+        }
+    }
+  }
+}
+
 // Ensure code blocks inside tootips don't look awful
 .v-popper__popper.v-popper--theme-tooltip {
   .v-popper__inner {

package/rancher-components/RcDropdown/RcDropdownMenu.vue

@@ -33,10 +33,10 @@ const hasOptions = (options: DropdownOption[]) => {
       :data-testid="dataTestid"
       :aria-label="buttonAriaLabel"
     >
-      <div v-if="showIcon">
-        <i class="icon icon-actions" />
-      </div>
-      <a v-else href="javascript:;">操作</a>
+    <div v-if="showIcon">
+      <i data-v-5db2c2c7="" class="icon icon-actions" alt="More actions icon"></i>
+    </div>
+    <a v-else href="javascript:;">操作</a>
     </rc-dropdown-trigger>
     <template #dropdownCollection>
       <template
@@ -58,15 +58,16 @@ const hasOptions = (options: DropdownOption[]) => {
           </template> -->
           {{ a.label }}
         </rc-dropdown-item>
-        <rc-dropdown-separator
+        <!-- <rc-dropdown-separator
           v-else
-        />
+        /> -->
       </template>
       <rc-dropdown-item
         v-if="!hasOptions(options)"
         disabled
       >
-        暂无可执行的操作。
+        <!-- No actions available -->
+         暂无可执行的操作。
       </rc-dropdown-item>
     </template>
   </rc-dropdown>

package/scripts/publish-shell.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 执行命令示例：
-# TAG=shell-pkg-v3.0.2-rc.105 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-test.19 ./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 '?';
@@ -231,6 +232,9 @@ export const actions = {
     if ( !selected || !exists) {
       selected = 'zh-hans';
     }
+    
+    // selected = 'none'
+    selected = 'zh-hans'
 
     return dispatch('switchTo', selected);
   },

package/store/type-map.js

@@ -515,7 +515,7 @@ export const getters = {
   
   groupsForVirTypes(state) {
     return (product, name) => {
-      return state.virtualTypes?.[product].find(item => item.name === name)?.icon;
+      return state?.virtualTypes?.[product]?.find(item => item.name === name)?.icon;
     };
   },
 

package/types/shell/index.d.ts

@@ -3053,37 +3053,24 @@ export default class Resource {
         divider: boolean;
         action?: undefined;
         label?: undefined;
-        icon?: undefined;
         enabled?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         label: any;
-        icon: string;
         enabled: any;
         divider?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
-    } | {
-        action: string;
-        label: any;
-        icon: string;
-        bulkable: boolean;
-        bulkAction: string;
-        enabled: boolean;
-        weight: number;
-        divider?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         altAction: string;
         label: any;
-        icon: string;
         bulkable: boolean;
         enabled: any;
         bulkAction: string;
@@ -3095,37 +3082,24 @@ export default class Resource {
         divider: boolean;
         action?: undefined;
         label?: undefined;
-        icon?: undefined;
         enabled?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         label: any;
-        icon: string;
         enabled: any;
         divider?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
-    } | {
-        action: string;
-        label: any;
-        icon: string;
-        bulkable: boolean;
-        bulkAction: string;
-        enabled: boolean;
-        weight: number;
-        divider?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         altAction: string;
         label: any;
-        icon: string;
         bulkable: boolean;
         enabled: any;
         bulkAction: string;

package/utils/error.js

@@ -199,9 +199,11 @@ export function translateError(error) {
     
     if (matches) {
       if (matches.length == 1) {
+        console.log('00045', error);
         error = error.replace(regex, translation.replacement);
       } else {
-        error = translation.pattern.replace(/\$(.+)/g, (_, index) => matches[parseInt(index)]);
+        error = error.replace(regex, (...args) => translation.replacement.replace(/\$([1-9]\d*)/g, (_, idx) => args[Number(idx)] || ''))
+        console.log('00046', error);
       }
     }
   }

package/utils/errorTranslate.json

@@ -1,5 +1,246 @@
 {
   "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' 创建成功。",
+      "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 格式",
+      "flags": "gi"
+    },
+    {
+      "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": "校验失败：VPC 名称 \"$1\" 不符合 RFC 1123 子域名规则，只能使用小写字母、数字、'-' 或 '.'，且必须以字母/数字开头和结尾",
+      "flags": "gi"
+    },
+    {
+      "pattern": "validation 失败 in api",
+      "replacement": "API 校验失败",
+      "flags": "gi"
+    },
     {
      "pattern": "can't connect to backup target[\\s\\S]*no route to host",
     "replacement": "无法连接到备份目标：网络不可达，请检查备份服务器地址与路由",
@@ -817,11 +1058,11 @@
     },
     {
       "pattern": "virtualmachinebackup.harvesterhci.io",
-      "replacement": "虚拟机备份"
+      "replacement": "虚拟机备份恢复"
     },
     {
       "pattern": "virtualmachinebackup.cloudhci.io",
-      "replacement": "虚拟机备份"
+      "replacement": "虚拟机备份恢复"
     },
     {
       "pattern": "vlanconfigs.network.harvesterhci.io",
@@ -1328,6 +1569,10 @@
       "pattern": ""备份" 是必填项。",
       "replacement": "\"快照/备份\" 是必填项"
     },
+    {
+      "pattern": "namespaces",
+      "replacement": "资源组"
+    },
     {
       "pattern": "%",
        "replacement": ""

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',