重命名CubeListPager和CubeListToolbarSearch

diff --git a/apps/cube-admin/src/pages/admin/access-rule/index.vue b/apps/cube-admin/src/pages/admin/access-rule/index.vue
index c6020f3..8a27522 100644
--- a/apps/cube-admin/src/pages/admin/access-rule/index.vue
+++ b/apps/cube-admin/src/pages/admin/access-rule/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="access-rule-container">
     <el-card class="box-card">
       <template #header>
@@ -8,7 +8,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadData"
@@ -48,7 +48,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -125,8 +125,8 @@ import { ref, reactive, onMounted } from 'vue';
 import { ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义访问规则类型接口
 interface AccessRule {

diff --git a/apps/cube-admin/src/pages/admin/core/index.vue b/apps/cube-admin/src/pages/admin/core/index.vue
index 26becf6..6152607 100644
--- a/apps/cube-admin/src/pages/admin/core/index.vue
+++ b/apps/cube-admin/src/pages/admin/core/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="core-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-admin/src/pages/admin/cube/index.vue b/apps/cube-admin/src/pages/admin/cube/index.vue
index 106975b..e16f8db 100644
--- a/apps/cube-admin/src/pages/admin/cube/index.vue
+++ b/apps/cube-admin/src/pages/admin/cube/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-admin/src/pages/admin/db/index.vue b/apps/cube-admin/src/pages/admin/db/index.vue
index 0b13cd8..7401987 100644
--- a/apps/cube-admin/src/pages/admin/db/index.vue
+++ b/apps/cube-admin/src/pages/admin/db/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <div class="page-header">
       <h1>数据库管理</h1>

diff --git a/apps/cube-admin/src/pages/admin/department/index.vue b/apps/cube-admin/src/pages/admin/department/index.vue
index abe1001..b488e55 100644
--- a/apps/cube-admin/src/pages/admin/department/index.vue
+++ b/apps/cube-admin/src/pages/admin/department/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="department-container">
     <el-card class="box-card">
       <template #header>
@@ -8,7 +8,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadData"
@@ -153,7 +153,7 @@ import { ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
 import { processListResponse } from '@core/utils/api-helpers';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
 
 // 定义部门类型接口
 interface Department {

diff --git a/apps/cube-admin/src/pages/admin/file/index.vue b/apps/cube-admin/src/pages/admin/file/index.vue
index 2495cbf..5180721 100644
--- a/apps/cube-admin/src/pages/admin/file/index.vue
+++ b/apps/cube-admin/src/pages/admin/file/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <div class="page-header">
       <h1>文件管理</h1>

diff --git a/apps/cube-admin/src/pages/admin/index/index.vue b/apps/cube-admin/src/pages/admin/index/index.vue
index 58c3673..623e3b2 100644
--- a/apps/cube-admin/src/pages/admin/index/index.vue
+++ b/apps/cube-admin/src/pages/admin/index/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <div class="page-header">
       <h1>系统首页</h1>

diff --git a/apps/cube-admin/src/pages/admin/log/index.vue b/apps/cube-admin/src/pages/admin/log/index.vue
index 4bf373b..2e1a53b 100644
--- a/apps/cube-admin/src/pages/admin/log/index.vue
+++ b/apps/cube-admin/src/pages/admin/log/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="log-container">
     <el-card class="box-card">
       <template #header>
@@ -7,7 +7,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadData"
@@ -29,7 +29,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -65,8 +65,8 @@
 import { ref, reactive, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 import { request } from '@core/utils/request';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义日志类型接口
 interface Log {

diff --git a/apps/cube-admin/src/pages/admin/menu/index.vue b/apps/cube-admin/src/pages/admin/menu/index.vue
index 0c29c1e..1ba5c4f 100644
--- a/apps/cube-admin/src/pages/admin/menu/index.vue
+++ b/apps/cube-admin/src/pages/admin/menu/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="menu-container">
     <el-card class="box-card">
       <template #header>
@@ -26,7 +26,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadData"
@@ -170,7 +170,7 @@ import { ref, reactive, onMounted } from 'vue';
 import { ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
 
 // 定义菜单类型接口
 interface Menu {

diff --git a/apps/cube-admin/src/pages/admin/oauth-config/index.vue b/apps/cube-admin/src/pages/admin/oauth-config/index.vue
index 1e7f324..bde27ab 100644
--- a/apps/cube-admin/src/pages/admin/oauth-config/index.vue
+++ b/apps/cube-admin/src/pages/admin/oauth-config/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="oauth-config-container">
     <el-card class="box-card">
       <template #header>
@@ -8,7 +8,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadData"
@@ -57,7 +57,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -174,8 +174,8 @@ import { ref, reactive, onMounted } from 'vue';
 import { ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义OAuth配置类型接口
 interface OAuthConfig {

diff --git a/apps/cube-admin/src/pages/admin/oauth-log/index.vue b/apps/cube-admin/src/pages/admin/oauth-log/index.vue
index dc83557..85f9198 100644
--- a/apps/cube-admin/src/pages/admin/oauth-log/index.vue
+++ b/apps/cube-admin/src/pages/admin/oauth-log/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <div class="page-header">
       <h1>OAuth日志管理</h1>
@@ -12,7 +12,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="getOAuthLogList"
@@ -58,7 +58,7 @@
         </el-table>
       </div>
 
-      <CubePagination
+      <CubeListPager
         :total="pagination.total"
         :current-page="pagination.page"
         :page-size="pagination.size"
@@ -112,8 +112,8 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue'
 import { request } from '@core/utils/request'
-import CubePagination from '@core/components/CubePagination.vue'
-import CubeSearchForm from '@core/components/CubeSearchForm.vue'
+import CubeListPager from '@core/components/CubeListPager.vue'
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue'
 
 // OAuth日志接口
 interface OAuthLog {

diff --git a/apps/cube-admin/src/pages/admin/parameter/index.vue b/apps/cube-admin/src/pages/admin/parameter/index.vue
index e99e867..c8b9836 100644
--- a/apps/cube-admin/src/pages/admin/parameter/index.vue
+++ b/apps/cube-admin/src/pages/admin/parameter/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="parameter-container">
     <el-card class="box-card">
       <template #header>
@@ -8,7 +8,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadData"
@@ -48,7 +48,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -100,8 +100,8 @@ import { ref, reactive, onMounted } from 'vue';
 import { ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义参数类型接口
 interface Parameter {

diff --git a/apps/cube-admin/src/pages/admin/role/index.vue b/apps/cube-admin/src/pages/admin/role/index.vue
index 4a8265f..0aee1ee 100644
--- a/apps/cube-admin/src/pages/admin/role/index.vue
+++ b/apps/cube-admin/src/pages/admin/role/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="role-container">
     <el-card class="box-card">
       <template #header>
@@ -8,7 +8,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadData"
@@ -47,7 +47,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -96,8 +96,8 @@ import { ref, reactive, onMounted } from 'vue';
 import { ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义角色类型接口
 interface Role {

diff --git a/apps/cube-admin/src/pages/admin/sys/index.vue b/apps/cube-admin/src/pages/admin/sys/index.vue
index 08454f8..5548ce9 100644
--- a/apps/cube-admin/src/pages/admin/sys/index.vue
+++ b/apps/cube-admin/src/pages/admin/sys/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="sys-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-admin/src/pages/admin/tenant-user/index.vue b/apps/cube-admin/src/pages/admin/tenant-user/index.vue
index da31602..807d8fa 100644
--- a/apps/cube-admin/src/pages/admin/tenant-user/index.vue
+++ b/apps/cube-admin/src/pages/admin/tenant-user/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <div class="page-header">
       <h1>租户用户管理</h1>
@@ -22,7 +22,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="getTenantUserList"
@@ -78,7 +78,7 @@
         </el-table>
       </div>
 
-      <CubePagination
+      <CubeListPager
         :total="pagination.total"
         :current-page="pagination.page"
         :page-size="pagination.size"
@@ -179,8 +179,8 @@ import { ref, reactive, onMounted } from 'vue'
 import { ElMessageBox } from 'element-plus'
 import { Plus, Refresh } from '@element-plus/icons-vue'
 import { request } from '@core/utils/request'
-import CubeSearchForm from '@core/components/CubeSearchForm.vue'
-import CubePagination from '@core/components/CubePagination.vue'
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue'
+import CubeListPager from '@core/components/CubeListPager.vue'
 
 // 租户用户接口
 interface TenantUser {

diff --git a/apps/cube-admin/src/pages/admin/tenant/index.vue b/apps/cube-admin/src/pages/admin/tenant/index.vue
index e73220b..190f847 100644
--- a/apps/cube-admin/src/pages/admin/tenant/index.vue
+++ b/apps/cube-admin/src/pages/admin/tenant/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="tenant-container">
     <el-card class="box-card">
       <template #header>
@@ -8,7 +8,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadData"
@@ -47,7 +47,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -95,8 +95,8 @@ import { ref, reactive, onMounted } from 'vue';
 import { ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义租户类型接口
 interface Tenant {

diff --git a/apps/cube-admin/src/pages/admin/user-connect/index.vue b/apps/cube-admin/src/pages/admin/user-connect/index.vue
index 9afb649..e356cba 100644
--- a/apps/cube-admin/src/pages/admin/user-connect/index.vue
+++ b/apps/cube-admin/src/pages/admin/user-connect/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="user-connect-container">
     <el-card class="box-card">
       <template #header>
@@ -7,7 +7,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadData"
@@ -47,7 +47,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -63,8 +63,8 @@
 import { ref, reactive, onMounted } from 'vue';
 import { ElMessageBox } from 'element-plus';
 import { request } from '@core/utils/request';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义用户连接类型接口
 interface UserConnect {

diff --git a/apps/cube-admin/src/pages/admin/user-online/index.vue b/apps/cube-admin/src/pages/admin/user-online/index.vue
index d8ce4c1..933faf2 100644
--- a/apps/cube-admin/src/pages/admin/user-online/index.vue
+++ b/apps/cube-admin/src/pages/admin/user-online/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="user-online-container">
     <el-card class="box-card">
       <template #header>
@@ -7,7 +7,7 @@
         </div>
       </template>
 
-      <CubeSearchForm :on-search="SearchData" :on-reset="ResetData" :on-callback="loadUserOnlineData" />
+      <CubeListToolbarSearch :on-search="SearchData" :on-reset="ResetData" :on-callback="loadUserOnlineData" />
 
       <el-table :data="tableData" style="width: 100%" v-loading="loading" border>
           <el-table-column type="selection" width="55" />
@@ -47,7 +47,7 @@
           </el-table-column>
         </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -87,8 +87,8 @@
 import { ref, reactive, onMounted } from 'vue'
 import { request } from '@core/utils/request'
 import { processListResponse, handleDeleteOperation } from '@core/utils/api-helpers'
-import CubeSearchForm from '@core/components/CubeSearchForm.vue'
-import CubePagination from '@core/components/CubePagination.vue'
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue'
+import CubeListPager from '@core/components/CubeListPager.vue'
 
 // 在线用户接口
 interface UserOnline {

diff --git a/apps/cube-admin/src/pages/admin/user-stat/index.vue b/apps/cube-admin/src/pages/admin/user-stat/index.vue
index 24779fe..f6b40ef 100644
--- a/apps/cube-admin/src/pages/admin/user-stat/index.vue
+++ b/apps/cube-admin/src/pages/admin/user-stat/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <div class="page-header">
       <h1>用户统计</h1>
@@ -12,7 +12,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadUserStatData"
@@ -58,7 +58,7 @@
       </div>
 
       <!-- 分页 -->
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -102,8 +102,8 @@
 import { ref, reactive, onMounted } from 'vue'
 import { request } from '@core/utils/request'
 import { processListResponse } from '@core/utils/api-helpers'
-import CubeSearchForm from '@core/components/CubeSearchForm.vue'
-import CubePagination from '@core/components/CubePagination.vue'
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue'
+import CubeListPager from '@core/components/CubeListPager.vue'
 
 // 用户统计接口
 interface UserStat {

diff --git a/apps/cube-admin/src/pages/admin/user-token/index.vue b/apps/cube-admin/src/pages/admin/user-token/index.vue
index 76ab276..893cd4f 100644
--- a/apps/cube-admin/src/pages/admin/user-token/index.vue
+++ b/apps/cube-admin/src/pages/admin/user-token/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <div class="page-header">
       <h1>用户令牌管理</h1>
@@ -16,7 +16,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="loadUserTokenData"
@@ -75,7 +75,7 @@
       </div>
 
       <!-- 分页 -->
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -199,8 +199,8 @@ import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import { request } from '@core/utils/request';
 import { processListResponse, handleDeleteOperation, handleFormSubmit } from '@core/utils/api-helpers';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义用户令牌类型接口
 interface UserToken {

diff --git a/apps/cube-admin/src/pages/admin/user/index.vue b/apps/cube-admin/src/pages/admin/user/index.vue
index 06ff28f..8c6d28e 100644
--- a/apps/cube-admin/src/pages/admin/user/index.vue
+++ b/apps/cube-admin/src/pages/admin/user/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="user-container">
     <el-card class="box-card">
       <template #header>
@@ -8,9 +8,12 @@
         </div>
       </template>
 
-      <!-- <CubeSearchForm :on-search="SearchData" :on-reset="ResetData" :on-callback="loadUserData" /> -->
-      <!-- <CubePagination :total="total" :current-page="currentPage" :page-size="pageSize"
-        :on-current-change="CurrentPageChange" :on-size-change="PageSizeChange" :on-callback="loadUserData" /> -->
+      <CubeListToolbarSearch :on-search="SearchData" :on-reset="ResetData" :on-callback="callback" />
+
+      <CubeListPager :total="total" :current-page="queryParams.pageIndex" :page-size="queryParams.pageSize"
+        :on-current-change="CurrentPageChange" :on-size-change="PageSizeChange" :on-callback="callback" />
+
+
       <el-table :data="tableData" style="width: 100%" v-loading="loading" border>
         <el-table-column prop="id" label="ID" width="80" />
         <el-table-column prop="name" label="用户名" />
@@ -31,7 +34,7 @@
             <el-avatar :src="getAvatarUrl(scope.row.avatar)" :size="40" v-if="scope.row.avatar">
               <img :src="getAvatarUrl(scope.row.avatar)" />
             </el-avatar>
-            <el-avatar :size="40" v-else>{{ scope.row.displayName?.charAt(0) }}</el-avatar>
+            <el-avatar :size="40" v-else>{{ scope.row.displayName?.charAt(0) || scope.row.name?.charAt(0) }}</el-avatar>
           </template>
         </el-table-column>
         <el-table-column prop="roleName" label="角色" />
@@ -53,9 +56,8 @@
           </template>
         </el-table-column>
       </el-table>
-
-      <CubeSearch :fn-search="callback" />
-      <CubePager :total="total" :fn-pager="callback" />
+      <!-- <CubeSearch :fn-search="callback" />
+      <CubePager :total="total" :fn-pager="callback" /> -->
 
     </el-card>
 
@@ -114,10 +116,10 @@ import { ref, reactive, onMounted } from 'vue';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
 import { processListResponse, handleDeleteOperation, handleFormSubmit } from '@core/utils/api-helpers';
-// import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-// import CubePagination from '@core/components/CubePagination.vue';
-import CubeSearch from "@core/components/CubeSearch.vue";
-import CubePager from "@core/components/CubePager.vue";
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
+// import CubeSearch from "@core/components/CubeSearch.vue";
+// import CubePager from "@core/components/CubePager.vue";
 
 // 定义用户类型接口
 interface User {
@@ -165,11 +167,6 @@ const initialUserForm: User = {
 const tableData = ref<User[]>([]);
 const loading = ref(false);
 const total = ref(0);
-// const currentPage = ref(1);
-// const pageSize = ref(10);
-
-// // 查询表单数据 - 用于存储搜索条件
-// const searchForm = reactive({ p: '' });
 
 // 用户表单相关
 const dialogVisible = ref(false);
@@ -187,16 +184,17 @@ const queryParams = reactive({
   pageIndex: 1,
   pageSize: 10,
 });
-//查询数据
-const callback = (e: Record<string, unknown>) => {
-  console.log(e.type, e.params);
-  const query = Object.assign(queryParams, e.params || {});
+
+// 组件回调函数
+const callback = (e?: Record<string, unknown>) => {
+  console.log(e?.type, e?.params);
+  const query = Object.assign(queryParams, e?.params || {});
   console.log('queryParams:', query);
   queryUser();
 };
 //查询请求
 const queryUser = async () => {
-   loading.value = true;
+  loading.value = true;
   try {
     const data = await request.get('/Admin/User', { params: queryParams });
     const { list, total: totalCount } = processListResponse<User>(data);
@@ -261,46 +259,14 @@ const userFormRules = reactive<FormRules>({
 const getAvatarUrl = (avatar: string): string => {
   if (!avatar) return '';
   // 如果头像路径以"/"开头，拼接当前域名
-  // if (avatar.startsWith('/')) {
-  //   return `${window.location.origin}${avatar}`;
-  // }
+  // if (avatar.startsWith('/')) { return `${window.location.origin}${avatar}`; }
   return avatar;// 如果是完整的URL（http或https开头），直接返回
 };
 
-// // 加载用户数据
-// const loadUserData = async (searchData?: { p: string }) => {
-//   loading.value = true;
-//   try {
-//     // 如果传入了搜索数据，则更新本地搜索条件
-//     if (searchData !== undefined) {
-//       searchForm.p = searchData.p;
-//     }
-
-//     const data = await request.get('/Admin/User', {
-//       params: {
-//         q: searchForm.p,
-//         pageIndex: currentPage.value,
-//         pageSize: pageSize.value,
-//       }
-//     });
-
-//     const { list, total: totalCount } = processListResponse<User>(data);
-//     tableData.value = list;
-//     total.value = totalCount;
-//   } catch {
-//     tableData.value = [];
-//     total.value = 0;
-//   } finally {
-//     loading.value = false;
-//   }
-// };
-
 // 加载角色数据
 const loadRoleOptions = async (forceRefresh = false) => {
   // 如果不是强制刷新且已经加载过角色数据，直接返回
-  if (!forceRefresh && roleOptionsLoaded.value) {
-    return;
-  }
+  if (!forceRefresh && roleOptionsLoaded.value) { return; }
 
   try {
     const data = await request.get('/Admin/Role');
@@ -317,35 +283,36 @@ const loadRoleOptions = async (forceRefresh = false) => {
   }
 };
 
-// // 页码变更处理
-// const CurrentPageChange = (page: number) => {
-//   currentPage.value = page;
-// };
-
-// // 每页显示条数变更处理
-// const PageSizeChange = (size: number) => {
-//   pageSize.value = size;
-//   currentPage.value = 1;
-// };
-
-// // 搜索数据处理
-// const SearchData = () => {
-//   currentPage.value = 1;
-//   // searchForm.p = searchForm.p.trim();
-// };
-
-// // 重置数据处理
-// const ResetData = () => {
-//   currentPage.value = 1;
-//   // searchForm.p = '';
-// };
+// 页码变更处理
+const CurrentPageChange = (page: number) => {
+  queryParams.pageIndex = page;
+};
+
+// 每页显示条数变更处理
+const PageSizeChange = (size: number) => {
+  queryParams.pageSize = size;
+  queryParams.pageIndex = 1;
+};
+
+// 搜索数据处理
+const SearchData = (e?: Record<string, unknown>) => {
+  Object.assign(queryParams, e || {});
+  queryParams.pageIndex = 1;
+  console.log('SearchData:', queryParams);
+};
+
+// 重置数据处理
+const ResetData = (e?: Record<string, unknown>) => {
+  Object.assign(queryParams, e || {});
+  queryParams.pageIndex = 1;
+  console.log('ResetData:', queryParams);
+};
 
 // 新增用户
 const handleAdd = () => {
   formType.value = 'add';
   Object.assign(userForm, { ...initialUserForm });
   dialogVisible.value = true;
-  // 不需要再次加载角色数据，因为已经在页面初始化时加载了
 };
 
 // 编辑用户
@@ -365,15 +332,14 @@ const handleEdit = (row: User) => {
     remark: row.remark
   });
   dialogVisible.value = true;
-  // 不需要再次加载角色数据，因为已经在页面初始化时加载了
 };
 
 // 删除用户
 const handleDelete = (row: User) => {
   handleDeleteOperation(
     () => request.delete('/Admin/User', { params: { id: row.id } }),
-    queryUser, //  loadUserData,
-    '确认删除该用户吗？'
+    queryUser,   //() => null,
+    '确认删除[' + (row.displayName || row.name) + ']用户吗？'
   );
 };
 
@@ -403,9 +369,7 @@ const submitForm = async () => {
 
   const onSuccess = () => {
     dialogVisible.value = false;
-    //loadUserData();
-    // queryUser();
-    callback(queryParams);
+    queryUser();
   };
 
   await handleFormSubmit(userFormRef.value, apiCall, onSuccess);
@@ -413,8 +377,7 @@ const submitForm = async () => {
 
 // 初始化加载数据
 onMounted(() => {
-  callback(queryParams);
-  // loadUserData();
+  queryUser();
   loadRoleOptions(true); // 页面加载时强制刷新角色数据
 });
 </script>
@@ -430,3 +393,14 @@ onMounted(() => {
   align-items: center;
 }
 </style>
+() => {
+dialogVisible.value = false;
+queryUser();
+};
+
+await handleFormSubmit(userFormRef.value, apiCall, onSuccess);
+};
+
+// 初始化加载数�?onMounted(() => {
+queryUser();
+loadRoleOptions(true); // 页面加载时强制刷新角色数�?});

diff --git a/apps/cube-admin/src/pages/admin/xcode/index.vue b/apps/cube-admin/src/pages/admin/xcode/index.vue
index 6fde57e..fa32dcf 100644
--- a/apps/cube-admin/src/pages/admin/xcode/index.vue
+++ b/apps/cube-admin/src/pages/admin/xcode/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="xcode-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-cube/src/pages/cube/app-log/index.vue b/apps/cube-cube/src/pages/cube/app-log/index.vue
index f6bee3a..16f29db 100644
--- a/apps/cube-cube/src/pages/cube/app-log/index.vue
+++ b/apps/cube-cube/src/pages/cube/app-log/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="app-log-container">
     <el-card class="box-card">
       <template #header>
@@ -7,7 +7,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
       />
@@ -32,7 +32,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -48,8 +48,8 @@ import { ref, reactive, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 import { request } from '@core/utils/request';
 import { processListResponse } from '@core/utils/api-helpers';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义日志类型接口
 interface AppLog {

diff --git a/apps/cube-cube/src/pages/cube/app/index.vue b/apps/cube-cube/src/pages/cube/app/index.vue
index 6a889ea..7262664 100644
--- a/apps/cube-cube/src/pages/cube/app/index.vue
+++ b/apps/cube-cube/src/pages/cube/app/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="app-container">
     <el-card class="box-card">
       <template #header>
@@ -8,7 +8,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
       />
@@ -51,7 +51,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -115,8 +115,8 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
 import { processListResponse } from '@core/utils/api-helpers';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义应用类型接口
 interface App {

diff --git a/apps/cube-cube/src/pages/cube/area/index.vue b/apps/cube-cube/src/pages/cube/area/index.vue
index bcf174b..e5821af 100644
--- a/apps/cube-cube/src/pages/cube/area/index.vue
+++ b/apps/cube-cube/src/pages/cube/area/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="area-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-cube/src/pages/cube/attachment/index.vue b/apps/cube-cube/src/pages/cube/attachment/index.vue
index a205549..417cf9d 100644
--- a/apps/cube-cube/src/pages/cube/attachment/index.vue
+++ b/apps/cube-cube/src/pages/cube/attachment/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="attachment-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-cube/src/pages/cube/cron-job/index.vue b/apps/cube-cube/src/pages/cube/cron-job/index.vue
index 03a84ea..8ba62ec 100644
--- a/apps/cube-cube/src/pages/cube/cron-job/index.vue
+++ b/apps/cube-cube/src/pages/cube/cron-job/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cron-job-container">
     <el-card class="box-card">
       <template #header>
@@ -8,7 +8,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="fetchData"
@@ -46,7 +46,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -133,8 +133,8 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
 import { processListResponse } from '@core/utils/api-helpers';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义任务类型接口
 interface CronJob {

diff --git a/apps/cube-cube/src/pages/cube/debug/index.vue b/apps/cube-cube/src/pages/cube/debug/index.vue
index 20a939c..173a088 100644
--- a/apps/cube-cube/src/pages/cube/debug/index.vue
+++ b/apps/cube-cube/src/pages/cube/debug/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="debug-page">
     <h1>微应用调试页面</h1>
 

diff --git a/apps/cube-cube/src/pages/cube/order-manager/index.vue b/apps/cube-cube/src/pages/cube/order-manager/index.vue
index 9ddc9ac..da370bf 100644
--- a/apps/cube-cube/src/pages/cube/order-manager/index.vue
+++ b/apps/cube-cube/src/pages/cube/order-manager/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="order-manager-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-cube/src/pages/cube/principal-agent/index.vue b/apps/cube-cube/src/pages/cube/principal-agent/index.vue
index d9fba6d..2a12311 100644
--- a/apps/cube-cube/src/pages/cube/principal-agent/index.vue
+++ b/apps/cube-cube/src/pages/cube/principal-agent/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="principal-agent-container">
     <el-card class="box-card">
       <template #header>
@@ -8,7 +8,7 @@
         </div>
       </template>
 
-      <CubeSearchForm
+      <CubeListToolbarSearch
         :on-search="SearchData"
         :on-reset="ResetData"
         :on-callback="fetchData"
@@ -41,7 +41,7 @@
         </el-table-column>
       </el-table>
 
-      <CubePagination
+      <CubeListPager
         :total="total"
         :current-page="currentPage"
         :page-size="pageSize"
@@ -107,8 +107,8 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { request } from '@core/utils/request';
 import { processListResponse } from '@core/utils/api-helpers';
-import CubeSearchForm from '@core/components/CubeSearchForm.vue';
-import CubePagination from '@core/components/CubePagination.vue';
+import CubeListToolbarSearch from '@core/components/CubeListToolbarSearch.vue';
+import CubeListPager from '@core/components/CubeListPager.vue';
 
 // 定义主体代理类型接口
 interface PrincipalAgent {

diff --git a/apps/cube-cube/src/pages/cube/test/index.vue b/apps/cube-cube/src/pages/cube/test/index.vue
index 424d3ba..96ed16d 100644
--- a/apps/cube-cube/src/pages/cube/test/index.vue
+++ b/apps/cube-cube/src/pages/cube/test/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="test-page">
     <h1>Cube-Cube 测试页面</h1>
     <p>如果你能看到这个页面，说明路由配置正确</p>

diff --git a/apps/cube-v1/src/pages/cube/apis/index.vue b/apps/cube-v1/src/pages/cube/apis/index.vue
index 39090b5..abaaeaa 100644
--- a/apps/cube-v1/src/pages/cube/apis/index.vue
+++ b/apps/cube-v1/src/pages/cube/apis/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-apis-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/area-all-parents/index.vue b/apps/cube-v1/src/pages/cube/area-all-parents/index.vue
index 60e8a88..74f84a7 100644
--- a/apps/cube-v1/src/pages/cube/area-all-parents/index.vue
+++ b/apps/cube-v1/src/pages/cube/area-all-parents/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-area-all-parents-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/area-childs/index.vue b/apps/cube-v1/src/pages/cube/area-childs/index.vue
index 7a1719a..83ea283 100644
--- a/apps/cube-v1/src/pages/cube/area-childs/index.vue
+++ b/apps/cube-v1/src/pages/cube/area-childs/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-area-childs-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/area-parents/index.vue b/apps/cube-v1/src/pages/cube/area-parents/index.vue
index 9183e3a..c08b462 100644
--- a/apps/cube-v1/src/pages/cube/area-parents/index.vue
+++ b/apps/cube-v1/src/pages/cube/area-parents/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-area-parents-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/avatar/index.vue b/apps/cube-v1/src/pages/cube/avatar/index.vue
index 52a0871..e530ba0 100644
--- a/apps/cube-v1/src/pages/cube/avatar/index.vue
+++ b/apps/cube-v1/src/pages/cube/avatar/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-avatar-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/department-search/index.vue b/apps/cube-v1/src/pages/cube/department-search/index.vue
index 8f2de4f..1763f0d 100644
--- a/apps/cube-v1/src/pages/cube/department-search/index.vue
+++ b/apps/cube-v1/src/pages/cube/department-search/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-department-search-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/file/index.vue b/apps/cube-v1/src/pages/cube/file/index.vue
index 8d89094..85ecc44 100644
--- a/apps/cube-v1/src/pages/cube/file/index.vue
+++ b/apps/cube-v1/src/pages/cube/file/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-file-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/get-area/index.vue b/apps/cube-v1/src/pages/cube/get-area/index.vue
index 4862a2d..79ea23d 100644
--- a/apps/cube-v1/src/pages/cube/get-area/index.vue
+++ b/apps/cube-v1/src/pages/cube/get-area/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-get-area-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/get-page-config/index.vue b/apps/cube-v1/src/pages/cube/get-page-config/index.vue
index 7ae0536..f6c292a 100644
--- a/apps/cube-v1/src/pages/cube/get-page-config/index.vue
+++ b/apps/cube-v1/src/pages/cube/get-page-config/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="get-page-config-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/info/index.vue b/apps/cube-v1/src/pages/cube/info/index.vue
index bbebc89..5d0bfac 100644
--- a/apps/cube-v1/src/pages/cube/info/index.vue
+++ b/apps/cube-v1/src/pages/cube/info/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-info-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/lookup/index.vue b/apps/cube-v1/src/pages/cube/lookup/index.vue
index d797ca9..a6cc55f 100644
--- a/apps/cube-v1/src/pages/cube/lookup/index.vue
+++ b/apps/cube-v1/src/pages/cube/lookup/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-lookup-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/save-layout/index.vue b/apps/cube-v1/src/pages/cube/save-layout/index.vue
index e175a01..b13014a 100644
--- a/apps/cube-v1/src/pages/cube/save-layout/index.vue
+++ b/apps/cube-v1/src/pages/cube/save-layout/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="save-layout-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/set-page-config/index.vue b/apps/cube-v1/src/pages/cube/set-page-config/index.vue
index 63fb94c..49fac11 100644
--- a/apps/cube-v1/src/pages/cube/set-page-config/index.vue
+++ b/apps/cube-v1/src/pages/cube/set-page-config/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="set-page-config-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/cube/user-search/index.vue b/apps/cube-v1/src/pages/cube/user-search/index.vue
index 97e2db1..18d44b1 100644
--- a/apps/cube-v1/src/pages/cube/user-search/index.vue
+++ b/apps/cube-v1/src/pages/cube/user-search/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cube-user-search-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/home/index.vue b/apps/cube-v1/src/pages/home/index.vue
index 6456098..76b97c2 100644
--- a/apps/cube-v1/src/pages/home/index.vue
+++ b/apps/cube-v1/src/pages/home/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="home-container">
     <el-card class="welcome-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/sso/access-token/index.vue b/apps/cube-v1/src/pages/sso/access-token/index.vue
index c3f7709..dc81972 100644
--- a/apps/cube-v1/src/pages/sso/access-token/index.vue
+++ b/apps/cube-v1/src/pages/sso/access-token/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="sso-access-token-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/sso/login/index.vue b/apps/cube-v1/src/pages/sso/login/index.vue
index 69faa8a..56d6601 100644
--- a/apps/cube-v1/src/pages/sso/login/index.vue
+++ b/apps/cube-v1/src/pages/sso/login/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="sso-login-container">
     <el-card class="box-card">
       <template #header>

diff --git a/apps/cube-v1/src/pages/sso/token/index.vue b/apps/cube-v1/src/pages/sso/token/index.vue
index 882631f..9333b92 100644
--- a/apps/cube-v1/src/pages/sso/token/index.vue
+++ b/apps/cube-v1/src/pages/sso/token/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="sso-token-container">
     <el-card class="box-card">
       <template #header>

diff --git a/core/App.vue b/core/App.vue
index 8871fe7..f4c7605 100644
--- a/core/App.vue
+++ b/core/App.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 import { ElConfigProvider } from 'element-plus';
 import { RouterView } from 'vue-router';
 import RootLayout from './layouts/RootLayout.vue';

diff --git a/core/components/CbTable.vue b/core/components/CbTable.vue
index 5f29fdd..ae3852f 100644
--- a/core/components/CbTable.vue
+++ b/core/components/CbTable.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="cb-table">
     <el-table
       :data="data"

diff --git a/core/components/CubePagination.vue b/core/components/CubeListPager.vue
similarity index 93%
rename from core/components/CubePagination.vue
rename to core/components/CubeListPager.vue
index ef774ea..a263efc 100644
--- a/core/components/CubePagination.vue
+++ b/core/components/CubeListPager.vue
@@ -1,5 +1,5 @@
-<template>
-  <div class="cube-pagination">
+<template>
+  <div class="cube-list-pager">
     <el-pagination
       v-model:current-page="currentPage"
       v-model:page-size="pageSize"
@@ -17,7 +17,7 @@ import { ref, watch } from 'vue';
 
 // 定义组件名称
 defineOptions({
-  name: 'CubePagination'
+  name: 'CubeListPager'
 });
 
 // 定义组件 props
@@ -35,7 +35,7 @@ interface Props {
 const props = withDefaults(defineProps<Props>(), {
   currentPage: 1,
   pageSize: 10,
-  pageSizes: () => [10, 20, 50, 100],
+  pageSizes: () => [5, 10, 20, 30, 50, 100, 500, 1000],
   layout: 'total, sizes, prev, pager, next, jumper',
   onCurrentChange: () => {},
   onSizeChange: () => {},
@@ -80,7 +80,7 @@ const handleSizeChange = (size: number) => {
 </script>
 
 <style scoped>
-.cube-pagination {
+.cube-list-pager {
   margin-top: 20px;
   display: flex;
   justify-content: flex-end;

diff --git a/core/components/CubeSearchForm.vue b/core/components/CubeListToolbarSearch.vue
similarity index 80%
rename from core/components/CubeSearchForm.vue
rename to core/components/CubeListToolbarSearch.vue
index 6042483..d6a2502 100644
--- a/core/components/CubeSearchForm.vue
+++ b/core/components/CubeListToolbarSearch.vue
@@ -1,7 +1,7 @@
-<template>
+<template>
   <el-form :inline="true" :model="searchForm" class="cube-search-form cube-search-form-right">
     <el-form-item label="关键词">
-      <el-input v-model="searchForm.p" placeholder="关键词搜索" clearable />
+      <el-input v-model="searchForm.q" placeholder="关键词搜索" clearable />
     </el-form-item>
     <el-form-item>
       <el-button type="primary" @click="handleSearch">查询</el-button>
@@ -15,19 +15,19 @@ import { reactive } from 'vue';
 
 // 定义组件名称
 defineOptions({
-  name: 'CubeSearchForm'
+  name: 'CubeListToolbarSearch'
 });
 
 // 定义搜索表单类型
-interface SearchFormData {
-  p: string;
-}
+// interface SearchFormData {
+//   p: string;
+// }
 
 // 定义组件 props
 interface Props {
-  onSearch?: (searchData: SearchFormData) => void;
-  onReset?: (searchData: SearchFormData) => void;
-  onCallback?: (searchData: SearchFormData) => void;
+  onSearch?: (searchData: Record<string, unknown>) => void;
+  onReset?: (searchData:  Record<string, unknown>) => void;
+  onCallback?: (searchData: Record<string, unknown>) => void;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -36,9 +36,9 @@ const props = withDefaults(defineProps<Props>(), {
   onCallback: () => {}
 });
 
-// 查询表单数据
-const searchForm = reactive<SearchFormData>({
-  p: ''
+// // 查询表单数据
+const searchForm = reactive({
+  q: ''
 });
 
 // 搜索处理
@@ -53,7 +53,7 @@ const handleSearch = () => {
 
 // 重置处理
 const handleReset = () => {
-  searchForm.p = '';
+  searchForm.q = '';
   if (props.onReset) {
     props.onReset(searchForm);
   }

diff --git a/core/components/CubePager.vue b/core/components/CubePager.vue
index b184e5b..02e6e54 100644
--- a/core/components/CubePager.vue
+++ b/core/components/CubePager.vue
@@ -1,14 +1,8 @@
-<template>
+<template>
   <div class="cube-pager">
-    <el-pagination
-      v-model:current-page="$data.currentPage"
-      v-model:page-size="$data.pageSize"
-      :page-sizes="$data.pageSizes"
-      :total="$props.total"
-      :layout="$props.layout"
-      @size-change="onSizeChange"
-      @current-change="onCurrentChange"
-    />
+    <el-pagination v-model:current-page="$data.currentPage" v-model:page-size="$data.pageSize"
+      :page-sizes="$data.pageSizes" :total="$props.total" :layout="$props.layout" @size-change="onSizeChange"
+      @current-change="onCurrentChange" />
   </div>
 </template>
 
@@ -36,7 +30,7 @@ const $props = defineProps({
   },
   pageSizes: {
     type: Array<number>,
-    default: () => [10, 20, 50, 100],
+    default: () => [5, 10, 20, 30, 50, 100, 500, 1000],
   },
   layout: {
     type: String,

diff --git a/core/components/CubeSearch.vue b/core/components/CubeSearch.vue
index 3ebd31a..3fa8bce 100644
--- a/core/components/CubeSearch.vue
+++ b/core/components/CubeSearch.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <el-form :inline="true"  class="cube-search-form cube-search-form-right">
     <el-form-item label="关键词">
       <el-input v-model="$data.searchText" placeholder="关键词搜索" clearable />

diff --git a/core/components/LanguageSwitch.vue b/core/components/LanguageSwitch.vue
index 06e5986..fd8ea84 100644
--- a/core/components/LanguageSwitch.vue
+++ b/core/components/LanguageSwitch.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="language-switch">
     <el-dropdown @command="handleCommand">
       <span class="el-dropdown-link">

diff --git a/core/components/TextOverflow.vue b/core/components/TextOverflow.vue
index 3e46955..487878f 100644
--- a/core/components/TextOverflow.vue
+++ b/core/components/TextOverflow.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 import { ref, onMounted, nextTick } from 'vue';
 import { ElTooltip } from 'element-plus';
 

diff --git a/core/layouts/MainLayout/Breadcrumb/index.vue b/core/layouts/MainLayout/Breadcrumb/index.vue
index c1c7113..7f00025 100644
--- a/core/layouts/MainLayout/Breadcrumb/index.vue
+++ b/core/layouts/MainLayout/Breadcrumb/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 // 面包屑组件暂时为空
 </script>
 

diff --git a/core/layouts/MainLayout/Content/index.vue b/core/layouts/MainLayout/Content/index.vue
index 3bcf804..cc53fe4 100644
--- a/core/layouts/MainLayout/Content/index.vue
+++ b/core/layouts/MainLayout/Content/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 // 无需特殊逻辑
 </script>
 

diff --git a/core/layouts/MainLayout/index.vue b/core/layouts/MainLayout/index.vue
index fcd91aa..e18a366 100644
--- a/core/layouts/MainLayout/index.vue
+++ b/core/layouts/MainLayout/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 import { ref } from 'vue';
 import Navbar from './Navbar/index.vue';
 import Content from './Content/index.vue';

diff --git a/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenu.vue b/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenu.vue
index efcac7d..0be2f4e 100644
--- a/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenu.vue
+++ b/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenu.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="menu-cascader-second">
     <div :class="['menu-cascader-second-title']" :style="{ width }">
       {{ renderMenuTitle(menu) }}

diff --git a/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenuItem.vue b/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenuItem.vue
index 1e47fae..0aa77c2 100644
--- a/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenuItem.vue
+++ b/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenuItem.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div
     :class="[
       'menu-cascader-second-item',

diff --git a/core/layouts/MainLayout/Navbar/CascaderMenu/index.vue b/core/layouts/MainLayout/Navbar/CascaderMenu/index.vue
index c93d5d4..a81b3fa 100644
--- a/core/layouts/MainLayout/Navbar/CascaderMenu/index.vue
+++ b/core/layouts/MainLayout/Navbar/CascaderMenu/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 import { computed } from 'vue';
 import { type TreeMenuItem } from '@core/stores/menu';
 import SecondCascaderMenu from './components/SecondCascaderMenu.vue';

diff --git a/core/layouts/MainLayout/Navbar/index.vue b/core/layouts/MainLayout/Navbar/index.vue
index 990f051..786f2c4 100644
--- a/core/layouts/MainLayout/Navbar/index.vue
+++ b/core/layouts/MainLayout/Navbar/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 import { storeToRefs } from 'pinia';
 import Menu from './Menu/index.vue';
 import { type UserInfo } from '@core/stores/user';

diff --git a/core/layouts/MainLayout/Navbar/Menu/index.vue b/core/layouts/MainLayout/Navbar/Menu/index.vue
index 2ed5f31..c9f7a8b 100644
--- a/core/layouts/MainLayout/Navbar/Menu/index.vue
+++ b/core/layouts/MainLayout/Navbar/Menu/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="tsx">
+<script setup lang="tsx">
 import { computed, ref, onMounted, nextTick, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { type TreeMenuItem, useMenuStore } from '@core/stores/menu';

diff --git a/core/layouts/MainLayout/Sider/index.vue b/core/layouts/MainLayout/Sider/index.vue
index 2012f22..2903c43 100644
--- a/core/layouts/MainLayout/Sider/index.vue
+++ b/core/layouts/MainLayout/Sider/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 import { computed } from 'vue';
 import { openMenuTab } from '@core/utils/menuTab';
 import { useMenuStore, type TreeMenuItem } from '@core/stores/menu';

diff --git a/core/layouts/RootLayout.vue b/core/layouts/RootLayout.vue
index 3f0dc0f..a89674b 100644
--- a/core/layouts/RootLayout.vue
+++ b/core/layouts/RootLayout.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 import { onBeforeMount, onMounted, watch, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 // import NotFound from '../pages/404.vue'

diff --git a/core/pages/Loading.vue b/core/pages/Loading.vue
index 856b49f..7b8d0f6 100644
--- a/core/pages/Loading.vue
+++ b/core/pages/Loading.vue
@@ -1,4 +1,4 @@
-<script lang="tsx">
+<script lang="tsx">
 import { defineComponent } from 'vue'
 
 export default defineComponent({

diff --git a/core/pages/PageHome.vue b/core/pages/PageHome.vue
index 3e870cb..944d820 100644
--- a/core/pages/PageHome.vue
+++ b/core/pages/PageHome.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup></script>
+<script lang="ts" setup></script>
 
 <template>
   <div>主页</div>

diff --git a/core/pages/PageNotFound.vue b/core/pages/PageNotFound.vue
index 38ec467..d7c5b94 100644
--- a/core/pages/PageNotFound.vue
+++ b/core/pages/PageNotFound.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="page-not-found">
     <h1>404</h1>
     <h2>Page Not Found</h2>

diff --git a/core/pages/PageUnauthorized.vue b/core/pages/PageUnauthorized.vue
index 46fc9f8..e3a5393 100644
--- a/core/pages/PageUnauthorized.vue
+++ b/core/pages/PageUnauthorized.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="unauthorized-container">
     <el-row justify="center" align="middle" class="unauthorized-content">
       <el-col :span="24" class="img-col">

diff --git a/core/views/Loading.vue b/core/views/Loading.vue
index 78e41d7..f889861 100644
--- a/core/views/Loading.vue
+++ b/core/views/Loading.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="loading-container">
     <div class="loading-spinner"></div>
     <div class="loading-text">系统加载中，请稍候...</div>