From 74f7f77e755ce07abd2babb92ecae67a9af6e161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com>
Date: Mon, 17 Jan 2022 17:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=95=20=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vben271/src/views/admin/roles/AbpRole.vue     | 49 ++++++------
 vben271/src/views/admin/users/AbpUser.vue     | 50 ++++++-------
 .../apiResources/ApiResources.vue             | 36 ++++-----
 .../identityServers/apiScopes/ApiScopes.vue   | 36 ++++-----
 .../views/identityServers/clients/Clients.vue | 75 +++++++++----------
 .../identityResources/IdentityResources.vue   | 34 ++++-----
 vben271/src/views/tenants/Tenant.vue          | 35 ++++++++-
 7 files changed, 165 insertions(+), 150 deletions(-)

diff --git a/vben271/src/views/admin/roles/AbpRole.vue b/vben271/src/views/admin/roles/AbpRole.vue
index e998c0fa..c9524a43 100644
--- a/vben271/src/views/admin/roles/AbpRole.vue
+++ b/vben271/src/views/admin/roles/AbpRole.vue
@@ -10,6 +10,7 @@
       <template #toolbar>
         <a-button
           type="primary"
+          preIcon="ant-design:plus-circle-outlined"
           @click="openCreateAbpRoleModal"
           v-auth="'AbpIdentity.Roles.Create'"
         >
@@ -18,32 +19,28 @@
       </template>
 
       <template #action="{ record }">
-        <a-button
-          type="link"
-          size="small"
-          @click="handlePermission(record)"
-          v-auth="'AbpIdentity.Roles.ManagePermissions'"
-        >
-          {{ t('routes.admin.roleManagement_permission') }}
-        </a-button>
-
-        <a-button
-          type="link"
-          size="small"
-          @click="handleEdit(record)"
-          v-auth="'AbpIdentity.Roles.Update'"
-        >
-          {{ t('common.editText') }}
-        </a-button>
-
-        <a-button
-          type="link"
-          size="small"
-          @click="handleDelete(record)"
-          v-auth="'AbpIdentity.Roles.Delete'"
-        >
-          {{ t('common.delText') }}
-        </a-button>
+        <TableAction
+          :actions="[
+            {
+              auth: 'AbpIdentity.Roles.ManagePermissions',
+              label: t('routes.admin.roleManagement_permission'),
+              icon: 'ant-design:property-safety-outlined',
+              onClick: handlePermission.bind(null, record),
+            },
+          ]"
+          :dropDownActions="[
+            {
+              auth: 'AbpIdentity.Roles.Update',
+              label: t('common.editText'),
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              auth: 'AbpIdentity.Roles.Delete',
+              label: t('common.delText'),
+              onClick: handleDelete.bind(null, record),
+            },
+          ]"
+        />
       </template>
     </BasicTable>
 
diff --git a/vben271/src/views/admin/users/AbpUser.vue b/vben271/src/views/admin/users/AbpUser.vue
index d7abaa7d..53067707 100644
--- a/vben271/src/views/admin/users/AbpUser.vue
+++ b/vben271/src/views/admin/users/AbpUser.vue
@@ -3,6 +3,7 @@
     <BasicTable @register="registerTable" size="small">
       <template #toolbar>
         <a-button
+          preIcon="ant-design:plus-circle-outlined"
           type="primary"
           @click="openCreateAbpUserModal"
           v-auth="'AbpIdentity.Users.Create'"
@@ -16,31 +17,28 @@
         </Tag>
       </template>
       <template #action="{ record }">
