dashboard-shell-shell 3.0.5-test.45 → 3.0.5-test.46

package/assets/translations/zh-hans.yaml

@@ -595,7 +595,10 @@ assignTo:
   workspace: 工作空间
 
 stateLabel:
+  Wait Check-In: 等待加入
+  Provisioning: 配置中
   Waiting: 等待中
+  waiting: 等待中
   Images preloading: 图像预加载中
   Images preloaded: 图像已预加载
   Waiting Reboot: 等待重启
@@ -1879,10 +1882,13 @@ cluster:
       searchPlaceholder: 请输入搜索
       noResults: 没有匹配的结果
   privateRegistry:
-    label: 为 Rancher 系统容器镜像启用集群级别的容器镜像仓库
-    description: "如果启用，Rancher 将在集群配置期间从该镜像仓库中拉取容器镜像。默认情况下，Rancher 在安装 Rancher 的官方 Helm Chart 应用程序时也会使用此镜像仓库。如果集群级别的镜像仓库被禁用，将从全局设置中的系统默认镜像仓库中拉取系统镜像。"
-    docsLinkRke2: "如需配置私有镜像仓库 mirror 的帮助，请参阅 RKE2 <a href=\"https://docs.rke2.io/install/private_registry\" target=\"_blank\">文档</a>。"
-    docsLinkK3s: "如需配置私有镜像仓库 mirror 的帮助，请参阅 K3s <a href=\"https://docs.k3s.io/installation/private-registry\" target=\"_blank\">文档</a>。"
+    header: Rancher 系统容器镜像仓库
+    label: 为 Rancher 系统容器镜像启用集群范围容器镜像仓库
+    description: "如果启用，Rancher 将在集群配置期间从此镜像仓库拉取容器镜像。默认情况下，Rancher 在安装官方 Helm Chart 应用时也会使用此镜像仓库。如果禁用集群范围镜像仓库，系统镜像将从全局设置中的系统默认镜像仓库拉取。"
+    importedDescription: "默认情况下，Rancher 在安装官方 Helm Chart 应用时也会使用此镜像仓库。如果禁用集群范围镜像仓库，系统镜像将从全局设置中的系统默认镜像仓库拉取。"
+    docsLinkRke2: "有关配置私有镜像仓库的帮助，请参阅 RKE2 <a href=\"https://docs.rke2.io/install/private_registry\" target=\"_blank\">文档。</a>"
+    docsLinkK3s: "有关配置私有镜像仓库的帮助，请参阅 K3s <a href=\"https://docs.k3s.io/installation/private-registry\" target=\"_blank\">文档。</a>"
+    privateRegistryUrlError: 镜像仓库必须是有效的 URL。协议头可选。
   provider:
     aliyunecs: Aliyun ECS
     aliyunkubernetescontainerservice: Alibaba ACK
@@ -3238,6 +3244,7 @@ managementNode:
 
 members:
   clusterMembers: 集群成员
+  memberRoles: 成员角色
   clusterAndProject: 集群和项目成员
   createActionLabel: 添加
   clusterMembership: 集群成员

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

