Merge branch '2.x' of https://gitee.com/isme-admin/vue-naive-admin into 2.x

src/views/base/test-modal.vue

@@ -1,7 +1,7 @@
 <!--------------------------------
  - @Author: Ronnie Zhang
  - @LastEditor: Ronnie Zhang
- - @LastEditTime: 2023/12/16 18:51:56
+ - @LastEditTime: 2024/01/13 17:41:47
  - @Email: zclzone@outlook.com
  - Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  --------------------------------->
@@ -55,7 +55,7 @@ function openModal2() {
   $modal2.value?.open({
     cancelText: '关闭当前',
     okText: '关闭所有弹窗',
-    modalStyle: { width: '320px', padding: '12px', top: '100px' },
+    width: '400px',
     async onOk() {
       okLoading2.value = true
       $message.loading('正在关闭...', { key: 'modal2' })

src/views/pms/role/index.vue

@@ -23,13 +23,7 @@
       :get-data="api.read"
     >
       <MeQueryItem label="角色名" :label-width="50">
-        <n-input
-          v-model:value="queryItems.name"
-          type="text"
-          placeholder="请输入角色名"
-          clearable
-          @keydown.enter="() => $table?.handleSearch()"
-        />
+        <n-input v-model:value="queryItems.name" type="text" placeholder="请输入角色名" clearable />
       </MeQueryItem>
       <MeQueryItem label="状态" :label-width="50">
         <n-select

src/views/pms/role/role-user.vue

@@ -43,7 +43,6 @@
           type="text"
           placeholder="请输入用户名"
           clearable
-          @keydown.enter="() => $table?.handleSearch"
         />
       </MeQueryItem>
 

src/views/pms/user/index.vue

@@ -28,7 +28,6 @@
           type="text"
           placeholder="请输入用户名"
           clearable
-          @keydown.enter="() => $table?.handleSearch"
         />
       </MeQueryItem>