dashboard-shell-shell 3.0.5-test.9 → 3.0.5-tsh.10

package/pages/account/index.vue

@@ -151,48 +151,40 @@ 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
+          :userLogo="true"
+          :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
+      <!-- <button
         v-if="apiKeySchema"
         role="button"
         :aria-label="t('accountAndKeys.apiKeys.add.label')"
@@ -201,33 +193,71 @@ export default {
         @click="addKey"
       >
         {{ 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"
-      />
+      </button> -->
     </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 +267,10 @@ export default {
     justify-content: space-between
   }
 
+  .principal  .avatar {
+    width: 287px !important;
+  }
+
   .keys-header {
     display: flex;
     div {
@@ -254,6 +288,7 @@ export default {
 
   .api-url {
     display: flex;
+    margin: 20px 0;
 
     > span {
       margin-right: 6px;

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,7 +306,6 @@ export default {
           $plugin: this.$store.$plugin
         });
 
-
         // 登录跳转
         if (this.firstLogin || user[0]?.mustChangePassword) {
           this.$store.dispatch('auth/setInitialPass', this.password);
@@ -314,7 +313,6 @@ export default {
         } else {
           this.$router.push({ name: 'index' });
         }
-
       } 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);
       }