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

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

@@ -312,7 +312,7 @@ export default {
           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) {

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/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/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/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;

package/rancher-components/LabeledTooltip/LabeledTooltip.vue

@@ -123,8 +123,8 @@ export default defineComponent({
     &.null {
 
         .status-icon {
-          top: 5px;
-          right: -20px;
+          top: 8px !important;
+          right: 25px !important;
         }
     }
 
@@ -146,6 +146,35 @@ export default defineComponent({
     }
 }
 
+.labeled-select{
+  .labeled-tooltip{
+    &.null {
+        .status-icon {
+          top: 10px !important;
+          right: 25px !important;
+        }
+    }
+
+    &.error {
+
+        .status-icon {
+          top: 9px !important;
+          right: 20px;
+        }
+    }
+  }
+}
+.labeled-input{
+  .labeled-tooltip{
+    &.null {
+        .status-icon {
+          top: 10px !important;
+          right: 10px !important;
+        }
+    }
+  }
+}
+
 // Ensure code blocks inside tootips don't look awful
 .v-popper__popper.v-popper--theme-tooltip {
   .v-popper__inner {