dashboard-shell-shell 3.0.5-test.16 → 3.0.5-test.18

package/assets/translations/zh-hans.yaml

@@ -593,6 +593,7 @@ assignTo:
   workspace: 工作空间
 
 stateLabel:
+  Locked: 锁定
   Bound: 已绑定
   Running: 运行中
   Off: 关闭
@@ -671,7 +672,7 @@ buttonLabel:
 Errors:
   changePassword:
     Password must be at least 12 characters: 密码至少为12个字符
-    invalid current password: 当前的密码输入错误
+    "invalid current password": 当前的密码输入错误
 
 
 asyncButton:

package/components/Drawer/ResourceDetailDrawer/index.vue

@@ -3,7 +3,7 @@ import Drawer from '@shell/components/Drawer/Chrome.vue';
 import { useI18n } from '@shell/composables/useI18n';
 import { useStore } from 'vuex';
 import Tabbed from '@shell/components/Tabbed/index.vue';
-import YamlTab, { Props as YamlProps } from '@shell/components/Drawer/ResourceDetailDrawer/YamlTab.vue';
+// import YamlTab, { Props as YamlProps } from '@shell/components/Drawer/ResourceDetailDrawer/YamlTab.vue';
 import { useDefaultConfigTabProps, useDefaultYamlTabProps } from '@shell/components/Drawer/ResourceDetailDrawer/composables';
 import ConfigTab from '@shell/components/Drawer/ResourceDetailDrawer/ConfigTab.vue';
 import { computed, ref } from 'vue';
