dashboard-shell-shell 3.0.5-test.6 → 3.0.5-test.61

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);
@@ -65,7 +66,7 @@ export default {
       v3User:             null,
       serverUrl:          null,
       mcmEnabled:         null,
-      eula:               false,
+      eula:               true,
       principals:         null,
       errors:             []
     };
@@ -148,7 +149,8 @@ export default {
     this['username'] = me?.loginName || 'admin';
     this['isFirstLogin'] = isFirstLogin;
     this['mustChangePassword'] = mustChangePassword;
-    this['current'] = current;
+    // this['current'] = current;
+    this['current'] = current || 'admin';
     this['v3User'] = v3User;
     this['serverUrl'] = serverUrl;
     this['mcmEnabled'] = mcmEnabled;
@@ -157,6 +159,9 @@ export default {
 
   computed: {
     saveEnabled() {
+      // if ( this.isFirstLogin) {
+      //   return false;
+      // }
       if ( !this.eula && this.isFirstLogin) {
         return false;
       }
@@ -255,6 +260,14 @@ export default {
       this.$router.replace('/');
     },
 
+    copyPassword(val) {
+      copyTextToClipboard(val).then(() => {
+        console.log('复制成功')
+      }).catch(() => {
+        console.log('复制失败')
+      });
+    },
+
     onServerUrlChange(value) {
       this.serverUrl = value.trim();
     },
@@ -273,27 +286,41 @@ export default {
     @submit.prevent
   >
     <div class="row">
-      <div class="col span-6 form-col">
-        <div>
-          &nbsp;
-        </div>
+      <!-- <BrandImage
+        class="col span-6 landscape"
+        file-name="login-landscape.svg"
+      /> -->
+      <div  class="col span-7  img-left">
+
+      </div>
+      <div class="col span-5 p-20">
         <div>
-          <h1 class="text-center">
+          <!-- <h1 class="text-center">
             {{ t('setup.welcome', {product}) }}
-          </h1>
+          </h1> -->
 
           <template v-if="mustChangePassword">
             <p
               v-clean-html="t(isFirstLogin ? 'setup.setPassword' : 'setup.newUserSetPassword', { username }, true)"
-              class="text-center mb-20 mt-20 setup-title"
+              class="mb-20 mt-20 setup-title"
             />
+            <!-- <Password
+              v-if="!haveCurrent"
+              v-model:value.trim="current"
+              autocomplete="current-password"
+              type="password"
+              :label="t('setup.currentPassword')"
+              class="mb-20 setup-password"
+              :required="true"
+            /> -->
             <Password
               v-if="!haveCurrent"
+              style="display: none;"
               v-model:value.trim="current"
               autocomplete="current-password"
               type="password"
               :label="t('setup.currentPassword')"
-              class="mb-20"
+              class="mb-20 setup-password"
               :required="true"
             />
 
@@ -306,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"
@@ -321,6 +349,7 @@ export default {
                 :disabled="useRandom"
                 data-testid="setup-password-random"
                 label-key="setup.newPassword"
+                class="radom-password"
               >
                 <template
                   v-if="useRandom"
@@ -328,13 +357,9 @@ export default {
                 >
                   <div
                     class="addon"
-                    style="padding: 0 0 0 12px;"
+                    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>
@@ -344,17 +369,21 @@ export default {
                 v-model:value.trim="password"
                 :label="t('setup.newPassword')"
                 data-testid="setup-password"
+                class="setup-password"
+                :required="true"
+              />
+            </div>
+            <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>
-            <Password
-              v-show="!useRandom"
-              v-model:value.trim="confirm"
-              autocomplete="new-password"
-              data-testid="setup-password-confirm"
-              :label="t('setup.confirmPassword')"
-              :required="true"
-            />
           </template>
 
           <template v-if="isFirstLogin">
@@ -395,7 +424,7 @@ export default {
               </div>
             </template>
 
-            <div class="checkbox pt-10 eula">
+            <!-- <div class="checkbox pt-10 eula">
               <Checkbox
                 id="checkbox-eula"
                 v-model:value="eula"
@@ -409,7 +438,7 @@ export default {
                   />
                 </template>
               </Checkbox>
-            </div>
+            </div> -->
           </template>
 
           <div
@@ -430,7 +459,7 @@ export default {
             <h4
               v-for="(err, i) in errors"
               :key="i"
-              class="text-error text-center"
+              class="text-error "
             >
               {{ err }}
             </h4>
@@ -440,15 +469,22 @@ export default {
           &nbsp;
         </div>
       </div>
-      <BrandImage
-        class="col span-6 landscape"
-        file-name="login-landscape.svg"
-      />
+      
     </div>
   </form>
 </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);
@@ -464,9 +500,23 @@ export default {
     }
   }
 
+  .setup::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image:url('../../assets/images/login-bg.png');
+    background-size: cover;
+    background-position: 100%;
+    z-index: -2;
+}
+
   .setup {
     overflow: hidden;
-
+    height: 100%;
+    width: 100%;
     .row {
       & .checkbox {
         margin: auto
@@ -506,9 +556,12 @@ export default {
     }
 
     .setup-title {
+      color: #fff;
       :deep() code {
         font-size: 12px;
         padding: 0;
+        background-color: unset;
+        border: 0px;
       }
     }
 
@@ -520,4 +573,93 @@ export default {
       line-height: 20px;
     }
   }
+  .img-left{
+  height: 60%;
+  position: relative;
+}
+.img-left::before{
+  content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image:url('../../assets/images/login-left.png');
+    background-size: cover;
+    background-position: 50%;
+    z-index: -1;
+}
+
+.row {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+    padding: 0 10%;
+}
+.span-5{
+      height: 60%;
+      background-color: rgba(68, 68, 68, 0.17);
+      position: relative;
+      margin-left: -10px;
+      width: 41.645%;
+      display: flex;
+    justify-content: center;
+    }
+
+    :deep() .label-input-all{
+      display: unset;
+    }
+    .addon{
+        &:deep() .role-primary{
+          border-radius: 0px;
+        }
+    }
+    :deep() .addon{
+        background-color: unset !important;
+      }
+
+      #submit{
+        position: absolute;
+        bottom: 20px;
+        left: 42%;
+      }
+
+      .setup-password{
+        :deep() .suffix{
+          position: relative;
+          INPUT{
+            background: #fff;
+          }
+        }
+        :deep() .addon{
+          position: absolute;
+          top: 6px;
+          left: 90%;
+        }
+      }
+
+      @media only screen and (max-width: 1439px) {
+      .span-5{
+        margin-left: 0px;
+        width: 48.645%;
+    
+    }
+    .setup-password{
+        :deep() .suffix{
+          position: relative;
+          INPUT{
+            background: #fff;
+          }
+        }
+        :deep() .addon{
+          position: absolute;
+          top: 6px;
+          left: 84%;
+        }
+      }
+    }
+    
 </style>

package/pages/c/_cluster/_product/namespaces.vue

@@ -29,8 +29,8 @@ export default {
   computed: {
     headers() {
       return [
-        STATE,
         NAME,
+        STATE,
         AGE
       ];
     },
@@ -63,13 +63,13 @@ export default {
       :rows="rows"
       :groupable="false"
       group-tooltip="resourceTable.groupBy.project"
-      key-field="_key"
+      key-field="_key"
     >
       <template #cell:project="{row}">
         <span v-if="row.project">{{ row.project.nameDisplay }}</span>
-        <span
-          v-else
-          class="text-muted"
+        <span
+          v-else
+          class="text-muted"
         >&ndash;</span>
       </template>
     </ResourceTable>

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() {
@@ -156,11 +180,13 @@ 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 style="margin: 20px 0;">支持管理员创建与管理不同角色‌，每个角色可预设特定权限集合，可简化用户权限分配流程，提升权限管理的灵活性与安全性。</div>
       </div>
-      <div class="actions-container">
+      <!-- <div class="actions-container actions-container-box">
         <div class="actions">
           <router-link
             v-if="canCreate"
@@ -170,7 +196,7 @@ export default {
             {{ createLabel }}
           </router-link>
         </div>
-      </div>
+      </div> -->
     </header>
     <Tabbed>
       <Tab
@@ -182,7 +208,18 @@ export default {
         <ResourceTable
           :schema="tabs[GLOBAL].schema"
           :rows="globalResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
 
       <Tab
@@ -195,7 +232,18 @@ export default {
           :schema="tabs[CLUSTER].schema"
           :headers="tabs[CLUSTER].headers"
           :rows="clusterResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
 
       <Tab
@@ -208,8 +256,35 @@ export default {
           :schema="tabs[PROJECT].schema"
           :headers="tabs[PROJECT].headers"
           :rows="namespaceResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </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';
+  }
+  .actions-container-box {
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
+
+</style>

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/c/_cluster/monitoring/monitor/index.vue

@@ -52,14 +52,14 @@ export default {
   <div v-else>
     <div class="row header mb-40">
       <h1>  {{ t('monitoring.monitors') }}</h1>
-      <div>
+      <!-- <div>
         <button
           class="btn btn-lg role-primary float right"
           @click="$router.push(createRoute)"
         >
           {{ t('resourceList.head.createFromYaml') }}
         </button>
-      </div>
+      </div> -->
     </div>
     <Tabbed
       ref="tabs"