feat: 允许现有表格调整列宽，不允许现有新增/修改类表单对话框按 Esc 关闭

continew-org · Aug 6, 2023 · 1b06a96 · 1b06a96
1 parent bb6f47c
commit 1b06a96
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 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
@@ -37,16 +37,17 @@
       <a-table
         ref="tableRef"
         row-key="id"
+        :data="loginLogList"
         :loading="loading"
         :pagination="{
           showTotal: true,
           showPageSize: true,
           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
@@ -46,16 +46,17 @@
       <a-table
         ref="tableRef"
         row-key="id"
+        :data="operationLogList"
         :loading="loading"
         :pagination="{
           showTotal: true,
           showPageSize: true,
           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
@@ -28,16 +28,17 @@
       <a-table
         ref="tableRef"
         row-key="id"
+        :data="systemLogList"
         :loading="loading"
         :pagination="{
           showTotal: true,
           showPageSize: true,
           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
@@ -37,16 +37,17 @@
       <a-table
         ref="tableRef"
         row-key="token"
+        :data="onlineUserList"
         :loading="loading"
         :pagination="{
           showTotal: true,
           showPageSize: true,
           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
@@ -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
@@ -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
@@ -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
@@ -4,16 +4,17 @@
     <a-table
       ref="tableRef"
       row-key="id"
+      :data="operationLogList"
       :loading="loading"
       :pagination="{
         showTotal: true,
         showPageSize: true,
         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
@@ -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
@@ -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
@@ -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"