feat: crud组件handleSearch增加参数控制是否留在当前页

src/components/me/crud/index.vue

@@ -117,6 +117,10 @@ async function handleQuery() {
     })
     tableData.value = data?.pageData || data
     pagination.itemCount = data.total ?? data.length
+    if (pagination.itemCount && !tableData.value.length && pagination.page > 1) {
+      // 如果当前页数据为空，且总条数不为0，则返回上一页数据
+      onPageChange(pagination.page - 1)
+    }
   }
   catch (error) {
     tableData.value = []
@@ -127,9 +131,14 @@ async function handleQuery() {
     loading.value = false
   }
 }
-function handleSearch() {
+
-  pagination.page = 1
+function handleSearch(keepCurrentPage = false) {
-  handleQuery()
+  if (keepCurrentPage) {
+    handleQuery()
+  }
+  else {
+    onPageChange(1)
+  }
 }
 async function handleReset() {
   const queryItems = { ...props.queryItems }

src/composables/useCrud.js

@@ -100,7 +100,7 @@ export function useCrud({ name, initForm = {}, doCreate, doDelete, doUpdate, ref
           const data = await doDelete(id)
           $message.success('删除成功')
           d.loading = false
-          refresh(data)
+          refresh(data, true)
         }
         catch (error) {
           d.loading = false

src/views/pms/role/index.vue

@@ -120,7 +120,7 @@ const { modalRef, modalFormRef, modalAction, modalForm, handleAdd, handleDelete,
     doDelete: api.delete,
     doUpdate: api.update,
     initForm: { enable: true },
-    refresh: () => $table.value?.handleSearch(),
+    refresh: (_, keepCurrentPage) => $table.value?.handleSearch(keepCurrentPage),
   })
 
 const columns = [