From c842de9e232039fe62ca99d28da6bab6f15c865a Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Mon, 29 Jul 2024 10:25:11 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=20hook=20=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rion-vue-views-components-card-list.vue.vm |  6 ++--
 .../orion-vue-views-components-table.vue.vm   |  6 ++--
 .../impl/DataPermissionServiceImpl.java       |  4 +--
 .../components/host-table.vue                 |  2 +-
 .../components/exec/template/modal/index.vue  |  4 +--
 .../components/meta/history/modal/index.vue   |  4 +--
 orion-visor-ui/src/hooks/card.ts              | 35 +++++++++++++++++++
 orion-visor-ui/src/{types => hooks}/table.ts  |  2 +-
 orion-visor-ui/src/types/card.ts              | 35 +------------------
 .../components/connect-log-table.vue          |  4 +--
 .../sftp-log/components/sftp-log-table.vue    |  4 +--
 .../grant/components/host-identity-grant.vue  |  2 +-
 .../asset/grant/components/host-key-grant.vue |  2 +-
 .../components/host-identity-card-list.vue    |  6 ++--
 .../components/host-identity-table.vue        |  4 +--
 .../components/host-key-card-list.vue         |  6 ++--
 .../host-key/components/host-key-table.vue    |  4 +--
 .../host-list/components/host-card-list.vue   |  6 ++--
 .../asset/host-list/components/host-table.vue |  4 +--
 .../exec-command-host-log-table.vue           |  2 +-
 .../components/exec-command-log-table.vue     |  4 +--
 .../components/exec-template-table.vue        |  4 +--
 .../components/upload-task-table.vue          |  4 +--
 .../terminal/components/sftp/sftp-table.vue   |  2 +-
 .../components/exec-job-host-log-table.vue    |  2 +-
 .../components/exec-job-log-table.vue         |  4 +--
 .../exec-job/components/exec-job-table.vue    |  4 +--
 .../dict-key/components/dict-key-table.vue    |  4 +--
 .../components/dict-value-table.vue           |  4 +--
 .../components/operator-log-simple-table.vue  |  4 +--
 .../components/operator-log-table.vue         |  4 +--
 .../views/user/role/components/role-table.vue |  4 +--
 .../views/user/user/components/user-table.vue |  4 +--
 33 files changed, 96 insertions(+), 94 deletions(-)
 create mode 100644 orion-visor-ui/src/hooks/card.ts
 rename orion-visor-ui/src/{types => hooks}/table.ts (92%)

diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
index c6292a22..9d22e4e6 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
@@ -118,7 +118,7 @@
 
 <script lang="ts" setup>
   import type { ${vue.featureEntity}QueryRequest, ${vue.featureEntity}QueryResponse } from '@/api/${vue.module}/${vue.feature}';
-  import { usePagination, useColLayout } from '@/types/card';
+  import { useCardPagination, useCardColLayout } from '@/hooks/card';
   import { computed, reactive, ref, onMounted } from 'vue';
   import useLoading from '@/hooks/loading';
   import { objectTruthKeyCount, resetObject } from '@/utils';
@@ -136,8 +136,8 @@
 
   const emits = defineEmits(['openAdd', 'openUpdate']);
 
-  const cardColLayout = useColLayout();
-  const pagination = usePagination();
+  const cardColLayout = useCardColLayout();
+  const pagination = useCardPagination();
   const { loading, setLoading } = useLoading();
   #if($dictMap.entrySet().size() > 0)
   const { toOptions, getDictValue } = useDictStore();
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
index 145d5db4..13aca6fa 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
@@ -151,9 +151,9 @@
   import {} from '../types/const';
   #end
   #if($vue.enableRowSelection)
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   #else
-  import { usePagination } from '@/types/table';
+  import { useTablePagination } from '@/hooks/table';
   #end
   #if($dictMap.entrySet().size() > 0)
   import { useDictStore } from '@/store';
