From 1b06a96cfbe5774931d8c4c0d7827703caa096df Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sun, 6 Aug 2023 22:37:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=81=E8=AE=B8=E7=8E=B0=E6=9C=89?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=B0=83=E6=95=B4=E5=88=97=E5=AE=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E7=8E=B0=E6=9C=89=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?/=E4=BF=AE=E6=94=B9=E7=B1=BB=E8=A1=A8=E5=8D=95=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E6=8C=89=20Esc=20=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/monitor/log/login/index.vue              |  5 +++--
 .../src/views/monitor/log/operation/index.vue          |  5 +++--
 .../src/views/monitor/log/system/index.vue             |  6 +++---
 continew-admin-ui/src/views/monitor/online/index.vue   |  5 +++--
 continew-admin-ui/src/views/system/dept/index.vue      | 10 ++++++----
 continew-admin-ui/src/views/system/menu/index.vue      | 10 ++++++----
 continew-admin-ui/src/views/system/role/index.vue      |  8 +++++---
 .../system/user/center/components/operation-log.vue    |  5 +++--
 .../components/security-settings/update-email.vue      |  1 +
 .../center/components/security-settings/update-pwd.vue |  1 +
 continew-admin-ui/src/views/system/user/index.vue      |  9 ++++++---
 11 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/continew-admin-ui/src/views/monitor/log/login/index.vue b/continew-admin-ui/src/views/monitor/log/login/index.vue
index 0d4108cb..6c579cc0 100644
--- a/continew-admin-ui/src/views/monitor/log/login/index.vue
+++ b/continew-admin-ui/src/views/monitor/log/login/index.vue
@@ -37,6 +37,7 @@
       <a-table
         ref="tableRef"
         row-key="id"
+        :data="loginLogList"
         :loading="loading"
         :pagination="{
           showTotal: true,
@@ -44,9 +45,9 @@
           total: total,
           current: queryParams.page,
         }"
-        :data="loginLogList"
         :bordered="false"
-        :stripe="true"
+        column-resizable
+        stripe
         size="large"
         @page-change="handlePageChange"
         @page-size-change="handlePageSizeChange"
diff --git a/continew-admin-ui/src/views/monitor/log/operation/index.vue b/continew-admin-ui/src/views/monitor/log/operation/index.vue
index 3986b0d0..d287d895 100644
--- a/continew-admin-ui/src/views/monitor/log/operation/index.vue
+++ b/continew-admin-ui/src/views/monitor/log/operation/index.vue
@@ -46,6 +46,7 @@
       <a-table
         ref="tableRef"
         row-key="id"
+        :data="operationLogList"
         :loading="loading"
         :pagination="{
           showTotal: true,
@@ -53,9 +54,9 @@
           total: total,
           current: queryParams.page,
         }"
-        :data="operationLogList"
         :bordered="false"
-        :stripe="true"
+        column-resizable
+        stripe
         size="large"
         @page-change="handlePageChange"
         @page-size-change="handlePageSizeChange"
diff --git a/continew-admin-ui/src/views/monitor/log/system/index.vue b/continew-admin-ui/src/views/monitor/log/system/index.vue
index 17be3a2c..c68be70f 100644
--- a/continew-admin-ui/src/views/monitor/log/system/index.vue
+++ b/continew-admin-ui/src/views/monitor/log/system/index.vue
@@ -28,6 +28,7 @@
       <a-table
         ref="tableRef"
         row-key="id"
+        :data="systemLogList"
         :loading="loading"
         :pagination="{
           showTotal: true,
@@ -35,9 +36,9 @@
           total: total,
           current: queryParams.page,
         }"
-        :data="systemLogList"
         :bordered="false"
-        :stripe="true"
+        column-resizable
+        stripe
         size="large"
         @page-change="handlePageChange"
         @page-size-change="handlePageSizeChange"
@@ -262,7 +263,6 @@
         :visible="exceptionDetailVisible"
         width="83%"
         :footer="false"
-        :mask-closable="false"
         top="30px"
         unmount-on-close
         render-to-body
diff --git a/continew-admin-ui/src/views/monitor/online/index.vue b/continew-admin-ui/src/views/monitor/online/index.vue
index 36e6caab..26e08cc0 100644
--- a/continew-admin-ui/src/views/monitor/online/index.vue
+++ b/continew-admin-ui/src/views/monitor/online/index.vue
@@ -37,6 +37,7 @@
       <a-table
         ref="tableRef"
         row-key="token"
+        :data="onlineUserList"
         :loading="loading"
         :pagination="{
           showTotal: true,
@@ -44,9 +45,9 @@
           total: total,
           current: queryParams.page,
         }"
-        :data="onlineUserList"
         :bordered="false"
-        :stripe="true"
+        column-resizable
+        stripe
         size="large"
         @page-change="handlePageChange"
         @page-size-change="handlePageSizeChange"
diff --git a/continew-admin-ui/src/views/system/dept/index.vue b/continew-admin-ui/src/views/system/dept/index.vue
index 61675951..818e219f 100644
--- a/continew-admin-ui/src/views/system/dept/index.vue
+++ b/continew-admin-ui/src/views/system/dept/index.vue
@@ -93,19 +93,20 @@
       <!-- 列表区域 -->
       <a-table
         ref="tableRef"
+        row-key="id"
         :data="deptList"
+        :loading="loading"
         :row-selection="{
           type: 'checkbox',
           showCheckedAll: true,
           onlyCurrent: false,
         }"
         :pagination="false"
+        :bordered="false"
         :default-expand-all-rows="true"
         :hide-expand-button-on-empty="true"
-        row-key="id"
-        :bordered="false"
-        :stripe="true"
-        :loading="loading"
+        column-resizable
+        stripe
         size="large"
         @select="handleSelect"
         @selection-change="handleSelectionChange"
