dashboard-shell-shell 3.0.5-test.8 → 3.0.5-test.80

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,15 +306,13 @@ export default {
           $plugin: this.$store.$plugin
         });
 
-
         // 登录跳转
         if (this.firstLogin || user[0]?.mustChangePassword) {
           this.$store.dispatch('auth/setInitialPass', this.password);
           this.$router.push({ name: 'auth-setup' });
         } else {
-          this.$router.push({ name: 'index' });
+          this.$router.push({ name: 'home' });
         }
-
       } catch (err) {
         // 登录失败处理
         this.err = err;
@@ -344,14 +342,16 @@ export default {
       {{ `${vendor} - ${t('login.login')}` }}
     </TabTitle> -->
     <div class="row gutless mb-20">
-      <div class="col span-7 img-left"></div>
+      <div class="col span-7 img-left" />
       <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"
-                  :placeholder="'请输入用户名'"
                   v-model:value.trim="username"
+                  :placeholder="'请输入用户名'"
                   data-testid="local-login-username"
                   :label="t('login.username')"
                   autocomplete="username"
@@ -466,8 +466,8 @@ export default {
                 >
                 <Password
                   ref="password"
-                  :placeholder="'请输入密码'"
                   v-model:value="password"
+                  :placeholder="'请输入密码'"
                   data-testid="local-login-password"
                   :label="t('login.password')"
                   autocomplete="current-password"
@@ -488,7 +488,6 @@ export default {
             </div>
             <div class="mt-20">
               <div class="col span-12 text-center">
-                
                 <AsyncButton
                   id="submit"
                   data-testid="login-submit"
@@ -499,7 +498,6 @@ export default {
                   :error-label="t('asyncButton.default.error')"
                   @click="loginLocal"
                 />
-                
               </div>
             </div>
           </form>
@@ -536,7 +534,9 @@ export default {
             mode="login"
           /> -->
         </div>
-        <div class="copyright">Copyright 2019-2025 HCI</div>
+        <div class="copyright">
+          Copyright 2019-2025 威努特超融合
+        </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,8 +665,6 @@ export default {
     z-index: -1;
 }
 
-
-
 .login-form-display-label {
   display: flex;
   flex-direction: column;
@@ -682,7 +680,6 @@ export default {
     }
   }
 
-
 .login-input-all {
   &:deep() .labeled-input{
     background-color: #fff;
@@ -717,7 +714,7 @@ export default {
 .remeber-login{
   display: flex;
   justify-content: center
- 
+
 }
 .checkbox-login{
   width: 400px;
@@ -748,7 +745,7 @@ export default {
   display: flex;
   justify-content: center;
   margin-top: 30px;
- 
+
 }
 
 @media only screen and (max-width: 1439px) {
@@ -756,7 +753,7 @@ export default {
   display: flex;
   justify-content: center;
   margin-top: 0px;
- 
+
 }
 }
 </style>

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);
@@ -149,7 +150,7 @@ export default {
     this['isFirstLogin'] = isFirstLogin;
     this['mustChangePassword'] = mustChangePassword;
     // this['current'] = current;
-    this['current'] = 'admin';
+    this['current'] = current || 'admin';
     this['v3User'] = v3User;
     this['serverUrl'] = serverUrl;
     this['mcmEnabled'] = mcmEnabled;
@@ -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/pages/c/_cluster/auth/roles/index.vue

@@ -7,6 +7,7 @@ import Loading from '@shell/components/Loading';
 import { SUBTYPE_MAPPING, CREATE_VERBS } from '@shell/models/management.cattle.io.roletemplate';
 import { NAME } from '@shell/config/product/auth';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+import { globalRoleFilteringfn, clusterRoleFilteringfn, projectRoleFilteringfn } from '@shell/utils/roleFiltering'
 
 const GLOBAL = SUBTYPE_MAPPING.GLOBAL.key;
 const CLUSTER = SUBTYPE_MAPPING.CLUSTER.key;
@@ -99,15 +100,38 @@ export default {
 
   computed: {
     globalResources() {
-      return this.globalRoles;
+
+      let rolesList = globalRoleFilteringfn(this.globalRoles)
+      
+      if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+        rolesList = this.globalRoles
+      }
+
+      return rolesList
     },
 
     clusterResources() {
-      return this.roleTemplates.filter((r) => r.context === SUBTYPE_MAPPING.CLUSTER.context);
+      const roleList = this.roleTemplates.filter((r) => r.context === SUBTYPE_MAPPING.CLUSTER.context);
+      
+      let rolesList = clusterRoleFilteringfn(roleList)
+      
+      if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+        rolesList = roleList
+      }
+
+      return rolesList
     },
 
     namespaceResources() {
-      return this.roleTemplates.filter((r) => r.context === SUBTYPE_MAPPING.NAMESPACE.context);
+      const roleList = this.roleTemplates.filter((r) => r.context === SUBTYPE_MAPPING.NAMESPACE.context);
+            
+      let rolesList = projectRoleFilteringfn(roleList)
+      
+      if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+        rolesList = roleList
+      }
+
+      return rolesList
     },
 
     type() {

package/pages/c/_cluster/explorer/ConfigBadge.vue

@@ -49,7 +49,7 @@ export default {
     margin-left: 10px;
 
     &:hover {
-      border-color: var(--lightest);
+      // border-color: var(--lightest);
     }
 
     > I {

package/pages/c/_cluster/explorer/index.vue

@@ -694,7 +694,8 @@ export default {
           role="link"
           :aria-label="t('nav.clusterTools')"
         >
-          <span>{{ t('nav.clusterTools') }}</span>
+          <!-- 禅道 3539 隐藏集群工具 -->
+          <!-- <span>{{ t('nav.clusterTools') }}</span> -->
         </router-link>
       </div>
       <ConfigBadge

package/pages/c/_cluster/explorer/tools/index.vue

@@ -230,7 +230,7 @@ export default {
 
       .name {
         white-space: nowrap;
-        overflow: hidden;
+        // overflow: hidden;
         text-overflow: ellipsis;
         margin: 0;
       }
@@ -249,7 +249,7 @@ export default {
       .version {
         color: var(--muted);
         white-space: nowrap;
-        overflow: hidden;
+        // overflow: hidden;
         text-overflow: ellipsis;
         font-size: 0.9em;
         margin-top: 4px;
@@ -262,10 +262,10 @@ export default {
       .description-content {
         display: -webkit-box;
         -webkit-box-orient: vertical;
-        -webkit-line-clamp: 3;
-        line-clamp: 3;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        // -webkit-line-clamp: 3;
+        // line-clamp: 3;
+        // overflow: hidden;
+        // text-overflow: ellipsis;
         color: var(--text-muted);
       }
 

package/pages/home.vue

@@ -485,32 +485,24 @@ export default defineComponent({
   >
 
     <!-- 页签标题组件，不显示子页面标题和面包屑 -->
-    <TabTitle
-      v-if="topLevelPermissionsVis"
-      :show-child="false"
-      :breadcrumb="false"
-    >
-
-      <!-- 页面标题：{vendor} - 首页 -->
-      {{ `${vendor} - ${t('landing.homepage')}` }}
-    </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">
 
        <!-- 主面板布局 -->
       <div class="row home-panels">
         <div class="col main-panel">
           <h2 class="mb-20">
-            {{ t('landing.clusters.title') }}
+            <!-- {{ t('landing.clusters.title') }} -->
+              首页
           </h2>
 
           <!-- 集群列表面板 -->
@@ -548,7 +540,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"
@@ -669,6 +661,14 @@ export default defineComponent({
                   </button>
                 </template>
               </PaginatedResourceTable>
+              <div v-else class="home-prompt">
+                <div style="text-align: center;position: relative;">
+                  <div class="left-border"></div>
+                  <!-- <div class="right-border"></div> -->
+                  <div class="home-prompt-title">欢 迎 登 录</div>
+                  <div class="home-prompt-subtitle">企业级容器编排与管理解决方案，提供强大的Kubernetes集群管理、应用部署和服务治理能力。</div>
+                </div>
+              </div>
             </div>
 
             <!-- 单集群模式 -->
@@ -688,6 +688,48 @@ export default defineComponent({
 </template>
 
 <style lang='scss' scoped>
+.home-prompt {
+  width: 100%;
+  height: 500px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .left-border,
+  .right-border {
+    position: absolute;
+    height: 1px;
+    width: 120px;
+    background: linear-gradient(90deg, transparent, #00a8ff, transparent);
+    bottom: 0px;
+  }
+  .left-border {
+    left: calc(50% - 60px);
+  }
+  .right-border {
+    right: 0;
+  }
+  .home-prompt-title {
+    font-size: 32px;
+    color: #1a1a1a;
+    font-weight: 700;
+    letter-spacing: -0.5px;
+    margin-bottom: 15px;
+    background: linear-gradient(135deg, #00a8ff, #0050b3);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+    display: inline-block;
+  }
+  
+  .home-prompt-subtitle {
+    font-size: 18px;
+    color: #666666;
+    margin-bottom: 20px;
+    max-width: 800px;
+    margin-left: auto;
+    margin-right: auto;
+  }
+}
   .banner-link:focus-visible {
     @include focus-outline;
   }

package/pkg/tsconfig.json

@@ -27,25 +27,25 @@
     ],
     "paths": {
       "@shell/core/*": [
-        "../../node_modules/@rancher/shell/core/*"
+        "../../node_modules/dashboard-shell-shell/core/*"
       ],
       "@shell/config/*": [
-        "../../node_modules/@rancher/shell/config/*"
+        "../../node_modules/dashboard-shell-shell/config/*"
       ],
       "@shell/store/*": [
-        "../../node_modules/@rancher/shell/store/*"
+        "../../node_modules/dashboard-shell-shell/store/*"
       ],
       "@shell/plugins/*": [
-        "../../node_modules/@rancher/shell/plugins/*"
+        "../../node_modules/dashboard-shell-shell/plugins/*"
       ],
       "@shell/utils/*": [
-        "../../node_modules/@rancher/shell/utils/*"
+        "../../node_modules/dashboard-shell-shell/utils/*"
       ],
       "@shell/models/*": [
-        "../../node_modules/@rancher/shell/models/*"
+        "../../node_modules/dashboard-shell-shell/models/*"
       ],
       "@shell/mixins/*": [
-        "../../node_modules/@rancher/shell/mixins/*"
+        "../../node_modules/dashboard-shell-shell/mixins/*"
       ],
       "@pkg/*": [
         "./*"
@@ -56,8 +56,8 @@
     "**/*.ts",
     "**/*.tsx",
     "**/*.vue",
-    "../../node_modules/@rancher/shell/types/*.d.ts",
-    "../../node_modules/@rancher/shell/core/types.ts"
+    "../../node_modules/dashboard-shell-shell/types/*.d.ts",
+    "../../node_modules/dashboard-shell-shell/core/types.ts"
   ],
   "exclude": [
     "node_modules"

package/pkg/vue.config.js

@@ -117,7 +117,7 @@ module.exports = function(dir) {
         if (p.use) {
           p.use.forEach((u) => {
             if (u.loader.includes('babel-loader')) {
-              p.exclude = /node_modules\/(?!@rancher\/shell\/).*/;
+              p.exclude = /node_modules\/(?!dashboard-shell-shell\/).*/;
             }
           });
         }

package/plugins/dashboard-store/actions.js

@@ -55,7 +55,7 @@ export async function loadSchemas(ctx, watch = true) {
   }
 
   res.data.forEach(addSchemaIndexFields);
-
+  
   commit('loadAll', {
     ctx,
     type:     SCHEMA,

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>HCI</title>
+    <title>威努特超融合</title>
 </head>
 
 <body>

package/rancher-components/Banner/Banner.vue

@@ -78,7 +78,16 @@ export default defineComponent({
      * Return message text as label.
      */
     messageLabel(): string | void {
-      return !(typeof this.label === 'string') ? stringify(this.label) : undefined;
+
+      let labelStr = this.label
+
+      if (labelStr === 'waiting for api to be available') {
+        labelStr = '等待api可用'
+      } else if (labelStr === 'Cluster agent is not connected') {
+        labelStr = '集群agent未连接'
+      }
+
+      return !(typeof labelStr === 'string') ? stringify(labelStr) : undefined;
     },
   },
   methods: { nlToBr }
@@ -164,6 +173,7 @@ $icon-size: 24px;
   margin: 0px 0px 20px 0px;
   position: relative;
   width: 100%;
+  min-height: 32px;
   color: var(--body-text);
 
   &__icon {
@@ -201,13 +211,15 @@ $icon-size: 24px;
   }
 
   &__content {
-    padding: 9px 10px; 
+    padding: 2px 10px; 
     transition: all 0.2s ease;
     line-height: 12px;
     width: 100%;
     border-left: solid $left-border-size transparent;
     display: flex;
     gap: 3px;
+    min-height: 32px;
+    align-items: center;
     word-wrap:break-word; 
     word-break:break-all; 
 

package/rancher-components/Form/Radio/RadioGroup.vue

@@ -102,6 +102,11 @@ export default defineComponent({
     row: {
       type:    Boolean,
       default: false
+    },
+
+    flexDirection: {
+      type:    String,
+      default: 'row'
     }
   },
 
@@ -274,7 +279,7 @@ export default defineComponent({
       :aria-describedby="radioGroupAriaDescribedBy"
       :aria-activedescendant="ariaActiveDescendant"
       class="radio-group"
-      :class="{'row':row}"
+      :class="{'row':row, 'flexDirection': flexDirection === 'column'}"
       :tabindex="isDisabled ? -1 : 0"
       :aria-disabled="isDisabled"
       @keydown.down.prevent.stop="clickNext(1)"
@@ -312,6 +317,9 @@ export default defineComponent({
 </template>
 
 <style lang='scss'>
+.flexDirection {
+  flex-direction: column;
+}
 .radio-group {
   &:focus, &:focus-visible {
     border: none;