-        <a-button
-          type="link"
-          size="small"
-          @click="handleEdit(record)"
-          v-auth="'AbpIdentity.Users.Update'"
-        >
-          {{ t('common.editText') }}
-        </a-button>
-
-        <a-button
-          type="link"
-          size="small"
-          @click="handleDelete(record)"
-          v-auth="'AbpIdentity.Users.Delete'"
-        >
-          {{ t('common.delText') }}
-        </a-button>
-        <a-button
-          type="link"
-          size="small"
-          @click="handleLock(record)"
-          v-auth="'System.Users.Enable'"
-        >
-          {{ !record.isActive ? t('common.enabled') : t('common.disEnabled') }}
-        </a-button>
+        <TableAction
+          :actions="[
+            {
+              icon: 'ant-design:edit-outlined',
+              auth: 'AbpIdentity.Users.Update',
+              label: t('common.editText'),
+              onClick: handleEdit.bind(null, record),
+            },
+          ]"
+          :dropDownActions="[
+            {
+              auth: 'AbpIdentity.Users.Delete',
+              label: t('common.delText'),
+              onClick: handleDelete.bind(null, record),
+            },
+            {
+              auth: 'System.Users.Enable',
+              label: !record.isActive ? t('common.enabled') : t('common.disEnabled'),
+              onClick: handleLock.bind(null, record),
+            },
+          ]"
+        />
       </template>
     </BasicTable>
     <CreateAbpUser
