dashboard-shell-shell 1.0.122 → 1.0.1000000081

package/pages/account/index.vue

@@ -4,7 +4,8 @@ import PromptChangePassword from '@shell/components/PromptChangePassword';
 import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import Loading from '@shell/components/Loading';
-import Principal from '@shell/components/auth/Principal';
+// import Principal from '@shell/components/auth/Principal';
+import Principal from './pri.vue';
 import BackRoute from '@shell/mixins/back-link';
 import { mapGetters } from 'vuex';
 
@@ -143,21 +144,37 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <BackLink :link="backLink" />
+    <!-- <BackLink :link="backLink" />
     <h1>
       <TabTitle breadcrumb="vendor-only">
         {{ t('accountAndKeys.title') }}
       </TabTitle>
-    </h1>
+    </h1> -->
+    <div class="api-key-title mb-20">
+      {{ t('accountAndKeys.title') }}
+    </div>
 
-    <h2 v-t="'accountAndKeys.account.title'" />
+    <!-- <h2 v-t="'accountAndKeys.account.title'" /> -->
     <div class="account">
+      <div class="account-title">
+        {{ t('accountAndKeys.account.title') }}
+      </div>
       <Principal
         :value="principal.id"
         :use-muted="false"
         :show-labels="true"
-      />
-      <div>
+        :isShowPass="true"
+      >
+      <template #edit>
+          <span
+            v-if="canChangePassword"
+            class="edit-pass-txt"
+            @click="$refs.promptChangePassword.show(true)"
+          >修改
+          </span>
+        </template>
+    </Principal>
+      <!-- <div>
         <button
           v-if="canChangePassword"
           role="button"
