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

package/pages/auth/setup.vue

@@ -65,7 +65,7 @@ export default {
       v3User:             null,
       serverUrl:          null,
       mcmEnabled:         null,
-      eula:               true,
+      eula:               false,
       principals:         null,
       errors:             []
     };
@@ -148,8 +148,7 @@ export default {
     this['username'] = me?.loginName || 'admin';
     this['isFirstLogin'] = isFirstLogin;
     this['mustChangePassword'] = mustChangePassword;
-    // this['current'] = current;
-    this['current'] = 'admin';
+    this['current'] = current;
     this['v3User'] = v3User;
     this['serverUrl'] = serverUrl;
     this['mcmEnabled'] = mcmEnabled;
@@ -158,9 +157,6 @@ export default {
 
   computed: {
     saveEnabled() {
-      // if ( this.isFirstLogin) {
-      //   return false;
-      // }
       if ( !this.eula && this.isFirstLogin) {
         return false;
       }
@@ -277,41 +273,27 @@ export default {
     @submit.prevent
   >
     <div class="row">
-      <!-- <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 class="col span-6 form-col">
+        <div>
+          &nbsp;
+        </div>
         <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="mb-20 mt-20 setup-title"
+              class="text-center 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 setup-password"
+              class="mb-20"
               :required="true"
             />
 
@@ -339,7 +321,6 @@ export default {
                 :disabled="useRandom"
                 data-testid="setup-password-random"
                 label-key="setup.newPassword"
-                class="radom-password"
               >
                 <template
                   v-if="useRandom"
@@ -347,7 +328,7 @@ export default {
                 >
                   <div
                     class="addon"
-                    style="padding: 0 0 0 0px;"
+                    style="padding: 0 0 0 12px;"
                   >
                     <CopyToClipboard
                       :aria-label="t('setup.copyRandom')"
@@ -363,7 +344,6 @@ export default {
                 v-model:value.trim="password"
                 :label="t('setup.newPassword')"
                 data-testid="setup-password"
-                class="setup-password"
                 :required="true"
               />
             </div>
@@ -372,7 +352,6 @@ export default {
               v-model:value.trim="confirm"
               autocomplete="new-password"
               data-testid="setup-password-confirm"
-               class="setup-password"
               :label="t('setup.confirmPassword')"
               :required="true"
             />
@@ -416,7 +395,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"
@@ -430,7 +409,7 @@ export default {
                   />
                 </template>
               </Checkbox>
-            </div> -->
+            </div>
           </template>
 
           <div
@@ -451,7 +430,7 @@ export default {
             <h4
               v-for="(err, i) in errors"
               :key="i"
-              class="text-error "
+              class="text-error text-center"
             >
               {{ err }}
             </h4>
@@ -461,7 +440,10 @@ export default {
           &nbsp;
         </div>
       </div>
-      
+      <BrandImage
+        class="col span-6 landscape"
+        file-name="login-landscape.svg"
+      />
     </div>
   </form>
 </template>
@@ -482,23 +464,9 @@ 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
@@ -541,8 +509,6 @@ export default {
       :deep() code {
         font-size: 12px;
         padding: 0;
-        background-color: unset;
-        border: 0px;
       }
     }
 
@@ -554,93 +520,4 @@ 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

@@ -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

@@ -156,13 +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 style="margin: 20px 0;">支持管理员创建与管理不同角色‌，每个角色可预设特定权限集合，可简化用户权限分配流程，提升权限管理的灵活性与安全性。</div>
       </div>
-      <div class="actions-container actions-container-box">
+      <div class="actions-container">
         <div class="actions">
           <router-link
             v-if="canCreate"
@@ -215,19 +213,3 @@ export default {
     </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/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"

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

@@ -249,180 +249,130 @@ export default {
 </script>
 
 <template>
-
-  <!-- 如果正在获取数据，显示加载组件 -->
   <Loading v-if="$fetchState.pending" />
-
-  <!-- 否则显示主要内容 -->
-  <div style="padding: 20px 20px 100px;" v-else>
-
-    <!-- 面包屑 -->
-    <div class="excram-list">全局设置 / <span style="color: #1890FF;">横幅</span></div>
-    <!-- 页面主标题 -->
+  <div v-else>
     <h1 class="mb-20">
       {{ t('banner.label') }}
     </h1>
     <div>
-
-      <!-- 描述标签 -->
       <label class="text-label">
         {{ t(`advancedSettings.descriptions.${ 'ui-banners' }`, {}, true) }}
       </label>
 
-      <!-- ===============================
-           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
+      <!-- Header Settings -->
+      <h2 class="mt-40 mb-10 setting-title">
+        {{ t('banner.bannerHeader') }}
+        <i
           v-if="!!uiBannerIndividual.bannerHeader"
-          class="row mb-10"
-        >
-          <Banner
-            color="warning"
-            class="mt-0"
-            :label="t('banner.individualSetting', {name: 'ui-banner-header'}, true)"
-          />
-        </div>
-
-        <!-- 是否显示 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"
+          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>
-       <!-- ===============================
-           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 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"
+      />
 
-        <!-- 是否显示 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"
+      <!-- Footer settings -->
+      <h2 class="mt-40 mb-10 setting-title">
+        {{ t('banner.bannerFooter') }}
+        <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 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"
+      <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()"
           />
-        </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>
+      <BannerSettings
+        v-model:value="bannerVal"
+        banner-type="bannerFooter"
+        :mode="footerMode"
+      />
 
-      <!-- ===============================
-           登录错误通知设置
-           =============================== -->
-      <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')"
+      <!-- Consent settings -->
+      <h2 class="mt-40 mb-10 setting-title">
+        {{ t('banner.bannerConsent') }}
+        <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>
+      <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"
+      />
+      <h2 class="mt-40 mb-40">
+        {{ t('notifications.loginError.header') }}
+      </h2>
+      <NotificationSettings
+        v-model:value="bannerVal.loginError"
+        :mode="mode"
+        :label="t('notifications.loginError.messageLabel')"
+        :hidden-aria-described-label="t('notifications.loginError.header')"
+      />
     </div>
-
-    <!-- 全局错误提示 -->
     <template
       v-for="(err, i) in errors"
       :key="i"
@@ -432,11 +382,9 @@ export default {
         :label="err"
       />
     </template>
-
-    <!-- 编辑模式下显示“应用”按钮 -->
-    <div class="action-btn" v-if="mode === 'edit'">
+    <div v-if="mode === 'edit'">
       <AsyncButton
-        class="pull-right"
+        class="pull-right mt-20"
         mode="apply"
         @click="save"
       />
@@ -445,16 +393,6 @@ 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%;
@@ -470,19 +408,9 @@ 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>