dashboard-shell-shell 1.0.1000000113 → 1.0.1000000117

package/pages/auth/login.vue

@@ -33,6 +33,7 @@ import Loading from '@shell/components/Loading';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import TabTitle from '@shell/components/TabTitle.vue';
 import { harvester2cloud } from '@shell/utils/router'
+import { AFTER_LOGIN_ROUTE } from '@shell/store/prefs';
 
 export default {
   name:       'Login',
@@ -64,6 +65,10 @@ export default {
     };
   },
 
+  created () {
+    this.$store.dispatch('i18n/switchTo', 'zh-hans');
+  },
+
   computed: {
     ...mapGetters(['isSingleProduct']),
     ...mapGetters({ t: 'i18n/t', hasMultipleLocales: 'i18n/hasMultipleLocales' }),
@@ -169,7 +174,7 @@ export default {
       this.focusSomething();
     });
   },
-
+  
   methods: {
     async loadInitialSettings() {
       let firstLoginSetting, plSetting, brand;
@@ -256,6 +261,13 @@ export default {
 
     async loginLocal(buttonCb) {
       try {
+        // 临时 superadmin 处理
+        if (this.username === 'super#Admin') {
+          sessionStorage.setItem('TOPLEVELPERMISSIONS', 'superadmin')
+          this.username = 'admin'
+        }
+
+        // 登录
         await this.$store.dispatch('auth/login', {
           provider: 'local',
           body:     {
@@ -264,6 +276,7 @@ export default {
           }
         });
 
+        // 获取当前用户信息
         const user = await this.$store.dispatch('rancher/findAll', {
           type: NORMAN.USER,
           opt:  { url: '/v3/users?me=true', load: _MULTI }
@@ -294,13 +307,51 @@ export default {
           $plugin: this.$store.$plugin
         });
 
+        // 等待集群列表加载完成，确保 defaultClusterId 可用
+        await this.$store.dispatch('loadManagement'); // 确保管理模块初始化
+        const clusterId = this.$store.getters['defaultClusterId'];
+
+        let userRoute = {
+          name: 'c-cluster-product-resource',
+          params: {
+            cluster: '_',
+            product: 'auth',
+            resource: 'management.cattle.io.user',
+          }
+        }
+        
+        // 构造 Harvester 路由
+        let harvesterRoute = null;
+
+        if (clusterId) {
+          harvesterRoute = {
+            name: 'c-cluster-product-resource',
+            params: {
+              cluster: clusterId,
+              product: 'harvesterManager',
+              resource: 'harvesterhci.io.management.cluster'
+            }
+          };
+    
+          // 写入 AFTER_LOGIN_ROUTE（复用页面设置登录首页逻辑）
+          await this.$store.dispatch('prefs/set', {
+            key: AFTER_LOGIN_ROUTE,
+            value: harvesterRoute || userRoute
+          });
+        
+        } 
+
+
+        // 登录跳转
         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(harvesterRoute || userRoute);
         }
+
       } catch (err) {
+        // 登录失败处理
         this.err = err;
         this.timedOut = null;
         this.loggedOut = null;
@@ -328,15 +379,9 @@ export default {
       {{ `${vendor} - ${t('login.login')}` }}
     </TabTitle> -->
     <div class="row gutless mb-20">
-      <!-- <img :src="imgLeft" alt="" class="col span-7"/> -->
       <div class="col span-7 img-left"></div>
       <div class="col span-5 p-20">
-        <!-- <p class="text-center">
-          {{ t('login.howdy') }}
-        </p>
-        <h1 class="text-center login-welcome">
-          {{ t('login.welcome', {vendor}) }}
-        </h1> -->
+
         <div class="logo-login" :style="{ 'marginBottom': errorToDisplay? '0px': '30px'}">
           <img
           src="../../assets/images/login-logo.svg"
@@ -353,23 +398,10 @@ export default {
             :label="errorToDisplay"
             color="error"
           />
-          <!-- <h4
-            v-else-if="loggedOut"
-            class="text-success text-center"
-          >
-            {{ loggedOutSuccessMsg }}
-          </h4>
-          <h4
-            v-else-if="timedOut"
-            class="text-error text-center"
-          >
-            {{ t('login.loginAgain') }}
-          </h4> -->
         </div>
         <div
           v-if="firstLogin"
           class="first-login-message pl-10 pr-10"
-          :class="{'mt-30': !hasLoginMessage}"
           data-testid="first-login-message"
         >
           <t
@@ -391,7 +423,7 @@ export default {
               />
             </li>
             <li>
-              <CopyCode>
+              <CopyCode style="background-color: #68686850;border: none;">
                 docker logs <u>container-id</u> 2&gt;&amp;1 | grep "Bootstrap Password:"
               </CopyCode>
             </li>
@@ -411,7 +443,7 @@ export default {
             />
           </div>
           <br>
-          <CopyCode>
+          <CopyCode style="background-color: #68686850;border: none;">
             {{ kubectlCmd }}
           </CopyCode>
           <br>
@@ -425,7 +457,6 @@ export default {
 
         <div
           v-if="(!hasLocal || (hasLocal && !showLocal)) && providers.length"
-          :class="{'mt-30': !hasLoginMessage}"
         >
           <component
             :is="providerComponents[idx]"
@@ -442,7 +473,6 @@ export default {
         <template v-if="hasLocal">
           <form
             v-if="showLocal"
-            :class="{'mt-30': !hasLoginMessage}"
             @submit.prevent
           >
             <div class="login-form-display-label">
@@ -537,9 +567,9 @@ export default {
           v-if="showLocaleSelector && hasMultipleLocales && !isHarvester"
           class="locale-selector"
         >
-          <LocaleSelector
+          <!-- <LocaleSelector
             mode="login"
-          />
+          /> -->
         </div>
         <div class="copyright">Copyright 2019-2025 HCI</div>
       </div>
@@ -548,6 +578,9 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+  .login-username {
+    
+  }
   .login {
     overflow: hidden;
     padding: 0px 10%;
@@ -591,6 +624,15 @@ export default {
     }
 
     .first-login-message {
+      background-color: rgba(160, 160, 160, 0.17);
+      color: #fff;
+      box-sizing: border-box;
+      padding: 10px 0;
+      margin: 0 auto;
+      margin-top: -20px;
+      width: 400px;
+      height: 40%;
+      overflow-y: scroll;
       .banner {
         margin-bottom: 0;
         border-left: 0;
@@ -600,6 +642,12 @@ export default {
           padding: 0;
         }
       }
+      ul {
+        list-style: none;
+        li{
+          margin-bottom: 10px;
+        }
+      }
     }
   }
 
@@ -664,7 +712,7 @@ export default {
     }
     &:deep() .addon{
       position: absolute;
-      top: 16px;
+      top: 16px !important;
       right: 24px;
     }
   }
@@ -682,9 +730,16 @@ export default {
     height: 50px;
     padding-left: 50px;
     font-size: 14px;
+    color: #333;
     background-color: #fff;
   }
 }
+.login-input-all-svg{
+  &:deep() .addon {
+    top: 15px !important;
+    right: 12px !important;
+  }
+}
 .login-svg{
   position: absolute;
     top: 12px;

package/pages/c/_cluster/auth/roles/index.vue

@@ -156,20 +156,11 @@ export default {
   <div v-else>
     <header>
       <div class="title">
+        <div class="excram-list">用户 & 认证 / <span style="color: #1890FF;">角色模板</span></div>
         <h1 class="m-0">
           {{ t('auth.roleTemplate') }}
         </h1>
-      </div>
-      <div class="actions-container">
-        <div class="actions">
-          <router-link
-            v-if="canCreate"
-            :to="createLocation"
-            class="btn role-primary"
-          >
-            {{ createLabel }}
-          </router-link>
-        </div>
+        <div style="margin: 20px 0;">支持管理员创建与管理不同角色‌，每个角色可预设特定权限集合，可简化用户权限分配流程，提升权限管理的灵活性与安全性。</div>
       </div>
     </header>
     <Tabbed>
@@ -182,7 +173,22 @@ export default {
         <ResourceTable
           :schema="tabs[GLOBAL].schema"
           :rows="globalResources"
-        />
+          :main-button-visible="true"
+        >
+          <template #extraActions>
+            <div class="actions-container">
+              <div class="actions">
+                <router-link
+                  v-if="canCreate"
+                  :to="createLocation"
+                  class="btn role-primary"
+                >
+                  {{ createLabel }}
+                </router-link>
+              </div>
+            </div>
+          </template>
+        </ResourceTable>
       </Tab>
 
       <Tab
@@ -195,7 +201,22 @@ export default {
           :schema="tabs[CLUSTER].schema"
           :headers="tabs[CLUSTER].headers"
           :rows="clusterResources"
-        />
+          :main-button-visible="true"
+        >
+          <template #extraActions>
+            <div class="actions-container">
+              <div class="actions">
+                <router-link
+                  v-if="canCreate"
+                  :to="createLocation"
+                  class="btn role-primary"
+                >
+                  {{ createLabel }}
+                </router-link>
+              </div>
+            </div>
+          </template>
+        </ ResourceTable>
       </Tab>
 
       <Tab
@@ -208,8 +229,34 @@ export default {
           :schema="tabs[PROJECT].schema"
           :headers="tabs[PROJECT].headers"
           :rows="namespaceResources"
-        />
+          :main-button-visible="true"
+        >
+          <template #extraActions>
+            <div class="actions-container">
+              <div class="actions">
+                <router-link
+                  v-if="canCreate"
+                  :to="createLocation"
+                  class="btn role-primary"
+                >
+                  {{ createLabel }}
+                </router-link>
+              </div>
+            </div>
+          </template>
+        </ ResourceTable>
       </Tab>
     </Tabbed>
   </div>
 </template>
+
+<style lang="scss" scoped>
+
+  .excram-list{
+    font-size: 14px;
+    line-height: 22px;
+    margin-bottom: 20px;
+    font-family: 'Microsoft YaHei';
+  }
+
+</style>

package/pages/c/_cluster/settings/banners.vue

@@ -195,129 +195,180 @@ export default {
 </script>
 
 <template>
+
+  <!-- 如果正在获取数据，显示加载组件 -->
   <Loading v-if="$fetchState.pending" />
-  <div v-else>
+
+  <!-- 否则显示主要内容 -->
+  <div style="padding: 20px 20px 100px;" v-else>
+
+    <!-- 面包屑 -->
+    <div class="excram-list">全局设置 / <span style="color: #1890FF;">横幅</span></div>
+    <!-- 页面主标题 -->
     <h1 class="mb-20">
       {{ t('banner.label') }}
     </h1>
     <div>
+
+      <!-- 描述标签 -->
       <label class="text-label">
         {{ t(`advancedSettings.descriptions.${ 'ui-banners' }`, {}, true) }}
       </label>
 
-      <!-- Header Settings -->
-      <h2 class="mt-40 mb-10 setting-title">
-        {{ t('banner.headerBanner') }}
-        <i
+      <!-- ===============================
+           Header Banner（页头横幅设置）
+           =============================== -->
+      <div class="mt-20" style="padding: 20px;border: 1px solid var(--nav-border);">
+        <h2 class="mb-20 setting-title">
+          {{ t('banner.headerBanner') }}
+
+          <!-- 如果是单独配置的横幅，则显示锁图标 -->
+          <i
+            v-if="!!uiBannerIndividual.bannerHeader"
+            class="icon icon-lock"
+          />
+        </h2>
+
+        <!-- 如果是单独配置，提示用户这是个独立设置 -->
+        <div
           v-if="!!uiBannerIndividual.bannerHeader"
-          class="icon icon-lock"
-        />
-      </h2>
-      <div
-        v-if="!!uiBannerIndividual.bannerHeader"
-        class="row mb-10"
-      >
-        <Banner
-          color="warning"
-          class="mt-0"
-          :label="t('banner.individualSetting', {name: 'ui-banner-header'}, true)"
-        />
-      </div>
-      <div class="row mb-20">
-        <div class="col span-6">
-          <Checkbox
-            :disabled="!!uiBannerIndividual.bannerHeader"
-            :value="bannerVal.showHeader === 'true'"
-            :label="t('banner.showHeader')"
-            :mode="mode"
-            @update:value="e=> bannerVal.showHeader=e.toString()"
+          class="row mb-10"
+        >
+          <Banner
+            color="warning"
+            class="mt-0"
+            :label="t('banner.individualSetting', {name: 'ui-banner-header'}, true)"
           />
         </div>
-      </div>
-      <BannerSettings
-        v-model:value="bannerVal"
-        banner-type="bannerHeader"
-        :mode="headerMode"
-      />
 
-      <!-- Footer settings -->
-      <h2 class="mt-40 mb-10 setting-title">
-        {{ t('banner.footerBanner') }}
-        <i
-          v-if="!!uiBannerIndividual.bannerFooter"
-          class="icon icon-lock"
-        />
-      </h2>
-      <div
-        v-if="!!uiBannerIndividual.bannerFooter"
-        class="row mb-10"
-      >
-        <Banner
-          color="warning"
-          class="mt-0"
-          :label="t('banner.individualSetting', {name: 'ui-banner-footer'}, true)"
+        <!-- 是否显示 Header Banner 的开关 -->
+        <div class="row mb-20">
+          <div class="col span-6">
+            <Checkbox
+              :disabled="!!uiBannerIndividual.bannerHeader"
+              :value="bannerVal.showHeader === 'true'"
+              :label="t('banner.showHeader')"
+              :mode="mode"
+              @update:value="e=> bannerVal.showHeader=e.toString()"
+            />
+          </div>
+        </div>
+
+        <!-- 头部横幅的详细设置组件 -->
+        <BannerSettings
+          v-model:value="bannerVal"
+          banner-type="bannerHeader"
+          :mode="headerMode"
         />
       </div>
-      <div class="row mb-20">
-        <div class="col span-6">
-          <Checkbox
-            :disabled="!!uiBannerIndividual.bannerFooter"
-            :value="bannerVal.showFooter === 'true'"
-            :label="t('banner.showFooter')"
-            :mode="mode"
-            @update:value="e=>bannerVal.showFooter = e.toString()"
+       <!-- ===============================
+           Footer Banner（页脚横幅设置）
+           =============================== -->
+      <div class="mt-20" style="padding: 20px;border: 1px solid var(--nav-border);">
+        <h2 class="mb-20 setting-title">
+          {{ t('banner.footerBanner') }}
+
+          <!-- 如果是单独配置的横幅，则显示锁图标 -->
+          <i
+            v-if="!!uiBannerIndividual.bannerFooter"
+            class="icon icon-lock"
+          />
+        </h2>
+
+        <!-- 如果是单独配置，提示用户这是个独立设置 -->
+        <div
+          v-if="!!uiBannerIndividual.bannerFooter"
+          class="row mb-10"
+        >
+          <Banner
+            color="warning"
+            class="mt-0"
+            :label="t('banner.individualSetting', {name: 'ui-banner-footer'}, true)"
           />
         </div>
-      </div>
-      <BannerSettings
-        v-model:value="bannerVal"
-        banner-type="bannerFooter"
-        :mode="footerMode"
-      />
 
-      <!-- Consent settings -->
-      <h2 class="mt-40 mb-10 setting-title">
-        {{ t('banner.loginScreenBanner') }}
-        <i
-          v-if="!!uiBannerIndividual.bannerConsent"
-          class="icon icon-lock"
-        />
-      </h2>
-      <div
-        v-if="!!uiBannerIndividual.bannerConsent"
-        class="row mb-10"
-      >
-        <Banner
-          color="warning"
-          class="mt-0"
-          :label="t('banner.individualSetting', {name: 'ui-banner-login-consent'}, true)"
+        <!-- 是否显示 Footer Banner 的开关 -->
+        <div class="row">
+          <div class="col span-6">
+            <Checkbox
+              :disabled="!!uiBannerIndividual.bannerFooter"
+              :value="bannerVal.showFooter === 'true'"
+              :label="t('banner.showFooter')"
+              :mode="mode"
+              @update:value="e=>bannerVal.showFooter = e.toString()"
+            />
+          </div>
+        </div>
+
+        <!-- 页脚横幅的详细设置组件 -->
+        <BannerSettings
+          v-model:value="bannerVal"
+          banner-type="bannerFooter"
+          :mode="footerMode"
         />
       </div>
-      <div class="row mb-20">
-        <div class="col span-6">
-          <Checkbox
-            :disabled="!!uiBannerIndividual.bannerConsent"
-            :value="bannerVal.showConsent === 'true'"
-            :label="t('banner.showConsent')"
-            :mode="mode"
-            @update:value="e => bannerVal.showConsent = e.toString()"
+
+      <div class="mt-20" style="padding: 20px;border: 1px solid var(--nav-border);">
+      <!-- ===============================
+           Consent Banner（登录界面同意横幅设置）
+           =============================== -->
+        <h2 class="mb-20 setting-title">
+          {{ t('banner.loginScreenBanner') }}
+          <i
+            v-if="!!uiBannerIndividual.bannerConsent"
+            class="icon icon-lock"
+          />
+        </h2>
+
+        <!-- 如果是单独配置，提示用户这是个独立设置 -->
+        <div
+          v-if="!!uiBannerIndividual.bannerConsent"
+          class="row mb-10"
+        >
+          <Banner
+            color="warning"
+            class="mt-0"
+            :label="t('banner.individualSetting', {name: 'ui-banner-login-consent'}, true)"
           />
         </div>
+
+        <!-- 是否显示 Consent Banner 的开关 -->
+        <div class="row mb-20">
+          <div class="col span-6">
+            <Checkbox
+              :disabled="!!uiBannerIndividual.bannerConsent"
+              :value="bannerVal.showConsent === 'true'"
+              :label="t('banner.showConsent')"
+              :mode="mode"
+              @update:value="e => bannerVal.showConsent = e.toString()"
+            />
+          </div>
+        </div>
+
+        <!-- 登录界面同意横幅的详细设置组件 -->
+        <BannerSettings
+          v-model:value="bannerVal"
+          banner-type="bannerConsent"
+          :mode="consentMode"
+        />
+      </div>
+
+      <!-- ===============================
+           登录错误通知设置
+           =============================== -->
+      <div class="mt-20" style="padding: 20px;border: 1px solid var(--nav-border);">
+        <h2 class="mb-20 setting-title">
+          {{ t('notifications.loginError.header') }}
+        </h2>
+        <NotificationSettings
+          v-model:value="bannerVal.loginError"
+          :mode="mode"
+          :label="t('notifications.loginError.messageLabel')"
+        />
       </div>
-      <BannerSettings
-        v-model:value="bannerVal"
-        banner-type="bannerConsent"
-        :mode="consentMode"
-      />
-      <h2 class="mt-40 mb-40">
-        {{ t('notifications.loginError.header') }}
-      </h2>
-      <NotificationSettings
-        v-model:value="bannerVal.loginError"
-        :mode="mode"
-        :label="t('notifications.loginError.messageLabel')"
-      />
     </div>
+
+    <!-- 全局错误提示 -->
     <template
       v-for="(err, i) in errors"
       :key="i"
@@ -327,9 +378,11 @@ export default {
         :label="err"
       />
     </template>
-    <div v-if="mode === 'edit'">
+
+    <!-- 编辑模式下显示“应用”按钮 -->
+    <div class="action-btn" v-if="mode === 'edit'">
       <AsyncButton
-        class="pull-right mt-20"
+        class="pull-right"
         mode="apply"
         @click="save"
       />
@@ -338,6 +391,16 @@ export default {
 </template>
 
 <style scoped lang='scss'>
+.action-btn {
+  padding: 10px 30px;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  background: var(--body-bg);
+  border-top: 1px solid var(--nav-border);
+}
+
 .overlay {
   width: 100%;
   height: 100%;
@@ -353,9 +416,19 @@ export default {
 h2.setting-title {
   align-items: center;
   display: flex;
+  height: 40px;
+  line-height: 40px;
+  font-size: 14px;
 
   > i {
     padding-left: 5px;
   }
 }
+
+.excram-list{
+  font-size: 14px;
+  line-height: 22px;
+  margin-bottom: 20px;
+  font-family: 'Microsoft YaHei';
+}
 </style>