@@ -169,33 +186,33 @@ export default {
         >
           {{ t("accountAndKeys.account.change") }}
         </button>
-      </div>
+      </div> -->
     </div>
     <PromptChangePassword ref="promptChangePassword" />
 
-    <hr>
+    <!-- <hr role="none"> -->
+     <div  
+     style=" border: 1px solid #d7d7d7;padding: 20px 20px 0px 20px;"
+     class="mt-20">
     <div class="keys-header">
       <div>
-        <h2 v-t="'accountAndKeys.apiKeys.title'" />
+        <!-- <h2 v-t="'accountAndKeys.apiKeys.title'" /> -->
+        <div
+            v-t="'accountAndKeys.apiKeys.title'"
+            class="account-title mb-20"
+          />
         <div class="api-url">
           <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
-          <CopyToClipboardText :text="apiUrl" />
+          <CopyToClipboardText
+            :aria-label="t('accountAndKeys.apiKeys.copyApiEnpoint')"
+            :text="apiUrl"
+          />
         </div>
       </div>
-      <button
-        v-if="apiKeySchema"
-        role="button"
-        :aria-label="t('accountAndKeys.apiKeys.add.label')"
-        class="btn role-primary add mb-20"
-        data-testid="account_create_api_keys"
-        @click="addKey"
-      >
-        {{ t('accountAndKeys.apiKeys.add.label') }}
-      </button>
     </div>
     <div
       v-if="apiKeySchema"
-      class="keys"
+      class="keys mb-20"
     >
       <ResourceTable
         :schema="apiKeySchema"
@@ -206,7 +223,20 @@ export default {
         :search="true"
         :row-actions="true"
         :table-actions="true"
-      />
+      >
+      <template #header-right>
+        <button
+        v-if="apiKeySchema"
+        role="button"
+        :aria-label="t('accountAndKeys.apiKeys.add.label')"
+        class="btn role-primary add mb-20"
+        data-testid="account_create_api_keys"
+        @click="addKey"
+      >
+        {{ t('accountAndKeys.apiKeys.add.label') }}
+      </button>
+          </template>
+    </ResourceTable>
     </div>
     <div v-else>
       <Banner
@@ -215,6 +245,7 @@ export default {
       />
     </div>
   </div>
+  </div>
 </template>
 
 <style lang='scss' scoped>
@@ -223,8 +254,12 @@ export default {
   }
 
   .account {
-    display: flex;
-    justify-content: space-between
+    /* display: flex;
+    justify-content: space-between */
+    border: 1px solid #D7D7D7;
+    padding: 20px;
+    box-sizing: border-box;
+
   }
 
   .keys-header {
@@ -237,8 +272,10 @@ export default {
   .keys {
     display: flex;
     flex-direction: column;
+    margin-top: 20px;
     .add {
       align-self: flex-end;
+      margin-left: 10px
     }
   }
 
@@ -249,4 +286,23 @@ export default {
       margin-right: 6px;
     }
   }
+  .api-key-title{
+    font-size: 26px;
+    /* line-height: 20px; */
+    font-weight: 400;
+  }
+
+  .edit-pass-txt{
+    cursor: pointer;
+    color: var(--primary);
+  }
+
+  .table-account{
+    border: 1px solid #d7d7d7;
+  }
+  .account-title{
+      font-size: 14px;
+      line-height: 19px;
+      margin-bottom: 16px;
+    }
 </style>

package/pages/account/pri.vue

@@ -0,0 +1,229 @@
+<script>
+import { NORMAN } from '@shell/config/types';
+
+export default {
+  props: {
+    value: {
+      type:     String,
+      required: true,
+    },
+
+    useMuted: {
+      type:    Boolean,
+      default: true,
+    },
+
+    showLabels: {
+      type:    Boolean,
+      default: false,
+    },
+    isShowPass: {
+      type:    Boolean,
+      default: false,
+    }
+  },
+
+  async fetch() {
+    this.principal = this.$store.getters['rancher/byId'](NORMAN.PRINCIPAL, this.value);
+
+    if ( this.principal ) {
+      return;
+    }
+
+    const principalId = escape(this.value).replace(/\//g, '%2F');
+
+    try {
+      this.principal = await this.$store.dispatch('rancher/find', {
+        type: NORMAN.PRINCIPAL,
+        id:   this.value,
+        opt:  { url: `/v3/principals/${ principalId }` }
+      });
+    } catch (e) {
+      console.error('Failed to fetch principal', this.value, principalId); // eslint-disable-line no-console
+    }
+  },
+
+  data() {
+    // Load from cache immediately if possible
+    return { principal: null };
+  },
+
+  computed: {
+    showBoth() {
+      const p = this.principal;
+
+      return p.name && p.loginName && p.name.trim().toLowerCase() !== p.loginName.trim().toLowerCase();
+    }
+  },
+};
+</script>
+
+<template>
+  <div
+    class="principal"
+    :class="{'showLabels': showLabels}"
+  >
+    <template v-if="!principal && $fetchState.pending">
+      <div class="avatar">
+        <div class="empty">
+          <i class="icon icon-spinner icon-lg" />
+        </div>
+      </div>
+      <div
+        v-clean-html="t('principal.loading', null, true)"
+        class="name"
+        :class="{'text-muted': useMuted}"
+      />
+      <div class="description" />
+    </template>
+
+    <template v-else-if="principal">
+      <div class="avatar">
+        <img
+          src="@shell/assets/images/user.png"
+        >
+      </div>
+      <div
+        v-if="showLabels"
+        class="name"
+      >
+        <table>
+          <tr class="mb-10">
+            <td>{{ t('principal.name') }}: </td><td>{{ principal.name || principal.loginName }}</td>
+          </tr>
+          <tr class="mb-10">
+            <td>{{ t('principal.loginName') }}: </td><td>{{ principal.loginName }}</td>
+          </tr>
+          <tr
+            v-if="isShowPass"
+            class="mb-10"
+          >
+            <td>修改密码: </td><td>****** <slot name="edit" /></td>
+          </tr>
+          <tr><td>{{ t('principal.type') }}: </td><td>{{ principal.displayType }}</td></tr>
+        </table>
+      </div>
+      <template v-else>
+        <div class="name">
+          <template v-if="showBoth">
+            {{ principal.name }}
+            <span
+              v-if="principal.loginName"
+              :class="{'text-muted': useMuted}"
+            >({{ principal.loginName }})</span>
+          </template>
+          <template v-else-if="principal.name">
+            {{ principal.name }}
+          </template>
+          <template v-else>
+            {{ principal.loginName }}
+          </template>
+        </div>
+        <div
+          class="description"
+          :class="{'text-muted': useMuted}"
+        >
+          {{ principal.displayType }}
+        </div>
+      </template>
+    </template>
+
+    <template v-else>
+      <div class="avatar">
+        <div
+          class="empty"
+          :class="{'text-muted': useMuted}"
+        >
+          <i class="icon icon-warning icon-lg" />
+        </div>
+      </div>
+      <div
+        v-t="'principal.error'"
+        class="name text-error"
+      />
+      <div
+        class="description"
+        :class="{'text-muted': useMuted}"
+      >
+        {{ value }}
+      </div>
+    </template>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  $size: 79px;
+
+  .principal {
+    display: grid;
+    grid-template-areas:
+      "avatar name"
+      "avatar description";
+    grid-template-columns: $size auto;
+    grid-template-rows: auto math.div($size, 2);
+    column-gap: 10px;
+
+    th {
+      text-align: left;
+      font-weight: normal;
+      padding-right: 10px;
+    }
+
+    &.showLabels {
+      /* grid-template-areas:
+        "avatar name";
+      grid-template-columns: 60px auto;
+      grid-template-rows: 60px;
+      column-gap: 0; */
+      display: flex;
+      column-gap:0;
+      .name {
+        display: flex;
+        line-height: unset;
+      }
+      table tr {
+        display: block;
+      }
+      table tr td:not(:first-of-type) {
+        padding-left: 10px;
+      }
+      table tr td:not(:last-of-type) {
+        width: 100px;
+      }
+    }
+
+    .avatar {
+      /* grid-area: avatar;
+      text-align: center; */
+      width: 287px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      DIV.empty {
+        border: 1px solid var(--border);
+        line-height: $size;
+      }
+
+      IMG {
+        width: $size;
+        height: $size;
+      }
+
+      DIV.round, IMG.round {
+        border-radius: 50%;
+      }
+    }
+
+    .name {
+      grid-area: name;
+      line-height: math.div($size, 2);
+      overflow-wrap: anywhere;
+    }
+
+    .description {
+      grid-area: description;
+      line-height: math.div($size, 2);
+    }
+  }
+</style>