dashboard-shell-shell 3.0.5-test.56 → 3.0.5-test.59

package/components/nav/Header.vue

@@ -80,7 +80,7 @@ export default {
       ctx:                    this,
       showImportModal:        false,
       showSearchModal:        false,
-      userIcon:               require('@shell/assets/images/logo.svg'),
+      userIcon:               require('@shell/assets/images/logo.png'),
     };
   },
 
@@ -277,14 +277,14 @@ export default {
 
   methods: {
 
-    LogOutfn(type) {
-      sessionStorage.removeItem('TOPLEVELPERMISSIONS');
+    LogOutfn (type) {
+      sessionStorage.removeItem('TOPLEVELPERMISSIONS')
       if (type === '1') {
-        this.$router.push({ name: 'account' });
+        this.$router.push({ name: 'account'})
       } else if (type === '2') {
-        this.showSloModal();
+        this.showSloModal()
       } else if (type === '3') {
-        this.$router.push(this.generateLogoutRoute);
+        this.$router.push(this.generateLogoutRoute)
       }
     },
 
@@ -413,12 +413,14 @@ export default {
 </script>
 
 <template>
+
   <!-- 整个页面的顶部 header -->
   <header
     ref="header"
     data-testid="header"
   >
     <div>
+
       <!-- 顶部一级菜单（根据不同产品/集群条件决定是否显示） -->
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
     </div>
@@ -430,18 +432,20 @@ export default {
         v-if="isSingleProduct && !isRancherInHarvester"
         :to="singleProductLogoRoute"
       >
+
         <!-- 显示用户头像或 logo 图片 -->
         <img
           :src="userIcon"
         >
       </router-link>
     </div>
-
+    
     <!-- ===== 中间占位符（把左右内容分开） ===== -->
     <div class="spacer" />
 
     <!-- ===== 右侧功能区域 ===== -->
     <div class="rd-header-right">
+
       <!-- 动态插入右侧自定义组件（例如插件扩展的 header） -->
       <component :is="navHeaderRight" />
 
@@ -450,9 +454,10 @@ export default {
         v-if="showFilter"
         class="top"
       >
+
         <!-- 如果集群就绪 + 当前产品支持命名空间过滤器 或 Explorer 模式 -->
         <NamespaceFilter v-if="clusterReady && currentProduct && (currentProduct.showNamespaceFilter || isExplorer)" />
-
+        
         <!-- 否则显示工作空间切换器 -->
         <WorkspaceSwitcher v-else-if="clusterReady && currentProduct && currentProduct.showWorkspaceSwitcher" />
       </div>
@@ -462,8 +467,10 @@ export default {
         v-if="currentCluster && !simple"
         class="header-buttons"
       >
+
         <!-- 如果当前产品支持集群切换器 -->
         <template v-if="currentProduct && currentProduct.showClusterSwitcher">
+
           <!-- 导入 YAML 按钮 -->
           <!-- <button
             v-if="showImportYaml"
@@ -526,7 +533,7 @@ export default {
             :aria-label="t('nav.kubeconfig.copy')"
             @click="copyKubeConfig($event)"
           >
-
+            
             <i
               v-if="kubeConfigCopying"
               class="icon icon-checkmark icon-lg"
@@ -568,7 +575,8 @@ export default {
           :trigger-focus-trap="true"
           return-focus-selector="#header-btn-search"
           @close="hideSearch()"
-        />
+        >
+        </app-modal>
       </div>
 
       <!-- ===== 插件扩展按钮区 ===== -->
@@ -576,33 +584,30 @@ export default {
         v-if="extensionHeaderActions.length"
         class="header-buttons"
       >
-        <template
-          v-for="action, i in extensionHeaderActions"
-          :key="`${action.label}${i}`"
+      <template v-for="action, i in extensionHeaderActions" :key="`${action.label}${i}`">
+        <!-- kubectl-explain.action | 2025/9/30隐藏 -->
+        <button
+          v-if="action.labelKey !== 'kubectl-explain.action'"
+          v-clean-tooltip="handleExtensionTooltip(action)"
+          v-shortkey="action.shortcutKey"
+          :disabled="action.enabled ? !action.enabled(ctx) : false"
+          type="button"
+          class="btn header-btn role-tertiary"
+          :data-testid="`extension-header-action-${ action.labelKey || action.label }`"
+          role="button"
+          tabindex="0"
+          :aria-label="action.label"
+          @shortkey="handleExtensionAction(action, $event)"
+          @click="handleExtensionAction(action, $event)"
         >
-          <!-- kubectl-explain.action | 2025/9/30隐藏 -->
-          <button
-            v-if="action.labelKey !== 'kubectl-explain.action'"
-            v-clean-tooltip="handleExtensionTooltip(action)"
-            v-shortkey="action.shortcutKey"
-            :disabled="action.enabled ? !action.enabled(ctx) : false"
-            type="button"
-            class="btn header-btn role-tertiary"
-            :data-testid="`extension-header-action-${ action.labelKey || action.label }`"
-            role="button"
-            tabindex="0"
-            :aria-label="action.label"
-            @shortkey="handleExtensionAction(action, $event)"
-            @click="handleExtensionAction(action, $event)"
-          >
-            <IconOrSvg
-              class="icon icon-lg"
-              :icon="action.icon"
-              :src="action.svg"
-              color="header"
-            />
-          </button>
-        </template>
+          <IconOrSvg
+            class="icon icon-lg"
+            :icon="action.icon"
+            :src="action.svg"
+            color="header"
+          />
+        </button>
+      </template>
       </div>
 
       <!-- ===== 用户菜单（右上角头像 + 下拉） ===== -->
@@ -613,6 +618,7 @@ export default {
           v-if="showUserMenu"
           :aria-label="t('nav.userMenu.label')"
         >
+          
           <!-- 头像触发按钮 -->
           <rc-dropdown-trigger
             ghost
@@ -632,10 +638,7 @@ export default {
               v-else
               class="icon icon-user icon-3x avatar"
             /> -->
-            <i
-              class="icon icon-usericon"
-              style="padding-bottom: 5px;"
-            />
+            <i class="icon icon-usericon" style="padding-bottom: 5px;" />
             <span class="login-name">{{ principal.loginName }}</span>
           </rc-dropdown-trigger>
 

package/config/private-label.js

@@ -58,7 +58,8 @@ export function matches(pl) {
 }
 
 export function getVendor() {
-  return '威努特超融合';
+
+  return 'HCI';
 }
 // export function getVendor() {
 //   if ( vendor === SETTING.PL_RANCHER_VALUE ) {
@@ -83,7 +84,7 @@ export function setTitle() {
   if (v === 'Harvester') {
     const ico = require(`~shell/assets/images/pl/harvester.png`);
 
-    document.title = '威努特超融合';
+    document.title = 'HCI';
     const link = document.createElement('link');
 
     link.hid = 'icon';

package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -17,14 +17,38 @@ import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
 // i18n-uses monitoringReceiver.slack.*, monitoringReceiver.email.*, monitoringReceiver.pagerduty.*
 // i18n-uses monitoringReceiver.opsgenie.*, monitoringReceiver.webhook.*, monitoringReceiver.custom.*
 export const RECEIVERS_TYPES = [
-  // {
-  //   name:  'slack',
-  //   label: 'monitoringReceiver.slack.label',
-  //   title: 'monitoringReceiver.slack.title',
-  //   info:  'monitoringReceiver.slack.info',
-  //   key:   'slackConfigs',
-  //   logo:  require(`@shell/assets/images/vendor/slack.svg`)
-  // },
+  {
+    name:  'message',
+    label: 'monitoringReceiver.message.label',
+    title: 'monitoringReceiver.message.title',
+    info:  'monitoringReceiver.slack.info',
+    key:   'slackConfigs',
+    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  },
+  {
+    name:  'dingding',
+    label: 'monitoringReceiver.dingding.label',
+    title: 'monitoringReceiver.dingding.title',
+    info:  'monitoringReceiver.slack.info',
+    key:   'dingding',
+    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  },
+  {
+    name:  'work',
+    label: 'monitoringReceiver.weixin.label',
+    title: 'monitoringReceiver.weixin.title',
+    info:  'monitoringReceiver.slack.info',
+    key:   'work',
+    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  },
+  {
+    name:  'snmp',
+    label: 'monitoringReceiver.snmp.label',
+    title: 'monitoringReceiver.snmp.title',
+    info:  'monitoringReceiver.slack.info',
+    key:   'snmp',
+    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  },
   {
     name:  'email',
     label: 'monitoringReceiver.email.label',

package/edit/monitoring.coreos.com.alertmanagerconfig/types/dingding.vue

@@ -0,0 +1,32 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'webhook地址'"
+        :label="'webhook地址'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="id"
+        :placeholder="'签名密钥'"
+        :label="'签名密钥'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/message.vue

@@ -0,0 +1,52 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'请输入手机号'"
+        :label="'默认手机人电话'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="id"
+        :placeholder="'API密钥ID'"
+        :label="'默认API密钥ID'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="scret"
+        :placeholder="'API密钥secret'"
+        :label="'默认API密钥secret'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="templateId"
+        :placeholder="'请输入模板ID'"
+        :label="'模板ID'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/snmp.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'目标主机'"
+        :label="'目标主机'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="id"
+        :placeholder="'端口'"
+        :label="'端口'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="scret"
+        :placeholder="'团体字'"
+        :label="'团体字'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/work.vue

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'webhook地址'"
+        :label="'webhook地址'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/package.json

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

package/pages/auth/login.vue

@@ -60,11 +60,11 @@ export default {
       customLoginError:   {},
       firstLogin:         false,
       vendor:             getVendor(),
-      imgLeft:            require('~shell/assets/images/login-left.png')
+      imgLeft:         require('~shell/assets/images/login-left.png')
     };
   },
 
-  created() {
+  created () {
     // this.$store.dispatch('i18n/switchTo', 'zh-hans');
   },
 
@@ -173,7 +173,7 @@ export default {
       this.focusSomething();
     });
   },
-
+  
   methods: {
     async loadInitialSettings() {
       let firstLoginSetting, plSetting, brand;
@@ -262,8 +262,8 @@ export default {
       try {
         // 临时 superadmin 处理
         if (this.username === 'super#Admin') {
-          sessionStorage.setItem('TOPLEVELPERMISSIONS', 'superadmin');
-          this.username = 'admin';
+          sessionStorage.setItem('TOPLEVELPERMISSIONS', 'superadmin')
+          this.username = 'admin'
         }
 
         // 登录
@@ -306,6 +306,7 @@ export default {
           $plugin: this.$store.$plugin
         });
 
+
         // 登录跳转
         if (this.firstLogin || user[0]?.mustChangePassword) {
           this.$store.dispatch('auth/setInitialPass', this.password);
@@ -313,6 +314,7 @@ export default {
         } else {
           this.$router.push({ name: 'index' });
         }
+
       } catch (err) {
         // 登录失败处理
         this.err = err;
@@ -342,16 +344,14 @@ export default {
       {{ `${vendor} - ${t('login.login')}` }}
     </TabTitle> -->
     <div class="row gutless mb-20">
-      <div class="col span-7 img-left" />
+      <div class="col span-7 img-left"></div>
       <div class="col span-5 p-20">
-        <div
-          class="logo-login"
-          :style="{ 'marginBottom': errorToDisplay? '0px': '30px'}"
-        >
+
+        <div class="logo-login" :style="{ 'marginBottom': errorToDisplay? '0px': '30px'}">
           <img
-            src="../../assets/images/login-logo.svg"
-            alt=""
-          >
+          src="../../assets/images/login-logo.svg"
+          alt=""
+        />
         </div>
         <div
           class="login-messages"
@@ -443,16 +443,16 @@ export default {
             <div class="login-form-display-label">
               <div class="mb-20 login-input-all-svg">
                 <img
-                  v-if="!firstLogin"
                   class="login-svg"
+                   v-if="!firstLogin"
                   src="../../assets/images/login/user.svg"
                   alt=""
                 >
                 <LabeledInput
                   v-if="!firstLogin"
                   ref="username"
-                  v-model:value.trim="username"
                   :placeholder="'请输入用户名'"
+                  v-model:value.trim="username"
                   data-testid="local-login-username"
                   :label="t('login.username')"
                   autocomplete="username"
@@ -466,8 +466,8 @@ export default {
                 >
                 <Password
                   ref="password"
-                  v-model:value="password"
                   :placeholder="'请输入密码'"
+                  v-model:value="password"
                   data-testid="local-login-password"
                   :label="t('login.password')"
                   autocomplete="current-password"
@@ -488,6 +488,7 @@ export default {
             </div>
             <div class="mt-20">
               <div class="col span-12 text-center">
+                
                 <AsyncButton
                   id="submit"
                   data-testid="login-submit"
@@ -498,6 +499,7 @@ export default {
                   :error-label="t('asyncButton.default.error')"
                   @click="loginLocal"
                 />
+                
               </div>
             </div>
           </form>
@@ -534,9 +536,7 @@ export default {
             mode="login"
           /> -->
         </div>
-        <div class="copyright">
-          Copyright 2019-2025 威努特超融合
-        </div>
+        <div class="copyright">Copyright 2019-2025 HCI</div>
       </div>
     </div>
   </div>
@@ -544,7 +544,7 @@ export default {
 
 <style lang="scss" scoped>
   .login-username {
-
+    
   }
   .login {
     overflow: hidden;
@@ -572,7 +572,7 @@ export default {
 
       .banner {
         /* margin: 5px; */
-
+      
       }
       h4 {
         margin: 0;
@@ -665,6 +665,8 @@ export default {
     z-index: -1;
 }
 
+
+
 .login-form-display-label {
   display: flex;
   flex-direction: column;
@@ -680,6 +682,7 @@ export default {
     }
   }
 
+
 .login-input-all {
   &:deep() .labeled-input{
     background-color: #fff;
@@ -714,7 +717,7 @@ export default {
 .remeber-login{
   display: flex;
   justify-content: center
-
+ 
 }
 .checkbox-login{
   width: 400px;
@@ -745,7 +748,7 @@ export default {
   display: flex;
   justify-content: center;
   margin-top: 30px;
-
+ 
 }
 
 @media only screen and (max-width: 1439px) {
@@ -753,7 +756,7 @@ export default {
   display: flex;
   justify-content: center;
   margin-top: 0px;
-
+ 
 }
 }
 </style>

package/public/index.html

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="shortcut icon" type="image/x-icon" href="/favicon.png">
-    <title>威努特超融合</title>
+    <title>HCI</title>
 </head>
 
 <body>

package/scripts/publish-shell.sh

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

package/store/index.js

@@ -519,10 +519,10 @@ export const getters = {
              (!isAll && filteredMap && filteredMap[out] );
     }
 
-    out = rootGetters['prefs/get'](LAST_NAMESPACE);
-    if ( isOk() ) {
-      return out;
-    }
+    // out = rootGetters['prefs/get'](LAST_NAMESPACE);
+    // if ( isOk() ) {
+    //   return out;
+    // }
 
     out = 'default';
     if ( isOk() ) {

package/utils/errorTranslate.json

@@ -1,5 +1,10 @@
 {
   "translations": [
+    {
+      "pattern": "the status of pod readiness gate "kubevirt\\.io/virtual-machine-unpaused" is not "true", but false",
+      "replacement": "这个只有当虚拟机处于运行状态(非暂停)时，才能进行暂停操作",
+      "flags": "gi"
+    },
     {
       "pattern": "can't delete vlanconfig (\\S+) because the storage network nad (\\S+) is still attached",
       "replacement": "无法删除 VLAN 配置 '$1'：存储网络附加定义 '$2' 仍在使用",

package/utils/title.ts

@@ -1,3 +1,3 @@
 export function updatePageTitle(...breadcrumb: (string | null | undefined | false)[]): void {
-  document.title = breadcrumb.filter((s) => s).join(' - ').replace(/<i[^>]*>|<\/i>/g, '').replace('Harvester', '威努特超融合');
+  document.title = breadcrumb.filter((s) => s).join(' - ').replace(/<i[^>]*>|<\/i>/g, '').replace('Harvester', 'HCI');
 }