@@ -178,6 +179,7 @@
         :title="title"
         :visible="visible"
         :mask-closable="false"
+        :esc-to-close="false"
         unmount-on-close
         render-to-body
         @ok="handleOk"
diff --git a/continew-admin-ui/src/views/system/menu/index.vue b/continew-admin-ui/src/views/system/menu/index.vue
index 14fac848..37f48adb 100644
--- a/continew-admin-ui/src/views/system/menu/index.vue
+++ b/continew-admin-ui/src/views/system/menu/index.vue
@@ -96,19 +96,20 @@
       <!-- 列表区域 -->
       <a-table
         ref="tableRef"
+        row-key="id"
         :data="menuList"
+        :loading="loading"
         :row-selection="{
           type: 'checkbox',
           showCheckedAll: true,
           onlyCurrent: false,
         }"
         :pagination="false"
+        :bordered="false"
         :default-expand-all-rows="true"
         :hide-expand-button-on-empty="true"
-        row-key="id"
-        :bordered="false"
-        :stripe="true"
-        :loading="loading"
+        column-resizable
+        stripe
         size="large"
         @select="handleSelect"
         @selection-change="handleSelectionChange"
@@ -193,6 +194,7 @@
         :visible="visible"
         :width="625"
         :mask-closable="false"
+        :esc-to-close="false"
         unmount-on-close
         render-to-body
         @ok="handleOk"
diff --git a/continew-admin-ui/src/views/system/role/index.vue b/continew-admin-ui/src/views/system/role/index.vue
index 15a3de18..066c5ac1 100644
--- a/continew-admin-ui/src/views/system/role/index.vue
+++ b/continew-admin-ui/src/views/system/role/index.vue
@@ -93,7 +93,9 @@
       <!-- 列表区域 -->
       <a-table
         ref="tableRef"
+        row-key="id"
         :data="roleList"
+        :loading="loading"
         :row-selection="{
           type: 'checkbox',
           showCheckedAll: true,
@@ -105,10 +107,9 @@
           total: total,
           current: queryParams.page,
         }"
-        row-key="id"
         :bordered="false"
-        :stripe="true"
-        :loading="loading"
+        column-resizable
+        stripe
         size="large"
         @page-change="handlePageChange"
         @page-size-change="handlePageSizeChange"
@@ -196,6 +197,7 @@
         :visible="visible"
         :width="580"
         :mask-closable="false"
+        :esc-to-close="false"
         unmount-on-close
         render-to-body
         @ok="handleOk"
diff --git a/continew-admin-ui/src/views/system/user/center/components/operation-log.vue b/continew-admin-ui/src/views/system/user/center/components/operation-log.vue
index af3475e8..31364348 100644
--- a/continew-admin-ui/src/views/system/user/center/components/operation-log.vue
+++ b/continew-admin-ui/src/views/system/user/center/components/operation-log.vue
@@ -4,6 +4,7 @@
     <a-table
       ref="tableRef"
       row-key="id"
+      :data="operationLogList"
       :loading="loading"
       :pagination="{
         showTotal: true,
@@ -11,9 +12,9 @@
         total: total,
         current: queryParams.page,
       }"
-      :data="operationLogList"
       :bordered="false"
-      :stripe="true"
+      column-resizable
+      stripe
       size="large"
       @page-change="handlePageChange"
       @page-size-change="handlePageSizeChange"
diff --git a/continew-admin-ui/src/views/system/user/center/components/security-settings/update-email.vue b/continew-admin-ui/src/views/system/user/center/components/security-settings/update-email.vue
index e5b8f9a0..20da100a 100644
--- a/continew-admin-ui/src/views/system/user/center/components/security-settings/update-email.vue
+++ b/continew-admin-ui/src/views/system/user/center/components/security-settings/update-email.vue
@@ -37,6 +37,7 @@
     :title="$t('userCenter.securitySettings.updateEmail.modal.title')"
     :visible="visible"
     :mask-closable="false"
+    :esc-to-close="false"
     @ok="handleUpdate"
     @cancel="handleCancel"
   >
diff --git a/continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue b/continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue
index 433cbd1b..0bc6b292 100644
--- a/continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue
+++ b/continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue
@@ -37,6 +37,7 @@
     :title="$t('userCenter.securitySettings.updatePwd.modal.title')"
     :visible="visible"
     :mask-closable="false"
+    :esc-to-close="false"
     @ok="handleUpdate"
     @cancel="handleCancel"
   >
diff --git a/continew-admin-ui/src/views/system/user/index.vue b/continew-admin-ui/src/views/system/user/index.vue
index dd6f2f70..483e424d 100644
--- a/continew-admin-ui/src/views/system/user/index.vue
+++ b/continew-admin-ui/src/views/system/user/index.vue
@@ -120,7 +120,9 @@
           <!-- 列表区域 -->
           <a-table
             ref="tableRef"
+            row-key="id"
             :data="userList"
+            :loading="loading"
             :row-selection="{
               type: 'checkbox',
               showCheckedAll: true,
@@ -132,10 +134,9 @@
               total: total,
               current: queryParams.page,
             }"
-            row-key="id"
             :bordered="false"
-            :stripe="true"
-            :loading="loading"
+            column-resizable
+            stripe
             size="large"
             :scroll="{
               x: '120%',
@@ -283,6 +284,7 @@
         :visible="visible"
         :width="580"
         :mask-closable="false"
+        :esc-to-close="false"
         unmount-on-close
         render-to-body
         @ok="handleOk"
@@ -378,6 +380,7 @@
         title="分配角色"
         :visible="userRoleVisible"
         :mask-closable="false"
+        :esc-to-close="false"
         unmount-on-close
         render-to-body
         @ok="handleUpdateRole"