@@ -161,7 +161,7 @@
 
   const emits = defineEmits(['openAdd', 'openUpdate']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   #if($vue.enableRowSelection)
   const rowSelection = useRowSelection();
   #end
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataPermissionServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataPermissionServiceImpl.java
index 5c8d51d3..323a7c41 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataPermissionServiceImpl.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataPermissionServiceImpl.java
@@ -85,6 +85,8 @@ public class DataPermissionServiceImpl implements DataPermissionService {
                 .eq(DataPermissionDO::getRoleId, roleId)
                 .eq(DataPermissionDO::getType, type);
         dataPermissionDAO.delete(wrapper);
+        // 删除缓存
+        this.deleteCache(type, userId, roleId);
         if (Lists.isEmpty(request.getRelIdList())) {
             return;
         }
@@ -100,8 +102,6 @@ public class DataPermissionServiceImpl implements DataPermissionService {
                         .build())
                 .collect(Collectors.toList());
         dataPermissionDAO.insertBatch(records);
-        // 删除缓存
-        this.deleteCache(type, userId, roleId);
     }
 
     @Override
diff --git a/orion-visor-ui/src/components/asset/host/authorized-host-modal/components/host-table.vue b/orion-visor-ui/src/components/asset/host/authorized-host-modal/components/host-table.vue
index d1606791..93d5c274 100644
--- a/orion-visor-ui/src/components/asset/host/authorized-host-modal/components/host-table.vue
+++ b/orion-visor-ui/src/components/asset/host/authorized-host-modal/components/host-table.vue
@@ -54,7 +54,7 @@
   import type { HostQueryResponse } from '@/api/asset/host';
   import { dataColor } from '@/utils';
   import { tagColor } from '@/views/asset/host-list/types/const';
-  import { useRowSelection } from '@/types/table';
+  import { useRowSelection } from '@/hooks/table';
   import columns from '../types/table.columns';
   import { computed } from 'vue';
 
diff --git a/orion-visor-ui/src/components/exec/template/modal/index.vue b/orion-visor-ui/src/components/exec/template/modal/index.vue
index a955ef56..2f3be3a7 100644
--- a/orion-visor-ui/src/components/exec/template/modal/index.vue
+++ b/orion-visor-ui/src/components/exec/template/modal/index.vue
@@ -89,7 +89,7 @@
 <script lang="ts" setup>
   import type { ExecTemplateQueryRequest, ExecTemplateQueryResponse } from '@/api/exec/exec-template';
   import { reactive, ref } from 'vue';
-  import { usePagination } from '@/types/table';
+  import { useTablePagination } from '@/hooks/table';
   import useVisible from '@/hooks/visible';
   import useLoading from '@/hooks/loading';
   import { copy } from '@/hooks/copy';
@@ -100,7 +100,7 @@
 
   const { visible, setVisible } = useVisible();
   const { loading, setLoading } = useLoading();
-  const pagination = usePagination();
+  const pagination = useTablePagination();
 
   const tableRenderData = ref<ExecTemplateQueryResponse[]>([]);
   const formModel = reactive<ExecTemplateQueryRequest>({
diff --git a/orion-visor-ui/src/components/meta/history/modal/index.vue b/orion-visor-ui/src/components/meta/history/modal/index.vue
index 8dd8f4db..e198211a 100644
--- a/orion-visor-ui/src/components/meta/history/modal/index.vue
+++ b/orion-visor-ui/src/components/meta/history/modal/index.vue
@@ -85,7 +85,7 @@
   import useLoading from '@/hooks/loading';
   import useVisible from '@/hooks/visible';
   import { getHistoryValuePage } from '@/api/meta/history-value';
-  import { usePagination } from '@/types/table';
+  import { useTablePagination } from '@/hooks/table';
   import { copy } from '@/hooks/copy';
   import columns from './table.columns';
   import { Message } from '@arco-design/web-vue';
@@ -96,7 +96,7 @@
   }>();
   const emits = defineEmits(['updated']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const { visible, setVisible } = useVisible();
   const { loading, setLoading } = useLoading();
 
diff --git a/orion-visor-ui/src/hooks/card.ts b/orion-visor-ui/src/hooks/card.ts
new file mode 100644
index 00000000..9f153dd8
--- /dev/null
+++ b/orion-visor-ui/src/hooks/card.ts
@@ -0,0 +1,35 @@
+import type { PaginationProps } from '@arco-design/web-vue';
+import type { ColResponsiveValue } from '@/types/card';
+import { reactive } from 'vue';
+import { isNumber } from '@/utils/is';
+import { useAppStore } from '@/store';
+import { CardPageSizeOptions } from '@/types/const';
+
+/**
+ * 创建卡片列表列布局
+ */
+export const useCardColLayout = (): ColResponsiveValue => {
+  return reactive({
+    xs: 24,
+    sm: 12,
+    md: 8,
+    lg: 8,
+    xl: 8,
+    xxl: 6,
+  });
+};
+
+/**
+ * 创建创建卡片列表分页
+ */
+export const useCardPagination = (): PaginationProps => {
+  const appStore = useAppStore();
+  return reactive({
+    total: 0,
+    current: 1,
+    pageSize: isNumber(appStore.defaultCardPageSize) ? appStore.defaultCardPageSize : CardPageSizeOptions[0],
+    showTotal: true,
+    showPageSize: true,
+    pageSizeOptions: CardPageSizeOptions
+  });
+};
diff --git a/orion-visor-ui/src/types/table.ts b/orion-visor-ui/src/hooks/table.ts
similarity index 92%
rename from orion-visor-ui/src/types/table.ts
rename to orion-visor-ui/src/hooks/table.ts
index ddd99d09..05f1f942 100644
--- a/orion-visor-ui/src/types/table.ts
+++ b/orion-visor-ui/src/hooks/table.ts
@@ -8,7 +8,7 @@ import { TablePageSizeOptions } from '@/types/const';
 /**
  * 创建列表分页
  */
-export const usePagination = (ext?: PaginationProps): PaginationProps => {
+export const useTablePagination = (ext?: PaginationProps): PaginationProps => {
   const appStore = useAppStore();
   return reactive({
     total: 0,
diff --git a/orion-visor-ui/src/types/card.ts b/orion-visor-ui/src/types/card.ts
index 1df65c97..0dfcdfee 100644
--- a/orion-visor-ui/src/types/card.ts
+++ b/orion-visor-ui/src/types/card.ts
@@ -1,9 +1,5 @@
-import type { PaginationProps, ResponsiveValue } from '@arco-design/web-vue';
+import type { ResponsiveValue } from '@arco-design/web-vue';
 import type { VNodeChild } from 'vue';
-import { reactive } from 'vue';
-import { useAppStore } from '@/store';
-import { isNumber } from '@/utils/is';
-import { CardPageSizeOptions } from '@/types/const';
 
 /**
  * 字段对齐方式
@@ -88,32 +84,3 @@ export interface HandleVisible {
   disableSearch?: boolean;
   disableReset?: boolean;
 }
-
-/**
- * 创建卡片列表列布局
- */
-export const useColLayout = (): ColResponsiveValue => {
-  return {
-    xs: 24,
-    sm: 12,
-    md: 8,
-    lg: 8,
-    xl: 8,
-    xxl: 6,
-  };
-};
-
-/**
- * 创建创建卡片列表分页
- */
-export const usePagination = (): PaginationProps => {
-  const appStore = useAppStore();
-  return reactive({
-    total: 0,
-    current: 1,
-    pageSize: isNumber(appStore.defaultCardPageSize) ? appStore.defaultCardPageSize : CardPageSizeOptions[0],
-    showTotal: true,
-    showPageSize: true,
-    pageSizeOptions: CardPageSizeOptions
-  });
-};
diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
index 5191882d..d2c52929 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
+++ b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
@@ -203,7 +203,7 @@
   import { reactive, ref, onMounted } from 'vue';
   import { deleteHostConnectLog, getHostConnectLogPage, hostForceOffline } from '@/api/asset/host-connect-log';
   import { connectStatusKey, connectTypeKey, HostConnectStatus } from '../types/const';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { Message } from '@arco-design/web-vue';
   import columns from '../types/table.columns';
@@ -215,7 +215,7 @@
 
   const emits = defineEmits(['openClear', 'openDetail']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
   const { toOptions, getDictValue } = useDictStore();
diff --git a/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue b/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
index 56928132..07fc6a6a 100644
--- a/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
+++ b/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
@@ -188,7 +188,7 @@
   import { reactive, ref, onMounted } from 'vue';
   import { getHostSftpLogPage, deleteHostSftpLog } from '@/api/asset/host-sftp';
   import { sftpOperatorTypeKey, sftpOperatorResultKey, SftpOperatorType, showPathMaxCount } from '../types/const';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { Message } from '@arco-design/web-vue';
   import columns from '../types/table.columns';
@@ -198,7 +198,7 @@
   import UserSelector from '@/components/user/user/selector/index.vue';
   import HostSelector from '@/components/asset/host/selector/index.vue';
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
   const { toOptions, getDictValue } = useDictStore();
diff --git a/orion-visor-ui/src/views/asset/grant/components/host-identity-grant.vue b/orion-visor-ui/src/views/asset/grant/components/host-identity-grant.vue
index f3a689bd..192b4c4c 100644
--- a/orion-visor-ui/src/views/asset/grant/components/host-identity-grant.vue
+++ b/orion-visor-ui/src/views/asset/grant/components/host-identity-grant.vue
@@ -53,7 +53,7 @@
   import type { HostKeyQueryResponse } from '@/api/asset/host-key';
   import { ref, onMounted } from 'vue';
   import useLoading from '@/hooks/loading';
-  import { useRowSelection } from '@/types/table';
+  import { useRowSelection } from '@/hooks/table';
   import { getAuthorizedHostIdentity, grantHostIdentity } from '@/api/asset/asset-data-grant';
   import { useCacheStore, useDictStore } from '@/store';
   import { hostIdentityColumns } from '../types/table.columns';
diff --git a/orion-visor-ui/src/views/asset/grant/components/host-key-grant.vue b/orion-visor-ui/src/views/asset/grant/components/host-key-grant.vue
index bcbf8224..50d07b54 100644
--- a/orion-visor-ui/src/views/asset/grant/components/host-key-grant.vue
+++ b/orion-visor-ui/src/views/asset/grant/components/host-key-grant.vue
@@ -33,7 +33,7 @@
   import { ref, onMounted } from 'vue';
   import { getAuthorizedHostKey, grantHostKey } from '@/api/asset/asset-data-grant';
   import useLoading from '@/hooks/loading';
-  import { useRowSelection } from '@/types/table';
+  import { useRowSelection } from '@/hooks/table';
   import { useCacheStore } from '@/store';
   import { Message } from '@arco-design/web-vue';
   import { hostKeyColumns } from '../types/table.columns';
diff --git a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
index c78e711b..695b89ff 100644
--- a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
@@ -146,7 +146,7 @@
 
 <script lang="ts" setup>
   import type { HostIdentityQueryRequest, HostIdentityQueryResponse } from '@/api/asset/host-identity';
-  import { usePagination, useColLayout } from '@/types/card';
+  import { useCardPagination, useCardColLayout } from '@/hooks/card';
   import { computed, reactive, ref, onMounted } from 'vue';
   import useLoading from '@/hooks/loading';
   import { objectTruthKeyCount, resetObject } from '@/utils';
@@ -164,8 +164,8 @@
 
   const list = ref<HostIdentityQueryResponse[]>([]);
 
-  const cardColLayout = useColLayout();
-  const pagination = usePagination();
+  const cardColLayout = useCardColLayout();
+  const pagination = useCardPagination();
   const { toOptions, getDictValue } = useDictStore();
   const { loading, setLoading } = useLoading();
   const { hasAnyPermission } = usePermission();
diff --git a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue
index 7d5caae5..aed44e99 100644
--- a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue
+++ b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue
@@ -183,14 +183,14 @@
   import usePermission from '@/hooks/permission';
   import { copy } from '@/hooks/copy';
   import { useDictStore } from '@/store';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { GrantKey, GrantRouteName } from '@/views/asset/grant/types/const';
   import { IdentityType, identityTypeKey } from '../types/const';
   import HostKeySelector from '@/components/asset/host-key/selector/index.vue';
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openKeyView']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { toOptions, getDictValue } = useDictStore();
   const { loading, setLoading } = useLoading();
diff --git a/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue b/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
index c871df2f..0f3202eb 100644
--- a/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
@@ -81,7 +81,7 @@
 
 <script lang="ts" setup>
   import type { HostKeyQueryRequest, HostKeyQueryResponse } from '@/api/asset/host-key';
-  import { usePagination, useColLayout } from '@/types/card';
+  import { useCardPagination, useCardColLayout } from '@/hooks/card';
   import { reactive, ref, onMounted } from 'vue';
   import useLoading from '@/hooks/loading';
   import { resetObject } from '@/utils';
@@ -94,8 +94,8 @@
 
   const list = ref<HostKeyQueryResponse[]>([]);
 
-  const cardColLayout = useColLayout();
-  const pagination = usePagination();
+  const cardColLayout = useCardColLayout();
+  const pagination = useCardPagination();
   const { loading, setLoading } = useLoading();
 
   const formModel = reactive<HostKeyQueryRequest>({
diff --git a/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue b/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue
index e7d25f08..d21fe9d7 100644
--- a/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue
+++ b/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue
@@ -137,12 +137,12 @@
   import { Message } from '@arco-design/web-vue';
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { GrantKey, GrantRouteName } from '@/views/asset/grant/types/const';
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openView']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
 
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
index 644a488f..b9fa59eb 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
@@ -196,7 +196,7 @@
 
 <script lang="ts" setup>
   import type { HostQueryRequest, HostQueryResponse } from '@/api/asset/host';
-  import { usePagination, useColLayout } from '@/types/card';
+  import { useCardPagination, useCardColLayout } from '@/hooks/card';
   import { computed, reactive, ref, onMounted } from 'vue';
   import { dataColor, objectTruthKeyCount, resetObject } from '@/utils';
   import { deleteHost, getHostPage, updateHostStatus } from '@/api/asset/host';
@@ -211,8 +211,8 @@
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openUpdateConfig', 'openHostGroup', 'openCopy']);
 
-  const cardColLayout = useColLayout();
-  const pagination = usePagination();
+  const cardColLayout = useCardColLayout();
+  const pagination = useCardPagination();
   const { loading, setLoading } = useLoading();
   const { toOptions, getDictValue, toggleDictValue, toggleDict } = useDictStore();
 
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
index 2eb122b2..efacd20b 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
@@ -240,7 +240,7 @@
   import { deleteHost, batchDeleteHost, getHostPage, updateHostStatus } from '@/api/asset/host';
   import { Message, Modal } from '@arco-design/web-vue';
   import { tagColor, hostTypeKey, hostStatusKey } from '../types/const';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { copy } from '@/hooks/copy';
   import { dataColor } from '@/utils';
@@ -251,7 +251,7 @@
 
   const emits = defineEmits(['openCopy', 'openAdd', 'openUpdate', 'openUpdateConfig', 'openHostGroup']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
   const { toOptions, getDictValue, toggleDictValue, toggleDict } = useDictStore();
diff --git a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue
index 4e5f2a78..0827c962 100644
--- a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue
@@ -108,7 +108,7 @@
   import columns from '../types/host-table.columns';
   import { execHostStatusKey, execHostStatus } from '@/components/exec/log/const';
   import { useDictStore } from '@/store';
-  import { useExpandable } from '@/types/table';
+  import { useExpandable } from '@/hooks/table';
   import { dateFormat, formatDuration } from '@/utils';
   import { downloadExecCommandLogFile, interruptHostExecCommand } from '@/api/exec/exec-command-log';
   import { copy } from '@/hooks/copy';
diff --git a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
index 97a9a6bd..c5a055e3 100644
--- a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
@@ -220,7 +220,7 @@
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
   import { execStatus, execStatusKey } from '@/components/exec/log/const';
-  import { useExpandable, usePagination, useRowSelection } from '@/types/table';
+  import { useExpandable, useTablePagination, useRowSelection } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { dateFormat, formatDuration } from '@/utils';
   import { reExecCommand } from '@/api/exec/exec-command';
@@ -230,7 +230,7 @@
 
   const emits = defineEmits(['viewCommand', 'viewParams', 'viewLog', 'openClear']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const expandable = useExpandable();
   const { loading, setLoading } = useLoading();
diff --git a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
index e8551890..2b66936f 100644
--- a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
@@ -133,12 +133,12 @@
   import { Message } from '@arco-design/web-vue';
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { copy } from '@/hooks/copy';
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openExec']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
 
diff --git a/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue b/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
index d4a80207..5ad29e13 100644
--- a/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
+++ b/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
@@ -187,14 +187,14 @@
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
   import { UploadTaskStatus, uploadTaskStatusKey } from '../types/const';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { copy } from '@/hooks/copy';
   import UserSelector from '@/components/user/user/selector/index.vue';
 
   const emits = defineEmits(['openClear']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
   const { toOptions, getDictValue } = useDictStore();
diff --git a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-table.vue b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-table.vue
index 78f3609f..89ef2792 100644
--- a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-table.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-table.vue
@@ -145,7 +145,7 @@
   import type { SftpFile, ISftpSession } from '../../types/define';
   import type { VNodeRef } from 'vue';
   import { ref, computed, watch, inject } from 'vue';
-  import { useRowSelection } from '@/types/table';
+  import { useRowSelection } from '@/hooks/table';
   import { dateFormat } from '@/utils';
   import { setAutoFocus } from '@/utils/dom';
   import { copy } from '@/hooks/copy';
diff --git a/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-host-log-table.vue b/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-host-log-table.vue
index f2ec2140..dcbc8588 100644
--- a/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-host-log-table.vue
+++ b/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-host-log-table.vue
@@ -107,7 +107,7 @@
   import { useDictStore } from '@/store';
   import useLoading from '@/hooks/loading';
   import columns from '@/views/exec/exec-command-log/types/host-table.columns';
-  import { useExpandable } from '@/types/table';
+  import { useExpandable } from '@/hooks/table';
   import { dateFormat, formatDuration } from '@/utils';
   import { downloadExecJobLogFile } from '@/api/job/exec-job-log';
   import { copy } from '@/hooks/copy';
diff --git a/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue b/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
index bb75336b..79f1a75f 100644
--- a/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
+++ b/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
@@ -203,7 +203,7 @@
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
   import { execStatus, execStatusKey } from '@/components/exec/log/const';
-  import { useExpandable, usePagination, useRowSelection } from '@/types/table';
+  import { useExpandable, useTablePagination, useRowSelection } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { dateFormat, formatDuration } from '@/utils';
   import { interruptExecJob } from '@/api/job/exec-job-log';
@@ -211,7 +211,7 @@
 
   const emits = defineEmits(['viewCommand', 'viewParams', 'viewLog', 'openClear']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const expandable = useExpandable();
   const { loading, setLoading } = useLoading();
diff --git a/orion-visor-ui/src/views/job/exec-job/components/exec-job-table.vue b/orion-visor-ui/src/views/job/exec-job/components/exec-job-table.vue
index 267ffcc4..ed7f5953 100644
--- a/orion-visor-ui/src/views/job/exec-job/components/exec-job-table.vue
+++ b/orion-visor-ui/src/views/job/exec-job/components/exec-job-table.vue
@@ -197,14 +197,14 @@
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
   import { ExecJobStatus, execJobStatusKey, execStatusKey } from '../types/const';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { copy } from '@/hooks/copy';
   import { dateFormat } from '@/utils';
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openDetail', 'testCron']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
   const { hasPermission } = usePermission();
diff --git a/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue b/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
index c36dfa94..2ec8454c 100644
--- a/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
+++ b/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
@@ -165,7 +165,7 @@
   import { Message } from '@arco-design/web-vue';
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { dictValueTypeKey } from '../types/const';
   import { copy } from '@/hooks/copy';
   import { useCacheStore, useDictStore } from '@/store';
@@ -173,7 +173,7 @@
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openView']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
   const { toOptions, getDictValue } = useDictStore();
diff --git a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
index 87892070..edcf5555 100644
--- a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
+++ b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
@@ -140,13 +140,13 @@
   import { Message } from '@arco-design/web-vue';
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { copy } from '@/hooks/copy';
   import DictKeySelector from '@/components/system/dict-key/selector/index.vue';
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openHistory']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
 
diff --git a/orion-visor-ui/src/views/user/operator-log/components/operator-log-simple-table.vue b/orion-visor-ui/src/views/user/operator-log/components/operator-log-simple-table.vue
index bcd54bd5..b54940de 100644
--- a/orion-visor-ui/src/views/user/operator-log/components/operator-log-simple-table.vue
+++ b/orion-visor-ui/src/views/user/operator-log/components/operator-log-simple-table.vue
@@ -74,7 +74,7 @@
   import { getLogDetail } from '../types/const';
   import { copy } from '@/hooks/copy';
   import useLoading from '@/hooks/loading';
-  import { usePagination } from '@/types/table';
+  import { useTablePagination } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { getOperatorLogPage } from '@/api/user/operator-log';
   import { getCurrentUserOperatorLog } from '@/api/user/mine';
@@ -95,7 +95,7 @@
     },
   });
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const { loading, setLoading } = useLoading();
   const { getDictValue } = useDictStore();
 
diff --git a/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue b/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
index 6c7dce28..a9ea36ec 100644
--- a/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
+++ b/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
@@ -132,7 +132,7 @@
   import columns from '../types/table.columns';
   import { copy } from '@/hooks/copy';
   import useLoading from '@/hooks/loading';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { getOperatorLogPage, deleteOperatorLog } from '@/api/user/operator-log';
   import { replaceHtmlTag, clearHtmlTag } from '@/utils';
@@ -141,7 +141,7 @@
 
   const emits = defineEmits(['openClear', 'openDetail']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
   const { getDictValue } = useDictStore();
diff --git a/orion-visor-ui/src/views/user/role/components/role-table.vue b/orion-visor-ui/src/views/user/role/components/role-table.vue
index 2baecad0..9f8f3a9b 100644
--- a/orion-visor-ui/src/views/user/role/components/role-table.vue
+++ b/orion-visor-ui/src/views/user/role/components/role-table.vue
@@ -137,14 +137,14 @@
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
   import { RoleStatus, roleStatusKey } from '../types/const';
-  import { usePagination } from '@/types/table';
+  import { useTablePagination } from '@/hooks/table';
   import usePermission from '@/hooks/permission';
   import { useDictStore } from '@/store';
   import { AdminRoleCode } from '@/types/const';
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openGrant']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const { hasPermission } = usePermission();
   const { loading, setLoading } = useLoading();
   const { toOptions, getDictValue } = useDictStore();
diff --git a/orion-visor-ui/src/views/user/user/components/user-table.vue b/orion-visor-ui/src/views/user/user/components/user-table.vue
index 4d4d74a9..8b046e98 100644
--- a/orion-visor-ui/src/views/user/user/components/user-table.vue
+++ b/orion-visor-ui/src/views/user/user/components/user-table.vue
@@ -180,7 +180,7 @@
   import columns from '../types/table.columns';
   import { userStatusKey, UserStatus } from '../types/const';
   import useLoading from '@/hooks/loading';
-  import { usePagination, useRowSelection } from '@/types/table';
+  import { useTablePagination, useRowSelection } from '@/hooks/table';
   import usePermission from '@/hooks/permission';
   import { useRouter } from 'vue-router';
   import { useDictStore, useUserStore } from '@/store';
@@ -188,7 +188,7 @@
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openResetPassword', 'openGrantRole']);
 
-  const pagination = usePagination();
+  const pagination = useTablePagination();
   const rowSelection = useRowSelection();
   const { hasPermission } = usePermission();
   const { loading, setLoading } = useLoading();