@@ -113,7 +111,7 @@
         canResize: true,
         showIndexColumn: true,
         actionColumn: {
-          width: 250,
+          width: 120,
           title: t('common.action'),
           dataIndex: 'action',
           slots: {
diff --git a/vben271/src/views/identityServers/apiResources/ApiResources.vue b/vben271/src/views/identityServers/apiResources/ApiResources.vue
index 81dee01c..ef39670a 100644
--- a/vben271/src/views/identityServers/apiResources/ApiResources.vue
+++ b/vben271/src/views/identityServers/apiResources/ApiResources.vue
@@ -3,6 +3,7 @@
     <BasicTable @register="registerTable" size="small">
       <template #toolbar>
         <a-button
+          preIcon="ant-design:plus-circle-outlined"
           type="primary"
           @click="openCreateApiResourceModal"
           v-auth="'IdentityServerManagement.ApiResource.Create'"
@@ -21,23 +22,22 @@
         </Tag>
       </template>
       <template #action="{ record }">
-        <a-button
-          type="link"
-          size="small"
-          @click="handleEdit(record)"
-          v-auth="'IdentityServerManagement.ApiResource.Update'"
-        >
-          {{ t('common.editText') }}
-        </a-button>
-
-        <a-button
-          type="link"
-          size="small"
-          @click="handleDelete(record)"
-          v-auth="'IdentityServerManagement.ApiResource.Delete'"
-        >
-          {{ t('common.delText') }}
-        </a-button>
+        <TableAction
+          :actions="[
+            {
+              auth: 'IdentityServerManagement.ApiResource.Update',
+              label: t('common.editText'),
+              icon: 'ant-design:edit-outlined',
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              icon: 'ic:outline-delete-outline',
+              auth: 'IdentityServerManagement.ApiResource.Delete',
+              label: t('common.delText'),
+              onClick: handleDelete.bind(null, record),
+            },
+          ]"
+        />
       </template>
     </BasicTable>
     <CreateApiResource
@@ -92,7 +92,7 @@
         canResize: true,
         showIndexColumn: true,
         actionColumn: {
-          width: 150,
+          width: 120,
           title: t('common.action'),
           dataIndex: 'action',
           slots: {
diff --git a/vben271/src/views/identityServers/apiScopes/ApiScopes.vue b/vben271/src/views/identityServers/apiScopes/ApiScopes.vue
index a24f1ba4..5e7473ee 100644
--- a/vben271/src/views/identityServers/apiScopes/ApiScopes.vue
+++ b/vben271/src/views/identityServers/apiScopes/ApiScopes.vue
@@ -3,6 +3,7 @@
     <BasicTable @register="registerTable" size="small">
       <template #toolbar>
         <a-button
+          preIcon="ant-design:plus-circle-outlined"
           type="primary"
           @click="openCreateApiScopeModal"
           v-auth="'IdentityServerManagement.ApiScope.Create'"
@@ -31,23 +32,22 @@
         </Tag>
       </template>
       <template #action="{ record }">
-        <a-button
-          type="link"
-          size="small"
-          @click="handleEdit(record)"
-          v-auth="'IdentityServerManagement.ApiScope.Update'"
-        >
-          {{ t('common.editText') }}
-        </a-button>
-
-        <a-button
-          type="link"
-          size="small"
-          @click="handleDelete(record)"
-          v-auth="'IdentityServerManagement.ApiScope.Delete'"
-        >
-          {{ t('common.delText') }}
-        </a-button>
+        <TableAction
+          :actions="[
+            {
+              auth: 'IdentityServerManagement.ApiScope.Update',
+              label: t('common.editText'),
+              icon: 'ant-design:edit-outlined',
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              icon: 'ic:outline-delete-outline',
+              auth: 'IdentityServerManagement.ApiScope.Delete',
+              label: t('common.delText'),
+              onClick: handleDelete.bind(null, record),
+            },
+          ]"
+        />
       </template>
     </BasicTable>
     <CreateApiScope
@@ -102,7 +102,7 @@
         canResize: true,
         showIndexColumn: true,
         actionColumn: {
-          width: 150,
+          width: 120,
           title: t('common.action'),
           dataIndex: 'action',
           slots: {
diff --git a/vben271/src/views/identityServers/clients/Clients.vue b/vben271/src/views/identityServers/clients/Clients.vue
index 2931a8a4..adeb9dca 100644
--- a/vben271/src/views/identityServers/clients/Clients.vue
+++ b/vben271/src/views/identityServers/clients/Clients.vue
@@ -3,6 +3,7 @@
     <BasicTable @register="registerTable" size="small">
       <template #toolbar>
         <a-button
+          preIcon="ant-design:plus-circle-outlined"
           type="primary"
           @click="openCreateClientModal"
           v-auth="'IdentityServerManagement.Client.Create'"
@@ -18,46 +19,38 @@
       </template>
 
       <template #action="{ record }">
-        <a-button
-          type="link"
-          size="small"
-          @click="handleEdit(record)"
-          v-auth="'IdentityServerManagement.Client.Update'"
-        >
-          {{ t('common.editText') }}
-        </a-button>
-        <a-button
-          type="link"
-          size="small"
-          @click="handleEnabled(record)"
-          v-auth="'IdentityServerManagement.Client.Enable'"
-        >
-          {{ record.enabled ? t('common.disEnabled') : t('common.enabled') }}
-        </a-button>
-        <a-button
-          type="link"
-          size="small"
-          @click="handleUri(record)"
-          v-auth="'IdentityServerManagement.Client.Update'"
-        >
-          Uri
-        </a-button>
-        <a-button
-          type="link"
-          size="small"
-          @click="handleDelete(record)"
-          v-auth="'IdentityServerManagement.Client.Delete'"
-        >
-          {{ t('common.delText') }}
-        </a-button>
-        <a-button
-          type="link"
-          size="small"
-          @click="handleIdenityResource(record)"
-          v-auth="'IdentityServerManagement.Client.Delete'"
-        >
-          Scopes
-        </a-button>
+        <TableAction
+          :actions="[
+            {
+              auth: 'IdentityServerManagement.Client.Update',
+              label: t('common.editText'),
+              icon: 'ant-design:edit-outlined',
+              onClick: handleEdit.bind(null, record),
+            },
+          ]"
+          :dropDownActions="[
+            {
+              auth: 'IdentityServerManagement.Client.Enable',
+              label: record.enabled ? t('common.disEnabled') : t('common.enabled'),
+              onClick: handleEnabled.bind(null, record),
+            },
+            {
+              auth: 'IdentityServerManagement.Client.Update',
+              label: 'Uri',
+              onClick: handleUri.bind(null, record),
+            },
+            {
+              auth: 'IdentityServerManagement.Client.Update',
+              label: 'Scopes',
+              onClick: handleIdenityResource.bind(null, record),
+            },
+            {
+              auth: 'IdentityServerManagement.Client.Delete',
+              label: t('common.delText'),
+              onClick: handleDelete.bind(null, record),
+            },
+          ]"
+        />
       </template>
     </BasicTable>
     <CreateClient
@@ -127,7 +120,7 @@
         canResize: true,
         showIndexColumn: true,
         actionColumn: {
-          width: 300,
+          width: 120,
           title: t('common.action'),
           dataIndex: 'action',
           slots: {
diff --git a/vben271/src/views/identityServers/identityResources/IdentityResources.vue b/vben271/src/views/identityServers/identityResources/IdentityResources.vue
index f6900695..a91283e0 100644
--- a/vben271/src/views/identityServers/identityResources/IdentityResources.vue
+++ b/vben271/src/views/identityServers/identityResources/IdentityResources.vue
@@ -3,6 +3,7 @@
     <BasicTable @register="registerTable" size="small">
       <template #toolbar>
         <a-button
+          preIcon="ant-design:plus-circle-outlined"
           type="primary"
           @click="openCreateIdentityResourcesModal"
           v-auth="'IdentityServerManagement.IdentityResources.Create'"
@@ -31,23 +32,22 @@
         </Tag>
       </template>
       <template #action="{ record }">
-        <a-button
-          type="link"
-          size="small"
-          @click="handleEdit(record)"
-          v-auth="'IdentityServerManagement.IdentityResources.Update'"
-        >
-          {{ t('common.editText') }}
-        </a-button>
-
-        <a-button
-          type="link"
-          size="small"
-          @click="handleDelete(record)"
-          v-auth="'IdentityServerManagement.IdentityResources.Delete'"
-        >
-          {{ t('common.delText') }}
-        </a-button>
+        <TableAction
+          :actions="[
+            {
+              auth: 'IdentityServerManagement.IdentityResources.Update',
+              label: t('common.editText'),
+              icon: 'ant-design:edit-outlined',
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              icon: 'ic:outline-delete-outline',
+              auth: 'IdentityServerManagement.IdentityResources.Delete',
+              label: t('common.delText'),
+              onClick: handleDelete.bind(null, record),
+            },
+          ]"
+        />
       </template>
     </BasicTable>
     <CreateIdentityResource
diff --git a/vben271/src/views/tenants/Tenant.vue b/vben271/src/views/tenants/Tenant.vue
index 51b57518..34d2bae4 100644
--- a/vben271/src/views/tenants/Tenant.vue
+++ b/vben271/src/views/tenants/Tenant.vue
@@ -3,6 +3,7 @@
     <BasicTable @register="registerTable" size="small">
       <template #toolbar>
         <a-button
+          preIcon="ant-design:plus-circle-outlined"
           type="primary"
           @click="openCreateTenantModal"
           v-auth="'AbpTenantManagement.Tenants.Create'"
@@ -11,7 +12,32 @@
         </a-button>
       </template>
 
-      <template #action="{ record }">
+      <template #action="{ action }">
+        <TableAction
+          :actions="[
+            {
+              icon: 'ant-design:edit-outlined',
+              auth: 'AbpTenantManagement.Tenants.Update',
+              label: t('common.editText'),
+              onClick: handleEdit.bind(null, record),
+            },
+          ]"
+          :dropDownActions="[
+            {
+              auth: 'AbpTenantManagement.Tenants.ManageConnectionStrings',
+              label: t('routes.tenant.connectionString'),
+              onClick: handleConnectionString.bind(null, record),
+            },
+            {
+              auth: 'AbpTenantManagement.Tenants.Delete',
+              label: t('common.delText'),
+              onClick: handleDelete.bind(null, record),
+            },
+          ]"
+        />
+      </template>
+
+      <!-- <template #action="{ record }">
         <a-button
           type="link"
           size="small"
@@ -37,7 +63,7 @@
         >
           {{ t('routes.tenant.connectionString') }}
         </a-button>
-      </template>
+      </template> -->
     </BasicTable>
     <EditTenant
       @register="registerEditTenantModal"
@@ -61,7 +87,7 @@
   import { defineComponent } from 'vue';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { BasicModal, useModal } from '/@/components/Modal';
-  import { BasicTable, useTable } from '/@/components/Table';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
 
   import { getTenantListAsync, tableColumns, searchFormSchema, deleteTenantAsync } from './Tenant';
   import CreateTenant from './CreateTenant.vue';
@@ -74,6 +100,7 @@
     components: {
       BasicTable,
       BasicModal,
+      TableAction,
       CreateTenant,
       EditTenant,
       EditConnectionString,
@@ -103,7 +130,7 @@
           slots: {
             customRender: 'action',
           },
-          width: 200,
+          width: 120,
           fixed: 'right',
         },
       });