From 15253267fcf94b2c29b809d7407bc31577ac8185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 23 Feb 2022 18:04:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20api=20key=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NavHeader/AccountDropdown.vue  |  7 +--
 src/router/profile/index.js                   | 12 +++++-
 .../NavHeader => views/profile}/ApiKey.vue    | 43 ++++++-------------
 3 files changed, 24 insertions(+), 38 deletions(-)
 rename src/{layout/components/NavHeader => views/profile}/ApiKey.vue (78%)

diff --git a/src/layout/components/NavHeader/AccountDropdown.vue b/src/layout/components/NavHeader/AccountDropdown.vue
index 10a21b991..27f1e913e 100644
--- a/src/layout/components/NavHeader/AccountDropdown.vue
+++ b/src/layout/components/NavHeader/AccountDropdown.vue
@@ -12,19 +12,14 @@
         <el-dropdown-item divided command="logout"><svg-icon icon-class="logout" style="margin-right: 4px" />{{ $t('common.nav.Logout') }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-    <ApiKey ref="api" />
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-import ApiKey from './ApiKey'
 
 export default {
   name: 'AccountDropdown',
-  components: {
-    ApiKey
-  },
   data() {
     return {
       avatarUrl: require('@/assets/img/admin.png'),
@@ -53,7 +48,7 @@ export default {
           window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
           break
         case 'apiKey':
-          this.$refs.api.showApi()
+          this.$router.push('/profile/key')
           break
       }
     },
diff --git a/src/router/profile/index.js b/src/router/profile/index.js
index 653a7af8c..123b7f1ef 100644
--- a/src/router/profile/index.js
+++ b/src/router/profile/index.js
@@ -29,7 +29,7 @@ export default {
       name: 'ProfileSetting',
       component: () => import('@/views/profile/ProfileUpdate/index'),
       meta: {
-        title: i18n.t('users.PersonalSetting'),
+        title: i18n.t('users.Profile'),
         icon: 'user-circle',
         permissions: []
       }
@@ -40,6 +40,16 @@ export default {
       name: 'ProfileImprovement',
       hidden: true,
       meta: { title: i18n.t('route.PersonalInformationImprovement'), permissions: [] }
+    },
+    {
+      path: '/profile/key',
+      component: () => import('@/views/profile/ApiKey'),
+      name: 'ApiKey',
+      meta: {
+        title: i18n.t('common.nav.APIKey'),
+        icon: 'key',
+        permissions: []
+      }
     }
   ]
 }
diff --git a/src/layout/components/NavHeader/ApiKey.vue b/src/views/profile/ApiKey.vue
similarity index 78%
rename from src/layout/components/NavHeader/ApiKey.vue
rename to src/views/profile/ApiKey.vue
index 5a6b2c37c..f73c03c1e 100644
--- a/src/layout/components/NavHeader/ApiKey.vue
+++ b/src/views/profile/ApiKey.vue
@@ -1,30 +1,22 @@
 <template>
-  <div>
-    <Dialog :destroy-on-close="true" width="60%" :visible.sync="showDialog" :title="this.$t('setting.ApiKeyList')" :show-cancel="false" :show-confirm="false">
-      <div>
-        <el-alert type="success"> {{ helpMessage }} </el-alert>
-        <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
-      </div>
-    </Dialog>
-  </div>
+  <GenericListPage
+    ref="ListTable"
+    :table-config="tableConfig"
+    :header-actions="headerActions"
+    :help-message="helpMessage"
+  />
 </template>
 
 <script>
-import Dialog from '@/components/Dialog'
-import ListTable from '@/components/ListTable'
+import { GenericListPage } from '@/layout/components'
 import { DateFormatter, ShowKeyFormatter } from '@/components/TableFormatters'
-export default {
-  name: 'ApiKey',
-  components: {
-    Dialog,
-    ListTable
-  },
-  props: {
 
+export default {
+  components: {
+    GenericListPage
   },
   data() {
     return {
-      showDialog: false,
       helpMessage: this.$t('setting.helpText.ApiKeyList'),
       tableConfig: {
         hasSelection: true,
@@ -34,16 +26,13 @@ export default {
         ],
         columnsMeta: {
           id: {
-            label: 'AccessKeyID',
-            width: '315px'
+            label: 'AccessKeyID'
           },
           secret: {
             label: 'AccessKeySecret',
-            width: '315px',
             formatter: ShowKeyFormatter
           },
           is_active: {
-            width: '80px'
           },
           date_created: {
             label: this.$t('common.dateCreated'),
@@ -114,17 +103,9 @@ export default {
         ]
       }
     }
-  },
-  methods: {
-    showApi() {
-      this.showDialog = !this.showDialog
-    }
   }
 }
 </script>
 
-<style lang='scss' scoped>
-.api-key-dialog >>> .el-dialog__body {
-  padding-top: 0;
-}
+<style scoped>
 </style>