@@ -197,11 +197,11 @@ watch(
           :aria-label="i18n.t('component.resource.detail.titleBar.ariaLabel.showConfiguration', { resource: resourceName })"
           @click="() => emit('show-configuration', showConfigurationReturnFocusSelector)"
         >
-          <img
+         <!-- <img
             :src="showConfigurationIcon"
             class="mmr-3"
             aria-hidden="true"
-          >
+          > -->
           {{ i18n.t('component.resource.detail.titleBar.showConfiguration') }}
         </RcButton>
         <ActionMenu

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;
@@ -1854,7 +1870,7 @@ export default {
         class="paging"
       >
         <div style="height: 100%; align-content: center;">
-          共 {{ filteredRows ? filteredRows.length : 0 }} 条
+          共 {{ totalCount ? totalCount : 0 }} 条
         </div>
 
         <button

package/components/nav/Header.vue

@@ -425,128 +425,7 @@ export default {
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
     </div>
 
-    <!-- <div
-      class="menu-spacer"
-      :class="{'isSingleProduct': isSingleProduct }"
-    >
-      <router-link
-        v-if="isSingleProduct && !isRancherInHarvester"
-        :to="singleProductLogoRoute"
-        role="link"
-        :alt="t('branding.logos.home')"
-      >
-        <BrandImage
-          v-if="isSingleProduct.supportCustomLogo && isHarvester"
-          class="side-menu-logo"
-          file-name="harvester.svg"
-          :support-custom-logo="true"
-          :alt="t('branding.logos.label')"
-        />
-        <img
-          v-else
-          class="side-menu-logo"
-          :src="isSingleProduct.logo"
-          :alt="t('branding.logos.label')"
-        >
-      </router-link>
-    </div>
-
-    <div
-      v-if="!simple"
-      ref="product"
-      class="product"
-    >
-      <div
-        v-if="currentProduct && currentProduct.showClusterSwitcher"
-        v-clean-tooltip="nameTooltip"
-        class="cluster cluster-clipped"
-      >
-        <div
-          v-if="isSingleProduct && !isRancherInHarvester"
-          class="product-name"
-        >
-          <template v-if="isSingleProduct.supportCustomLogo">
-            {{ vendor }}
-          </template>
-          <template v-else>
-            {{ t(isSingleProduct.productNameKey) }}
-          </template>
-        </div>
-        <template v-else>
-          <ClusterProviderIcon
-            v-if="currentCluster"
-            :cluster="currentCluster"
-            class="mr-10"
-            :alt="t('branding.logos.label')"
-          />
-          <div
-            v-if="currentCluster"
-            ref="clusterName"
-            class="cluster-name"
-          >
-            {{ currentCluster.spec.displayName }}
-          </div>
-          <ClusterBadge
-            v-if="currentCluster"
-            :cluster="currentCluster"
-            class="ml-10"
-            :alt="t('branding.logos.label')"
-          />
-          <div
-            v-if="!currentCluster"
-            class="simple-title"
-          >
-            <BrandImage
-              class="side-menu-logo-img"
-              file-name="rancher-logo.svg"
-              :alt="t('branding.logos.label')"
-            />
-          </div>
-        </template>
-      </div>
-      <div
-        v-if="currentProduct && !currentProduct.showClusterSwitcher"
-        class="cluster"
-      >
-        <img
-          v-if="currentProduct.iconHeader"
-          v-bind="$attrs"
-          :src="currentProduct.iconHeader"
-          class="cluster-os-logo mr-10"
-          style="width: 44px; height: 36px;"
-          :alt="t('branding.logos.label')"
-        >
-        <div class="product-name">
-          {{ prod }}
-        </div>
-      </div>
-    </div>
-
-    <div
-      v-else
-      class="simple-title"
-    >
-      <div
-        v-if="isSingleProduct"
-        class="product-name"
-      >
-        {{ t(isSingleProduct.productNameKey) }}
-      </div>
-
-      <div
-        v-else
-        class="side-menu-logo"
-      >
-        <BrandImage
-          class="side-menu-logo-img"
-          data-testid="header__brand-img"
-          file-name="rancher-logo.svg"
-          :alt="t('branding.logos.label')"
-        />
-      </div>
-    </div> -->
-
-      <!-- ===== 左侧 logo 区域 ===== -->
+    <!-- ===== 左侧 logo 区域 ===== -->
     <div class="menu-spacer">
       <!-- 如果是单产品模式且不是 RancherInHarvester，就显示 logo 路由跳转 -->
       <router-link
@@ -593,7 +472,7 @@ export default {
         <template v-if="currentProduct && currentProduct.showClusterSwitcher">
 
           <!-- 导入 YAML 按钮 -->
-          <button
+          <!-- <button
             v-if="showImportYaml"
             v-clean-tooltip="t('nav.import')"
             :disabled="!importEnabled"
@@ -606,9 +485,9 @@ export default {
             @click="openImport()"
           >
             <i class="icon icon-upload icon-lg" />
-          </button>
+          </button> -->
 
-          <button
+          <!-- <button
             v-if="showKubeShell"
             id="btn-kubectl"
             v-clean-tooltip="t('nav.shellShortcut', {key: shellShortcut})"
@@ -623,10 +502,10 @@ export default {
             @click="currentCluster.openShell()"
           >
             <i class="icon icon-terminal icon-lg" />
-          </button>
+          </button> -->
 
           <!-- 下载 kubeconfig 按钮 -->
-          <button
+          <!-- <button
             v-if="showKubeConfig"
             v-clean-tooltip="t('nav.kubeconfig.download')"
             :disabled="!kubeConfigEnabled"
@@ -639,10 +518,10 @@ export default {
             @click="currentCluster.downloadKubeConfig()"
           >
             <i class="icon icon-file icon-lg" />
-          </button>
+          </button> -->
 
           <!-- 复制 kubeconfig 按钮 -->
-          <button
+          <!-- <button
             v-if="showCopyConfig"
             v-clean-tooltip="t('nav.kubeconfig.copy')"
             :disabled="!kubeConfigEnabled"
@@ -655,18 +534,16 @@ export default {
             @click="copyKubeConfig($event)"
           >
             
-            <!-- 点击复制后显示对勾 -->
             <i
               v-if="kubeConfigCopying"
               class="icon icon-checkmark icon-lg"
             />
 
-            <!-- 未复制状态显示复制图标 -->
             <i
               v-else
               class="icon icon-copy icon-lg"
             />
-          </button>
+          </button> -->
         </template>
 
         <!-- 资源搜索按钮 -->
@@ -1024,7 +901,7 @@ export default {
         border: none;
         background: var(--header-btn-bg);
         color: var(--header-btn-text);
-        padding: 0 15px 0 10px;
+        padding: 0 10px 0 10px;
         line-height: 32px;
         min-height: 32px;
         width: 30px;

package/models/workload.js

@@ -199,8 +199,8 @@ export default class Workload extends WorkloadService {
     }
 
     this.$dispatch('growl/error', {
-      title:   'Unavailable',
-      message: 'There are no running pods to execute a shell in.'
+      title:   '不可用',
+      message: '没有正在运行的 Pod 可用来执行 Shell。'
     }, { root: true });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.5-test.45",
+  "version": "3.0.5-test.46",
   "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.45 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-test.46 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail
 

package/utils/errorTranslate.json

@@ -1,5 +1,15 @@
 {
   "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",
@@ -1614,10 +1624,6 @@
       "pattern": "nad ",
       "replacement": "虚拟网络"
     },
-    {
-      "pattern": " is",
-      "replacement": "是"
-    },
     {
       "pattern": "please ",
       "replacement": "请"
@@ -1706,14 +1712,6 @@
       "pattern": "replicaset",
       "replacement": "副本集"
     },
-    {
-      "pattern": "Cluster",
-      "replacement": "名称"
-    },
-    {
-      "pattern": "name",
-      "replacement": "名称"
-    },
     {
       "pattern": "%",
        "replacement": ""