@@ -87,10 +87,10 @@ const canEdit = computed(() => {
           v-if="configTabProps"
           v-bind="configTabProps"
         />
-        <YamlTab
+        <!-- <YamlTab
           v-if="yamlTabProps"
           v-bind="yamlTabProps"
-        />
+        /> -->
       </Tabbed>
     </template>
     <template #additional-actions>

package/components/GlobalRoleBindings.vue

@@ -108,12 +108,7 @@ export default {
     } catch (e) { }
   },
   data() {
-
-    const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS') || ''
-
     return {
-      topLevelPermissions,
-
       // This not only identifies global roles but the order here is the order we want to display them in the UI
       globalPermissions: [
         'admin',
@@ -333,62 +328,60 @@ export default {
 
   <div v-else>
     <form v-if="selectedRoles">
-      <template>
-        <div
-          v-for="(sortedRole, roleType) in sortedRoles"
-          :key="roleType"
-          class="role-group mb-10"
+      <div
+        v-for="(sortedRole, roleType) in sortedRoles"
+        :key="roleType"
+        class="role-group mb-10"
+      >
+        <Card
+          v-if="Object.keys(sortedRole).length"
+          :show-highlight-border="false"
+          :show-actions="false"
         >
-          <Card
-            v-if="Object.keys(sortedRole).length"
-            :show-highlight-border="false"
-            :show-actions="false"
-          >
-            <template v-slot:title>
-              <div class="type-title">
-                <h3>{{ t(`rbac.globalRoles.types.${roleType}.label`) }}</h3>
-                <div class="type-description">
-                  {{ t(`rbac.globalRoles.types.${roleType}.description`, { isUser }) }}
-                </div>
+          <template v-slot:title>
+            <div class="type-title">
+              <h3>{{ t(`rbac.globalRoles.types.${roleType}.label`) }}</h3>
+              <div class="type-description">
+                {{ t(`rbac.globalRoles.types.${roleType}.description`, { isUser }) }}
               </div>
-            </template>
-            <template v-slot:body>
+            </div>
+          </template>
+          <template v-slot:body>
+            <div
+              class="checkbox-section"
+              :class="'checkbox-section--' + roleType"
+            >
               <div
-                class="checkbox-section"
-                :class="'checkbox-section--' + roleType"
+                v-for="(role, i) in sortedRoles[roleType]"
+                :key="i"
+                class="checkbox mb-10 mr-10"
               >
-                <div
-                  v-for="(role, i) in sortedRoles[roleType]"
-                  :key="i"
-                  class="checkbox mb-10 mr-10"
+                <Checkbox
+                  v-model:value="selectedRoles"
+                  :value-when-true="role.id"
+                  :disabled="!!assignOnlyRoles[role.id]"
+                  :label="role.nameDisplay"
+                  :description="role.descriptionDisplay"
+                  :mode="mode"
+                  :data-testId="'grb-checkbox-' + role.id"
+                  @update:value="checkboxChanged"
                 >
-                  <Checkbox
-                    v-model:value="selectedRoles"
-                    :value-when-true="role.id"
-                    :disabled="!!assignOnlyRoles[role.id]"
-                    :label="role.nameDisplay"
-                    :description="role.descriptionDisplay"
-                    :mode="mode"
-                    :data-testId="'grb-checkbox-' + role.id"
-                    @update:value="checkboxChanged"
-                  >
-                    <template #label>
-                      <div class="checkbox-label-slot">
-                        <span class="checkbox-label">{{ role.nameDisplay }}</span>
-                        <i
-                          v-if="!!assignOnlyRoles[role.id]"
-                          v-clean-tooltip="t('rbac.globalRoles.assignOnlyRole')"
-                          class="checkbox-info icon icon-info icon-lg"
-                        />
-                      </div>
-                    </template>
-                  </Checkbox>
-                </div>
+                  <template #label>
+                    <div class="checkbox-label-slot">
+                      <span class="checkbox-label">{{ role.nameDisplay }}</span>
+                      <i
+                        v-if="!!assignOnlyRoles[role.id]"
+                        v-clean-tooltip="t('rbac.globalRoles.assignOnlyRole')"
+                        class="checkbox-info icon icon-info icon-lg"
+                      />
+                    </div>
+                  </template>
+                </Checkbox>
               </div>
-            </template>
-          </Card>
-        </div>
-      </template>
+            </div>
+          </template>
+        </Card>
+      </div>
     </form>
   </div>
 </template>

package/components/Resource/Detail/TitleBar/composables.ts

@@ -14,7 +14,22 @@ export const useDefaultTitleBarProps = (resource: any, resourceSubtype?: Ref<str
     const resourceSubtypeValue = toValue(resourceSubtype);
     const currentStore = store.getters['currentStore'](resourceValue.type);
     const schema = store.getters[`${ currentStore }/schemaFor`](resourceValue.type);
-    const resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+    let resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+
+    // 转换为中文
+    const displayName_zh_hans: Record<string, string> = {
+      'GlobalRole': '全局角色',
+      'RoleTemplate': '集群角色',
+    }
+
+    if (displayName_zh_hans[resourceTypeLabel]) {
+      resourceTypeLabel = displayName_zh_hans[resourceTypeLabel]
+    }
+    
+    if (resourceTypeLabel == '集群角色' && (route.query?.roleContext == 'NAMESPACE' || resource?.parentLocationOverride?.hash == '#NAMESPACE')) {
+      resourceTypeLabel = '项目或资源组角色'
+    }
+    
     const resourceName = resourceSubtypeValue ? `${ resourceSubtypeValue } - ${ resourceValue.nameDisplay }` : resourceValue.nameDisplay;
     const resourceTo = resourceValue.listLocation || {
       name:   'c-cluster-product-resource',

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

@@ -119,7 +119,7 @@ watch(
 
 <template>
   <div class="title-bar">
-    <breadcrumb :resource="resource"/>
+    <breadcrumb :resourceTypeLabel="resourceTypeLabel" :resource="resource"/>
     <Top>
       <Title class="title">
         <span class="detailIcon-span">

package/components/breadcrumb/index.vue

@@ -1,54 +1,18 @@
 <script>
-import { Banner } from '@components/Banner';
 import { get } from '@shell/utils/object';;
-import {
-  AS, _DETAIL, _CONFIG, _YAML, MODE, _CREATE, _EDIT, _VIEW, _UNFLAG, _GRAPH
-} from '@shell/config/query-params';
-import { ExtensionPoint, PanelLocation } from '@shell/core/types';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import { useStore } from 'vuex';
 
-// i18n-uses resourceDetail.header.*
-
-/**
- * Resource Detail Masthead component.
- *
- * ToDo: this component seem to be picking up a lot of logic from special cases, could be simplified down to parameters and then customized per use-case via wrapper component
- */
 export default {
 
-  name: 'MastheadResourceDetail',
+  name: 'MastheadBreadcrumb',
 
   components: {
-    // BadgeState,
-    Banner,
   },
   props: {
-    value: {
-      type:    Object,
-      default: () => {
-        return {};
-      }
-    },
-
-    mode: {
-      type:    String,
-      default: 'view'
-    },
-
-    realMode: {
-      type:    String,
-      default: 'view'
-    },
-
-    as: {
+    resourceTypeLabel: {
       type:    String,
-      default: _YAML,
-    },
-
-    storeOverride: {
-      type:    String,
-      default: null,
+      default: ''
     },
 
     resource: {
@@ -56,15 +20,10 @@ export default {
       default: null,
     },
 
-    resourceSubtype: {
-      type:    String,
-      default: null,
-    },
-
-    parentRouteOverride: {
+    realMode: {
       type:    String,
-      default: null,
-    },
+      default: 'view',
+    }
 
   },
 
@@ -77,82 +36,10 @@ export default {
 
   data() {
     return {
-      DETAIL_VIEW:       _DETAIL,
-      extensionType:     ExtensionPoint.PANEL,
-      extensionLocation: PanelLocation.DETAILS_MASTHEAD,
-      Svg:               require('~shell/assets/images/API.svg')
     };
   },
 
   computed: {
-    dev() {
-      return this.$store.getters['prefs/dev'];
-    },
-
-    schema() {
-      const inStore = this.storeOverride || this.$store.getters['currentStore'](this.resource);
-
-      return this.$store.getters[`${ inStore }/schemaFor`]( this.resource );
-    },
-
-    isProjectHelmChart() {
-      return this.schema?.id === HELM.PROJECTHELMCHART;
-    },
-
-    shouldHifenize() {
-      return (this.mode === 'view' || this.mode === 'edit') && this.resourceSubtype?.length && this.value?.nameDisplay?.length;
-    },
-
-    parent() {
-      const displayName = this.value?.parentNameOverride || this.$store.getters['type-map/labelFor'](this.schema);
-      const product = this.$store.getters['currentProduct'].name;
-
-      const defaultLocation = {
-        name:   'c-cluster-product-resource',
-        params: {
-          resource: this.resource,
-          product,
-        }
-      };
-
-      const location = this.value?.parentLocationOverride || defaultLocation;
-
-      if (this.parentRouteOverride) {
-        location.name = this.parentRouteOverride;
-      }
-
-      const typeOptions = this.$store.getters[`type-map/optionsFor`]( this.resource );
-
-      // 转换为中文
-      const displayName_zh_hans = {
-        'GlobalRole': '全局角色',
-        'RoleTemplate': '集群角色',
-      }
-      if (displayName_zh_hans[displayName]) {
-        displayName = displayName_zh_hans[displayName]
-      }
-      
-      if (displayName == '集群角色' && (this.$route.query?.roleContext == 'NAMESPACE' || location.hash == '#NAMESPACE')) {
-        displayName = '项目或资源组角色'
-      }
-
-      const out = {
-        displayName, location, ...typeOptions
-      };
-
-      return out;
-    },
-
-
-    displayName() {
-      let displayName = this.value.nameDisplay;
-
-      if (this.isProjectHelmChart) {
-        displayName = this.value.projectDisplayName;
-      }
-
-      return this.shouldHifenize ? ` - ${ displayName }` : displayName;
-    },
 
     demoDisplay() {
 
@@ -177,12 +64,6 @@ export default {
       return partsEn;
     },
 
-    location() {
-      const { parent } = this;
-
-      return parent?.location;
-    },
-
   },
 
   methods: {
@@ -206,7 +87,7 @@ export default {
           <span>/</span>
         </span>
         <span class="excram-last-name">
-          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent.displayName }}
+          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + resourceTypeLabel }}
         </span>
       </div>
     </div>
@@ -215,71 +96,6 @@ export default {
 
 <style lang='scss' scoped>
 
-  HEADER {
-    margin: 0;
-  }
-
-  .primaryheader {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    font-size:14px;
-    height: 50px;
-
-    h1 {
-      margin: 0;
-    }
-  }
-
-  .subheader{
-    display: flex;
-    flex-direction: row;
-    color: var(--input-label);
-    & > * {
-      margin: 5px 20px 5px 0px;
-    }
-
-    .live-data {
-      color: var(--body-text)
-    }
-  }
-
-  .state-banner {
-    margin: 3px 0 0 0;
-  }
-
-  .masthead-state {
-    font-size: initial;
-    display: inline-block;
-    position: relative;
-    /* top: -2px; */
-    font-size: 12px;
-    margin-left: 5px;
-  }
-
-  .masthead-istio {
-    .icon {
-      vertical-align: middle;
-      color: var(--primary);
-    }
-  }
-
-  .left-right-split {
-    display: grid;
-    align-items: center;
-
-    .left-half {
-      grid-column: 1;
-    }
-
-    .right-half {
-      grid-column: 2;
-    }
-  }
-
-  .resource-external {
-    font-size: 18px;
-  }
   .excram-list{
     font-size: 14px;
     margin-bottom: 20px;
@@ -287,10 +103,7 @@ export default {
   .excram-last-name{
     color: var(--link);
   }
-  .valid{
-    color: #d7d7d7;
-    margin: 0px 10px;
-  }
+
   .detailIcon-span{
     width: 24px;
     height: 24px;
@@ -306,11 +119,5 @@ export default {
     left: 4px;
     top: -2px;
   }
-  .primary-title{
-    display: flex;
-    align-items: center;
-  }
-  .detailIcon-span-title{
-    font-weight: bold;
-  }
+
 </style>

package/components/form/ArrayList.vue

@@ -265,7 +265,7 @@ export default {
   >
 
     <div class="row">
-      <div class="col">
+      <div style="width: 100%;" class="col">
         <div
           v-if="title"
           class="clearfix"
@@ -289,7 +289,7 @@ export default {
           </slot>
         </div>
       </div>
-      <div class="col">
+      <div style="width: 100%;" class="col">
         <div>
           <template v-if="rows.length">
             <div

package/components/form/ChangePassword.vue

@@ -432,7 +432,7 @@ export default {
     }
 
     &.create, &.edit {
-      height: 185px;
+      height: 160px;
       .form {
         .fields {
           display: flex;

package/components/form/KeyValue.vue

@@ -392,10 +392,10 @@ export default {
 
       rows = rows.map((item) => {
         if (item.key.includes('harvester')) {
-          item.key = item.key.replace('harvester', 'cloud');
+          item.key = item.key?.replace('harvester', 'cloud');
         }
         if (item.value.includes('harvester')) {
-          item.value = item.value.replace('harvester', 'cloud');
+          item.value = item.value?.replace('harvester', 'cloud');
         }
 
         return item;
@@ -411,8 +411,8 @@ export default {
         [this.valueName]: value,
       };
 
-      obj.key = obj.key.replace('harvester', 'cloud');
-      obj.value = obj.value.replace('harvester', 'cloud');
+      obj.key = obj.key?.replace('harvester', 'cloud');
+      obj.value = obj.value?.replace('harvester', 'cloud');
       obj.binary = false;
       obj.canEncode = this.handleBase64;
       obj.supported = true;
@@ -494,8 +494,8 @@ export default {
           // let value = (row[valueName] || '');
           // const key = (row[keyName] || '').trim();
 
-          const key = (row[keyName].replace('cloud', 'harvester') || '').trim();
-          let value = (row[valueName].replace('cloud', 'harvester') || '').trim();
+          const key = (row[keyName]?.replace('cloud', 'harvester') || '').trim();
+          let value = (row[valueName]?.replace('cloud', 'harvester') || '').trim();
 
           if (value && typeOf(value) === 'object') {
             out[key] = JSON.parse(JSON.stringify(value));

package/components/form/Members/ClusterMembershipEditor.vue

@@ -56,6 +56,6 @@ export default {
     :type="NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING"
     :mode="mode"
     parent-key="clusterId"
-    :parent-id="parentId"
+    :parent-id="parentId"
   />
 </template>

package/components/form/Members/ClusterPermissionsEditor.vue

@@ -161,11 +161,11 @@ export default {
           value:       'member'
         },
         ...customRoles,
-        {
-          label:       this.t('members.clusterPermissions.custom.label'),
-          description: this.t('members.clusterPermissions.custom.description'),
-          value:       'custom'
-        }
+        // {
+        //   label:       this.t('members.clusterPermissions.custom.label'),
+        //   description: this.t('members.clusterPermissions.custom.description'),
+        //   value:       'custom'
+        // }
       ];
     },
     principal() {

package/components/form/Members/MembershipEditor.vue

@@ -170,7 +170,7 @@ export default {
   >
     <template #column-headers>
       <div class="box mb-0">
-        <div class="column-headers row" style="width: 95%;">
+        <div class="column-headers row" style="width: calc(100% - 100px);">
           <div class="col span-6">
             <label class="text-label">{{ t('membershipEditor.user') }}</label>
           </div>
@@ -181,7 +181,7 @@ export default {
       </div>
     </template>
     <template #columns="{row, i}">
-      <div class="columns row">
+      <div style="width: 100%;" class="columns row">
         <div class="col span-6">
           <Principal
             :value="row.value.principalId"

package/components/form/ResourceQuota/Namespace.vue

@@ -72,13 +72,13 @@ export default {
 <template>
   <div>
     <div class="headers mb-10">
-      <div style="width: 400px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.resourceType') }}</label>
       </div>
-      <div style="width: 400px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.projectResourceAvailability') }}</label>
       </div>
-      <div style="width: 500px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.limit') }}</label>
       </div>
     </div>
@@ -101,7 +101,7 @@ export default {
 .headers {
     display: flex;
     flex-direction: row;
-    justify-content: space-between;
+    justify-content: left;
     align-items: center;
     border-bottom: 1px solid var(--border);
     height: 30px;

package/components/form/ResourceQuota/NamespaceRow.vue

@@ -175,13 +175,15 @@ export default {
     v-if="typeOption"
     class="rowNew"
   >
-    <Select
-      :mode="mode"
-      :value="type"
-      :disabled="true"
-      :options="types"
-    />
-    <div class="resource-availability">
+    <div style="width: 450px;">
+      <Select
+        :mode="mode"
+        :value="type"
+        :disabled="true"
+        :options="types"
+      />
+    </div>
+    <div style="width: 450px;" class="resource-availability">
       <PercentageBar
         v-clean-tooltip="tooltip"
         class="percentage-bar"
@@ -190,7 +192,7 @@ export default {
         :color-stops="{'100': '--primary'}"
       />
     </div>
-    <div style="width: 500px;">
+    <div style="width: 450px;">
       <UnitInput
         :value="value.limit[type]"
         :mode="mode"
@@ -212,7 +214,7 @@ export default {
   .rowNew {
     margin-bottom: 10px;
     display: flex;
-    justify-content: space-between !important;
+    justify-content: left;
 
     & > * {
       width: 400px;

package/components/form/ResourceQuota/Project.vue

@@ -57,14 +57,14 @@ export default {
 </script>
 <template>
   <div>
-    <div style="justify-content: space-between;" class="headers mb-10">
-      <div style="width: 400px;">
+    <div style="justify-content: left;" class="headers mb-10">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.resourceType') }}</label>
       </div>
-      <div style="width: 400px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.projectLimit') }}</label>
       </div>
-      <div style="width: 400px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.namespaceDefaultLimit') }}</label>
       </div>
     </div>

package/components/form/ResourceQuota/ProjectRow.vue

@@ -72,41 +72,47 @@ export default {
     v-if="typeOption"
     class="rowNew"
   >
-    <Select
-      :value="type"
-      :mode="mode"
-      :options="types"
-      data-testid="projectrow-type-input"
-      @update:value="updateType($event)"
-    />
-    <UnitInput
-      :value="resourceQuotaLimit[type]"
-      :mode="mode"
-      :placeholder="typeOption.placeholder"
-      :increment="typeOption.increment"
-      :input-exponent="typeOption.inputExponent"
-      :base-unit="typeOption.baseUnit"
-      :output-modifier="true"
-      data-testid="projectrow-project-quota-input"
-      @update:value="updateQuotaLimit('resourceQuota', type, $event)"
-    />
-    <UnitInput
-      :value="namespaceDefaultResourceQuotaLimit[type]"
-      :mode="mode"
-      :placeholder="typeOption.placeholder"
-      :increment="typeOption.increment"
-      :input-exponent="typeOption.inputExponent"
-      :base-unit="typeOption.baseUnit"
-      :output-modifier="true"
-      data-testid="projectrow-namespace-quota-input"
-      @update:value="updateQuotaLimit('namespaceDefaultResourceQuota', type, $event)"
-    />
+    <div style="width: 450px;">
+      <Select
+        :value="type"
+        :mode="mode"
+        :options="types"
+        data-testid="projectrow-type-input"
+        @update:value="updateType($event)"
+      />
+    </div>
+    <div style="width: 450px;">
+      <UnitInput
+        :value="resourceQuotaLimit[type]"
+        :mode="mode"
+        :placeholder="typeOption.placeholder"
+        :increment="typeOption.increment"
+        :input-exponent="typeOption.inputExponent"
+        :base-unit="typeOption.baseUnit"
+        :output-modifier="true"
+        data-testid="projectrow-project-quota-input"
+        @update:value="updateQuotaLimit('resourceQuota', type, $event)"
+      />
+    </div>
+    <div style="width: 450px;">
+      <UnitInput
+        :value="namespaceDefaultResourceQuotaLimit[type]"
+        :mode="mode"
+        :placeholder="typeOption.placeholder"
+        :increment="typeOption.increment"
+        :input-exponent="typeOption.inputExponent"
+        :base-unit="typeOption.baseUnit"
+        :output-modifier="true"
+        data-testid="projectrow-namespace-quota-input"
+        @update:value="updateQuotaLimit('namespaceDefaultResourceQuota', type, $event)"
+      />
+    </div>
   </div>
 </template>
 
 <style lang='scss' scoped>
   .rowNew {
     display: flex;
-    justify-content: space-between !important;
+    justify-content: left;
   }
 </style>

package/components/nav/Type.vue

@@ -141,7 +141,7 @@ export default {
       <a
         role="link"
         :aria-label="type.labelKey ? t(type.labelKey) : (type.labelDisplay || type.label)"
-        :href="href"
+        :href="href.replace(/harvester/g, 'cloud')"
         class="type-link"
         :aria-current="isActive ? 'page' : undefined"
         @click="selectType(); navigate($event);"
@@ -199,7 +199,7 @@ export default {
   >
     <a
       role="link"
-      :href="type.link"
+      :href="type.link.replace(/harvester/g, 'cloud')"
       :target="type.target"
       rel="noopener noreferrer nofollow"
       :aria-label="type.label"

package/package.json

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

package/pages/auth/setup.vue

@@ -21,6 +21,7 @@ import FormValidation from '@shell/mixins/form-validation';
 import isUrl from 'is-url';
 import { isLocalhost } from '@shell/utils/validators/setting';
 import Loading from '@shell/components/Loading';
+import { copyTextToClipboard } from '@shell/utils/clipboard';
 
 const calcIsFirstLogin = (store) => {
   const firstLoginSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.FIRST_LOGIN);
@@ -259,6 +260,14 @@ export default {
       this.$router.replace('/');
     },
 
+    copyPassword(val) {
+      copyTextToClipboard(val).then(() => {
+        console.log('复制成功')
+      }).catch(() => {
+        console.log('复制失败')
+      });
+    },
+
     onServerUrlChange(value) {
       this.serverUrl = value.trim();
     },
@@ -324,13 +333,14 @@ export default {
             >
             <div class="mb-20">
               <RadioGroup
+                class="setupRadioGroupCls"
                 v-model:value="useRandom"
                 data-testid="setup-password-mode"
                 name="password-mode"
                 :options="passwordOptions"
               />
             </div>
-            <div class="mb-20">
+            <div class="setup_radom-password mb-20">
               <LabeledInput
                 v-if="useRandom"
                 ref="password"
@@ -347,13 +357,9 @@ export default {
                 >
                   <div
                     class="addon"
-                    style="padding: 0 0 0 0px;"
+                    style="padding: 4px 0px 0px;"
                   >
-                    <CopyToClipboard
-                      :aria-label="t('setup.copyRandom')"
-                      :text="password"
-                      class="btn-sm"
-                    />
+                    <a @click="copyPassword(password)" href="javascript:;">复制</a>
                   </div>
                 </template>
               </LabeledInput>
@@ -367,15 +373,17 @@ export default {
                 :required="true"
               />
             </div>
-            <Password
-              v-show="!useRandom"
-              v-model:value.trim="confirm"
-              autocomplete="new-password"
-              data-testid="setup-password-confirm"
-               class="setup-password"
-              :label="t('setup.confirmPassword')"
-              :required="true"
-            />
+            <div class="setup_radom-password">
+              <Password
+                v-show="!useRandom"
+                v-model:value.trim="confirm"
+                autocomplete="new-password"
+                data-testid="setup-password-confirm"
+                 class="setup-password"
+                :label="t('setup.confirmPassword')"
+                :required="true"
+              />
+            </div>
           </template>
 
           <template v-if="isFirstLogin">
@@ -467,6 +475,16 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+  .setup_radom-password {
+    :deep(.label-input-all) LABEL {
+      color: #fff;
+    }
+  }
+  .setupRadioGroupCls {
+    :deep(.radio-label) {
+      color: #fff;
+    }
+  }
   .principal {
     display: block;
     background: var(--box-bg);
@@ -538,6 +556,7 @@ export default {
     }
 
     .setup-title {
+      color: #fff;
       :deep() code {
         font-size: 12px;
         padding: 0;

package/scripts/publish-shell.sh

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

package/utils/errorTranslate.json

@@ -1,5 +1,98 @@
 {
   "translations": [
+    {
+      "pattern": "role is locked and cannot be assigned",
+      "replacement": "角色已被锁定，不能再分配"
+    },
+    {
+      "pattern": "invalid current password",
+      "replacement": "重复密码无效"
+    },
+    {
+      "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' 创建成功。",
@@ -87,7 +180,7 @@
     },
     {
       "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"
     },
     {