dashboard-shell-shell 3.0.5-test.12 → 3.0.5-test.14

package/edit/workload/storage/persistentVolumeClaim/index.vue

@@ -121,8 +121,8 @@ export default {
           @removePvcForm="removePvcForm"
         />
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col mr-10">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -130,7 +130,16 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-        <div class="col span-6">
+        <div class="col" style="display: flex;align-items: center;">
+          <Checkbox
+            v-model:value="value.persistentVolumeClaim.readOnly"
+            :mode="mode"
+            :label="t('workload.storage.readOnly')"
+          />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledSelect
             v-if="!createNew"
             v-model:value="value.persistentVolumeClaim.claimName"
@@ -142,13 +151,6 @@ export default {
           />
         </div>
       </div>
-      <div class="row">
-        <Checkbox
-          v-model:value="value.persistentVolumeClaim.readOnly"
-          :mode="mode"
-          :label="t('workload.storage.readOnly')"
-        />
-      </div>
     </div>
   </div>
 </template>

package/edit/workload/storage/persistentVolumeClaim/persistentvolumeclaim.vue

@@ -156,8 +156,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.metadata.name"
           :mode="mode"
@@ -167,8 +167,9 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div style="width: 160px;"></div>
+      <div class="col">
         <RadioGroup
           v-model:value="isCreatePV"
           name="isCreatePV"
@@ -177,7 +178,9 @@ export default {
           :mode="mode"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-if="isCreatePV"
           v-model:value="spec.storageClassName"
@@ -200,16 +203,16 @@ export default {
       </div>
     </div>
 
-    <div class="row mb-10">
-      <div class="col span-6">
-        <div class="access-modes">
-          <t
-            class="text-label"
-            k="persistentVolumeClaim.accessModes"
-          />
-          <span class="text-error">*</span>
-        </div>
+    <div class="row">
+      <div class="col">
         <div class="access-modes">
+          <div style="width: 160px;">
+            <t
+              class="text-label"
+              k="persistentVolumeClaim.accessModes"
+            />
+            <span class="text-error">*</span>
+          </div>
           <Checkbox
             :mode="mode"
             :value="value.spec.accessModes.includes('ReadWriteOnce')"
@@ -232,7 +235,7 @@ export default {
       </div>
       <div
         v-if="isCreatePV"
-        class="col span-6"
+        class="col"
       >
         <UnitInput
           v-model:value="spec.resources.requests.storage"

package/edit/workload/storage/secret.vue

@@ -130,8 +130,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -139,8 +139,9 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="defaultMode"
             :mode="mode"
@@ -149,7 +150,7 @@ export default {
         </div>
       </div>
       <div class="row">
-        <div class="col span-6">
+        <div class="col">
           <LabeledSelect
             v-if="type==='secret'"
             v-model:value="value[type].secretName"
@@ -169,7 +170,9 @@ export default {
             :loading="loading"
           />
         </div>
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <RadioGroup
             v-model:value="optional"
             :mode="mode"

package/edit/workload/storage/vsphereVolume.vue

@@ -25,8 +25,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -35,8 +35,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.vsphereVolume.storagePolicyID"
           :mode="mode"
@@ -44,7 +44,9 @@ export default {
           :required="true"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.vsphereVolume.storagePolicyName"
           :mode="mode"
@@ -53,7 +55,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.vsphereVolume.volumePath"
           :mode="mode"
@@ -61,7 +63,9 @@ export default {
           :required="true"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.vsphereVolume.fsType"
           :mode="mode"

package/initialize/app-extended.js

@@ -55,7 +55,13 @@ async function extendApp(vueApp) {
   const next = (location) => appPartials.router.push(location);
   // Resolve route
 
-  const path = getLocation(router.options.base, router.options.mode);
+  let path = getLocation(router.options.base, router.options.mode);
+
+  // 🔹 增加 rewrite，不改变原逻辑
+  if (path.includes('/cloud/')) {
+    path = path.replace(/cloud/g, 'harvester');
+  }
+
   const route = router.resolve(path);
 
   // Set context to app.context

package/package.json

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

package/pages/account/index.vue

@@ -151,45 +151,36 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <BackLink :link="backLink" />
-    <h1>
-      <TabTitle breadcrumb="vendor-only">
-        {{ t('accountAndKeys.title') }}
-      </TabTitle>
-    </h1>
-
-    <h2 v-t="'accountAndKeys.account.title'" />
-    <div class="account">
-      <Principal
-        :value="principal.id"
-        :use-muted="false"
-        :show-labels="true"
-      />
-      <div>
-        <button
-          v-if="canChangePassword"
-          role="button"
-          :aria-label="t('accountAndKeys.account.change')"
-          type="button"
-          class="btn role-primary"
-          data-testid="account_change_password"
-          @click="showChangePasswordDialog"
-        >
-          {{ t("accountAndKeys.account.change") }}
-        </button>
+    <div style="display: flex;align-items: center;margin-bottom: 20px;">
+      <!-- <BackLink class="backLinkCls" :link="backLink" /> -->
+      <div style="font-size: 26px;">
+        <TabTitle breadcrumb="vendor-only">
+          {{ t('accountAndKeys.title') }}
+        </TabTitle>
       </div>
     </div>
 
-    <hr role="none">
-    <div class="keys-header">
-      <div>
-        <h2 v-t="'accountAndKeys.apiKeys.title'" />
-        <div class="api-url">
-          <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
-          <CopyToClipboardText
-            :aria-label="t('accountAndKeys.apiKeys.copyApiEnpoint')"
-            :text="apiUrl"
-          />
+    <div class="account_card mb-20">
+      <h5 v-t="'accountAndKeys.account.title'" />
+      <div class="account">
+        <Principal
+          :userLogoSize="79"
+          :value="principal.id"
+          :use-muted="false"
+          :show-labels="true"
+        />
+        <div>
+          <button
+            v-if="canChangePassword"
+            role="button"
+            :aria-label="t('accountAndKeys.account.change')"
+            type="button"
+            class="btn role-primary"
+            data-testid="account_change_password"
+            @click="showChangePasswordDialog"
+          >
+            {{ t("accountAndKeys.account.change") }}
+          </button>
         </div>
       </div>
       <button
@@ -203,31 +194,69 @@ export default {
         {{ t('accountAndKeys.apiKeys.add.label') }}
       </button>
     </div>
-    <div
-      v-if="apiKeySchema"
-      class="keys"
-    >
-      <ResourceTable
-        :schema="apiKeySchema"
-        :rows="apiKeys"
-        :headers="apiKeyheaders"
-        key-field="id"
-        data-testid="api_keys_list"
-        :search="true"
-        :row-actions="true"
-        :table-actions="true"
-      />
-    </div>
-    <div v-else>
-      <Banner
-        color="warning"
-        :label="t('accountAndKeys.apiKeys.notAllowed')"
-      />
+
+    <div class="account_card mb-20">
+      <div class="keys-header">
+        <div>
+          <h5 v-t="'accountAndKeys.apiKeys.title'" />
+          <div class="api-url">
+            <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
+            <CopyToClipboardText
+              :aria-label="t('accountAndKeys.apiKeys.copyApiEnpoint')"
+              :text="apiUrl"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="apiKeySchema"
+        class="keys"
+      >
+        <ResourceTable
+          :schema="apiKeySchema"
+          :rows="apiKeys"
+          :headers="apiKeyheaders"
+          key-field="id"
+          data-testid="api_keys_list"
+          :search="true"
+          :row-actions="true"
+          :table-actions="true"
+        >
+          <template #header-right>
+            <button
+              style="margin-right: 10px;"
+              v-if="apiKeySchema"
+              role="button"
+              :aria-label="t('accountAndKeys.apiKeys.add.label')"
+              class="btn role-primary add"
+              data-testid="account_create_api_keys"
+              @click="addKey"
+            >
+              {{ t('accountAndKeys.apiKeys.add.label') }}
+            </button>
+          </template>
+        </ResourceTable>
+      </div>
+      <div v-else>
+        <Banner
+          color="warning"
+          :label="t('accountAndKeys.apiKeys.notAllowed')"
+        />
+      </div>
     </div>
   </div>
 </template>
 
 <style lang='scss' scoped>
+  .account_card {
+    border: 1px solid #d7d7d7;
+    padding: 20px;
+    box-sizing: border-box;
+  }
+  :deep() .back-link {
+    font-size: 26px;
+    margin: 0 20px 0 0 !important;
+  }
   hr {
     margin: 20px 0;
   }
@@ -237,6 +266,10 @@ export default {
     justify-content: space-between
   }
 
+  .principal  .avatar {
+    width: 287px !important;
+  }
+
   .keys-header {
     display: flex;
     div {
@@ -254,6 +287,7 @@ export default {
 
   .api-url {
     display: flex;
+    margin: 20px 0;
 
     > span {
       margin-right: 6px;

package/pages/home.vue

@@ -486,7 +486,6 @@ export default defineComponent({
 
     <!-- 页签标题组件，不显示子页面标题和面包屑 -->
     <TabTitle
-      v-if="topLevelPermissionsVis"
       :show-child="false"
       :breadcrumb="false"
     >
@@ -496,14 +495,14 @@ export default defineComponent({
     </TabTitle>
 
     <!-- 首页欢迎横幅 -->
-    <BannerGraphic
+    <!-- <BannerGraphic
       v-if="topLevelPermissionsVis"
       :small="true"
       :title="t('landing.welcomeToRancher', {vendor})"
       :pref="HIDE_HOME_PAGE_CARDS"
       pref-key="welcomeBanner"
       data-testid="home-banner-graphic"
-    />
+    /> -->
     <IndentedPanel class="mt-20 mb-20">
 
        <!-- 主面板布局 -->
@@ -548,7 +547,7 @@ export default defineComponent({
                   v-if="canCreateCluster || !!provClusterSchema"
                   #header-right
                 >
-                  <div v-if="topLevelPermissionsVis" class="table-heading">
+                  <div class="table-heading">
                     <router-link
                       v-if="!!provClusterSchema"
                       :to="manageLocation"

package/rancher-components/Banner/Banner.vue

@@ -164,6 +164,7 @@ $icon-size: 24px;
   margin: 0px 0px 20px 0px;
   position: relative;
   width: 100%;
+  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; 
 

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/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/utils/errorTranslate.json

@@ -1,5 +1,85 @@
 {
   "translations": [
+    {
+      "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",
+      "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 格式",
@@ -832,11 +912,11 @@
     },
     {
       "pattern": "virtualmachinebackup.harvesterhci.io",
-      "replacement": "虚拟机备份"
+      "replacement": "虚拟机备份恢复"
     },
     {
       "pattern": "virtualmachinebackup.cloudhci.io",
-      "replacement": "虚拟机备份"
+      "replacement": "虚拟机备份恢复"
     },
     {
       "pattern": "vlanconfigs.network.harvesterhci.io",