Merge pull request #46 from dromara/dev

Dev
🐳 修改 docker 配置.
2026-06-10 19:26:52 +08:00 · 2024-07-29 11:39:00 +08:00 · 2024-07-29 11:15:44 +08:00 · 2024-07-29 10:33:59 +08:00 · 2024-07-29 10:25:11 +08:00 · 2024-07-26 11:11:47 +08:00
72 changed files with 341 additions and 318 deletions
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@

 * 🔗 演示地址: http://101.43.254.243:1081/
 * 🔏 演示账号: admin/admin
-* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor)  [gitcode](https://gitcode.com/qq_41011894/orion-visor/overview)
+* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor)  [gitcode](https://gitcode.com/dromara/orion-visor/overview)
 * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
 * 🎭 演示环境部分功能不可用, 完整功能请本地部署!
 * 📛 演示环境请不要随便删除数据!
--- a/docker-compose-testing.yml
+++ b/docker-compose-testing.yml
@@ -1,17 +1,17 @@
 version: '3.3'
 services:
-  orion-visor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.0
+  service:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2
    privileged: true
    ports:
      - 1081:80
    environment:
-      - MYSQL_HOST=orion-visor-mysql
+      - MYSQL_HOST=mysql
      - MYSQL_PORT=3306
      - MYSQL_DATABASE=orion_visor
      - MYSQL_USER=root
      - MYSQL_PASSWORD=Data@123456
-      - REDIS_HOST=orion-visor-redis
+      - REDIS_HOST=redis
      - REDIS_PASSWORD=Data@123456
      - SECRET_KEY=uQeacXV8b3isvKLK
      - DEMO_MODE=false
@@ -24,15 +24,15 @@ services:
      retries: 200
      start_period: 3s
    depends_on:
-      orion-visor-mysql:
+      mysql:
        condition: service_healthy
-      orion-visor-redis:
+      redis:
        condition: service_healthy
    links:
-      - orion-visor-mysql
-      - orion-visor-redis
-  orion-visor-mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.0
+      - mysql
+      - redis
+  mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2
    privileged: true
    ports:
      - 3307:3306
@@ -51,8 +51,8 @@ services:
      timeout: 60s
      retries: 10
      start_period: 3s
-  orion-visor-redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.0
+  redis:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2
    privileged: true
    ports:
      - 6380:6379
@@ -71,9 +71,9 @@ services:
    build:
      context: ./docker/e2e
    environment:
-      SERVER: http://orion-visor-service:80
+      SERVER: http://service:80
    depends_on:
-      orion-visor-service:
+      service:
        condition: service_healthy
    links:
-      - orion-visor-service
+      - service
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,17 @@
 version: '3.3'
 services:
-  orion-visor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.0
+  service:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2
    privileged: true
    ports:
      - 1081:80
    environment:
-      - MYSQL_HOST=orion-visor-mysql
+      - MYSQL_HOST=mysql
      - MYSQL_PORT=3306
      - MYSQL_DATABASE=orion_visor
      - MYSQL_USER=root
      - MYSQL_PASSWORD=Data@123456
-      - REDIS_HOST=orion-visor-redis
+      - REDIS_HOST=redis
      - REDIS_PASSWORD=Data@123456
      - SECRET_KEY=uQeacXV8b3isvKLK
      - DEMO_MODE=false
@@ -24,15 +24,15 @@ services:
      retries: 200
      start_period: 3s
    depends_on:
-      orion-visor-mysql:
+      mysql:
        condition: service_healthy
-      orion-visor-redis:
+      redis:
        condition: service_healthy
    links:
-      - orion-visor-mysql
-      - orion-visor-redis
-  orion-visor-mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.0
+      - mysql
+      - redis
+  mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2
    privileged: true
    ports:
      - 3307:3306
@@ -51,8 +51,8 @@ services:
      timeout: 60s
      retries: 10
      start_period: 3s
-  orion-visor-redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.0
+  redis:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2
    privileged: true
    ports:
      - 6380:6379
@@ -67,7 +67,12 @@ services:
      timeout: 60s
      retries: 10
      start_period: 3s
-  orion-visor-adminer:
-    image: adminer
+  adminer:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.2
    ports:
      - 8081:8080
+    depends_on:
+      mysql:
+        condition: service_healthy
+    links:
+      - mysql
--- a/docker/adminer/Dockerfile
+++ b/docker/adminer/Dockerfile
@@ -0,0 +1 @@
+FROM adminer:latest
--- a/docker/adminer/build.sh
+++ b/docker/adminer/build.sh
@@ -0,0 +1,5 @@
+#/bin/bash
+version=2.1.2
+docker build -t orion-visor-adminer:${version} .
+docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
--- a/docker/mysql/build.sh
+++ b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.0
+version=2.1.2
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql
--- a/docker/redis/build.sh
+++ b/docker/redis/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.0
+version=2.1.2
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
--- a/docker/service/build.sh
+++ b/docker/service/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.0
+version=2.1.2
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build -t orion-visor-service:${version} .
--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -14,7 +14,7 @@
    <url>https://github.com/dromara/orion-visor</url>

    <properties>
-        <revision>2.1.0</revision>
+        <revision>2.1.2</revision>
        <spring.boot.version>2.7.17</spring.boot.version>
        <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
        <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
@@ -14,7 +14,7 @@ public interface AppConst extends OrionConst {
    /**
     * 同 ${orion.version} 迭代时候需要手动更改
     */
-    String VERSION = "2.1.0";
+    String VERSION = "2.1.2";

    /**
     * 同 ${spring.application.name}
--- 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();
--- 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
@@ -94,8 +94,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      #foreach($field in ${table.fields})
      #if(${dictMap.containsKey(${field.propertyName})})
      <!-- $field.comment -->
@@ -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
--- 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
--- a/orion-visor-ui/.env.development
+++ b/orion-visor-ui/.env.development
@@ -1,6 +1,6 @@
 VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api'
 VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.1.0'
+VITE_APP_VERSION= '2.1.2'
 VITE_APP_RELEASE= 'community'
 VITE_SFTP_PREVIEW_MB= 2
 VITE_DEMO_MODE= false
--- a/orion-visor-ui/.env.production
+++ b/orion-visor-ui/.env.production
@@ -1,6 +1,6 @@
 VITE_API_BASE_URL= '/orion-visor/api'
 VITE_WS_BASE_URL= '/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.1.0'
+VITE_APP_VERSION= '2.1.2'
 VITE_APP_RELEASE= 'community'
 VITE_SFTP_PREVIEW_MB= 2
 VITE_DEMO_MODE= false
--- a/orion-visor-ui/package.json
+++ b/orion-visor-ui/package.json
@@ -1,7 +1,7 @@
 {
  "name": "orion-visor-ui",
  "description": "Orion Visor UI",
-  "version": "2.1.0",
+  "version": "2.1.2",
  "private": true,
  "author": "Jiahang Li",
  "license": "Apache 2.0",
--- a/orion-visor-ui/src/components/app/navbar/index.vue
+++ b/orion-visor-ui/src/components/app/navbar/index.vue
@@ -50,7 +50,7 @@
            </template>
          </a-button>
        </a-tooltip>
-        <a-dropdown trigger="click" @select="s => changeLocale(s as string)">
+        <a-dropdown trigger="click" @select="(s: string) => changeLocale(s)">
          <div ref="localeRef" class="trigger-btn" />
          <template #content>
            <a-doption v-for="item in locales"
--- a/orion-visor-ui/src/components/asset/host-group/tree/index.vue
+++ b/orion-visor-ui/src/components/asset/host-group/tree/index.vue
@@ -12,7 +12,7 @@
            :checkable="checkable"
            :check-strictly="true"
            @drop="moveGroup"
-            @select="(s) => emits('onSelected', s)">
+            @select="(s: any) => emits('onSelected', s)">
      <!-- 标题 -->
      <template #title="node">
        <!-- 修改名称输入框 -->
--- 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';

--- a/orion-visor-ui/src/components/exec/log/panel-modal/index.vue
+++ b/orion-visor-ui/src/components/exec/log/panel-modal/index.vue
@@ -119,11 +119,6 @@
        align-items: center;
      }
    }
-
-    .exec-host-items {
-      width: 100%;
-      height: calc(100% - 38px);
-    }
  }

  :deep(.log-header) {
--- a/orion-visor-ui/src/components/exec/log/panel/exec-host.vue
+++ b/orion-visor-ui/src/components/exec/log/panel/exec-host.vue
@@ -13,23 +13,26 @@
    </div>
    <!-- 主机列表 -->
    <div class="exec-host-items">
-      <div v-for="item in hosts"
-           :key="item.id"
-           class="exec-host-item"
-           :class="[ current === item.id ? 'exec-host-item-selected' : '' ]"
-           @click="emits('selected', item.id)">
-        <!-- 主机名称 -->
-        <div class="exec-host-item-name">
-          <span class="host-name">{{ item.hostName }}</span>
-          <span class="host-address">{{ item.hostAddress }}</span>
+      <a-scrollbar>
+        <div v-for="(item, index) in hosts"
+             :key="item.id"
+             class="exec-host-item"
+             :class="[ current === item.id ? 'exec-host-item-selected' : '' ]"
+             :style="{ marginBottom: index === hosts.length -1 ? 0 : '8px' }"
+             @click="emits('selected', item.id)">
+          <!-- 主机名称 -->
+          <div class="exec-host-item-name">
+            <span class="host-name">{{ item.hostName }}</span>
+            <span class="host-address">{{ item.hostAddress }}</span>
+          </div>
+          <!-- 状态 -->
+          <div class="exec-host-item-status">
+            <a-tag :color="getDictValue(execHostStatusKey, item.status, 'execColor')">
+              {{ getDictValue(execHostStatusKey, item.status) }}
+            </a-tag>
+          </div>
        </div>
-        <!-- 状态 -->
-        <div class="exec-host-item-status">
-          <a-tag :color="getDictValue(execHostStatusKey, item.status, 'execColor')">
-            {{ getDictValue(execHostStatusKey, item.status) }}
-          </a-tag>
-        </div>
-      </div>
+      </a-scrollbar>
    </div>
  </div>
 </template>
@@ -78,13 +81,19 @@
  }

  .exec-host-items {
-    position: absolute;
-    width: calc(100% - 32px);
-    height: calc(100% - 68px);
-    overflow: auto;
+    position: relative;
+    width: 100%;
+    height: calc(100% - 38px);

-    &::-webkit-scrollbar-track {
-      display: none;
+    :deep(.arco-scrollbar) {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+
+      &-container {
+        height: 100%;
+        overflow-y: auto;
+      }
    }
  }

@@ -99,7 +108,6 @@
    display: flex;
    justify-content: space-between;
    align-items: center;
-    margin-bottom: 8px;
    background: var(--color-fill-2);
    transition: all .2s;
    user-select: none;
--- a/orion-visor-ui/src/components/exec/template/modal/index.vue
+++ b/orion-visor-ui/src/components/exec/template/modal/index.vue
@@ -51,8 +51,8 @@
               :pagination="pagination"
               :bordered="false"
               :scroll="{ x: '100%', y: '60vh' }"
-               @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-               @page-size-change="(size) => fetchTableData(1, size)">
+               @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+               @page-size-change="(size: number) => fetchTableData(1, size)">
        <!-- 模板名称 -->
        <template #name="{ record }">
          <span class="span-blue">{{ record.name }}</span>
@@ -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>({
--- a/orion-visor-ui/src/components/meta/history/modal/index.vue
+++ b/orion-visor-ui/src/components/meta/history/modal/index.vue
@@ -34,8 +34,8 @@
               :data="tableRenderData"
               :pagination="pagination"
               :bordered="false"
-               @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-               @page-size-change="(size) => fetchTableData(1, size)">
+               @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+               @page-size-change="(size: number) => fetchTableData(1, size)">
        <!-- 修改前 -->
        <template #beforeValue="{ record }">
          <span class="copy-left"
@@ -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();

--- a/orion-visor-ui/src/components/system/menu/tree/index.vue
+++ b/orion-visor-ui/src/components/system/menu/tree/index.vue
@@ -13,7 +13,7 @@
      <!-- 一级菜单 -->
      <a-menu-item v-if="!menu.children?.length"
                   :key="menu.name"
-                   @click="(e) => goto(e, menu)">
+                   @click="(e: any) => goto(e, menu)">
        <!-- 图标 -->
        <template #icon>
          <component v-if="menu.meta?.icon" :is="menu.meta?.icon" />
@@ -34,7 +34,7 @@
        <!-- 子菜单 -->
        <a-menu-item v-for="child in menu.children"
                     :key="child.name"
-                     @click="(e) => goto(e, child)">
+                     @click="(e: any) => goto(e, child)">
          <!-- 图标 -->
          <template #icon v-if="child.meta?.icon">
            <component :is="child.meta?.icon" />
--- a/orion-visor-ui/src/components/view/card-list/components/card-header.vue
+++ b/orion-visor-ui/src/components/view/card-list/components/card-header.vue
@@ -14,8 +14,8 @@
                        v-model:page-size="(pagination as any).pageSize"
                        v-bind="pagination as any"
                        :auto-adjust="false"
-                        @change="page => bubblesEmitter(HeaderEmitter.PAGE_CHANGE, page, (pagination as any).pageSize)"
-                        @page-size-change="limit => bubblesEmitter(HeaderEmitter.PAGE_CHANGE, 1, limit)" />
+                        @change="(page: number) => bubblesEmitter(HeaderEmitter.PAGE_CHANGE, page, (pagination as any).pageSize)"
+                        @page-size-change="(limit: number) => bubblesEmitter(HeaderEmitter.PAGE_CHANGE, 1, limit)" />
        </div>
      </div>
      <!-- 操作部分 -->
@@ -48,8 +48,8 @@
                       :placeholder="searchInputPlaceholder as string"
                       size="small"
                       allow-clear
-                       @input="(e) => bubblesEmitter(HeaderEmitter.UPDATE_SEARCH_VALUE, e)"
-                       @change="(e) => bubblesEmitter(HeaderEmitter.UPDATE_SEARCH_VALUE, e)"
+                       @input="(e: string) => bubblesEmitter(HeaderEmitter.UPDATE_SEARCH_VALUE, e)"
+                       @change="(e: string) => bubblesEmitter(HeaderEmitter.UPDATE_SEARCH_VALUE, e)"
                       @keyup.enter="bubblesEmitter(HeaderEmitter.SEARCH)" />
            </div>
            <!-- 过滤条件 -->
--- a/orion-visor-ui/src/hooks/card.ts
+++ 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
+  });
+};
--- a/orion-visor-ui/src/hooks/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,
--- a/orion-visor-ui/src/store/modules/cache/index.ts
+++ b/orion-visor-ui/src/store/modules/cache/index.ts
@@ -1,4 +1,4 @@
-import type { CacheState } from './types';
+import type { CacheState, CacheType } from './types';
 import type { AxiosResponse } from 'axios';
 import type { TagType } from '@/api/meta/tag';
 import { getTagList } from '@/api/meta/tag';
@@ -19,14 +19,6 @@ import { getCommandSnippetGroupList } from '@/api/asset/command-snippet-group';
 import { getExecJobList } from '@/api/job/exec-job';
 import { getPathBookmarkGroupList } from '@/api/asset/path-bookmark-group';

-export type CacheType = 'users' | 'menus' | 'roles'
-  | 'hostGroups' | 'hostKeys' | 'hostIdentities'
-  | 'dictKeys'
-  | 'authorizedHostKeys' | 'authorizedHostIdentities'
-  | 'commandSnippetGroups' | 'pathBookmarkGroups'
-  | 'execJob'
-  | string
-
 export default defineStore('cache', {
  state: (): CacheState => ({}),

--- a/orion-visor-ui/src/store/modules/cache/types.ts
+++ b/orion-visor-ui/src/store/modules/cache/types.ts
@@ -1,23 +1,12 @@
-import type { UserQueryResponse } from '@/api/user/user';
-import type { MenuQueryResponse } from '@/api/system/menu';
-import type { RoleQueryResponse } from '@/api/user/role';
-import type { HostQueryResponse } from '@/api/asset/host';
-import type { HostGroupQueryResponse } from '@/api/asset/host-group';
-import type { HostKeyQueryResponse } from '@/api/asset/host-key';
-import type { HostIdentityQueryResponse } from '@/api/asset/host-identity';
-import type { DictKeyQueryResponse } from '@/api/system/dict-key';
+// 缓存类型
+export type CacheType = 'users' | 'menus' | 'roles'
+  | 'hostGroups' | 'hostKeys' | 'hostIdentities'
+  | 'dictKeys'
+  | 'authorizedHostKeys' | 'authorizedHostIdentities'
+  | 'commandSnippetGroups' | 'pathBookmarkGroups'
+  | 'execJob'
+  | string

 export interface CacheState {
-  users?: UserQueryResponse[];
-  menus?: MenuQueryResponse[];
-  roles?: RoleQueryResponse[];
-  hosts?: HostQueryResponse[];
-  hostGroups?: HostGroupQueryResponse[];
-  hostKeys?: HostKeyQueryResponse[];
-  hostIdentities?: HostIdentityQueryResponse[];
-  dictKeys?: DictKeyQueryResponse[];
-  authorizedHostKeys?: HostKeyQueryResponse[];
-  authorizedHostIdentities?: HostIdentityQueryResponse[];
-
-  [key: string]: unknown;
+  [key: CacheType]: unknown;
 }
--- a/orion-visor-ui/src/store/modules/menu/index.ts
+++ b/orion-visor-ui/src/store/modules/menu/index.ts
@@ -1,10 +1,10 @@
 import type { RouteMeta, RouteRecordNormalized } from 'vue-router';
 import type { MenuState } from './types';
 import type { MenuQueryResponse } from '@/api/system/menu';
+import router from '@/router';
 import { defineStore } from 'pinia';
 import { Notification } from '@arco-design/web-vue';
 import { getMenuList } from '@/api/user/auth';
-import router from '@/router';
 import { EnabledStatus } from '@/types/const';

 export default defineStore('menu', {
--- 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
-  });
-};
--- 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
@@ -100,8 +100,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 连接用户 -->
      <template #username="{ record }">
        {{ record.username }}
@@ -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();
--- 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
@@ -84,8 +84,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 操作用户 -->
      <template #username="{ record }">
        {{ record.username }}
@@ -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();
--- 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';
--- 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';
--- 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();
--- 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
@@ -102,8 +102,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 类型 -->
      <template #type="{ record }">
        <a-tag :color="getDictValue(identityTypeKey, record.type, 'color')">
@@ -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();
--- 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>({
--- 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
@@ -87,8 +87,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 操作 -->
      <template #handle="{ record }">
        <div class="table-handle-wrapper">
@@ -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();

--- 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();

--- 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
@@ -127,8 +127,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 主机类型 -->
      <template #type="{ record }">
        <a-tag :color="getDictValue(hostTypeKey, record.type, 'color')">
@@ -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();
--- 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';
--- 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
@@ -108,8 +108,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)"
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)"
             @expand="loadExecHost">
      <!-- 展开表格 -->
      <template #expand-row="{ record }">
@@ -165,7 +165,7 @@
                    type="text"
                    size="mini"
                    title="ctrl + 左键新页面打开"
-                    @click="(e) => emits('viewLog', record.id, e.ctrlKey)">
+                    @click="(e: any) => emits('viewLog', record.id, e.ctrlKey)">
            日志
          </a-button>
          <!-- 中断 -->
@@ -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();
--- a/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel-history.vue
+++ b/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel-history.vue
@@ -18,9 +18,10 @@
      <a-empty description="无执行记录" />
    </div>
    <!-- 批量执行日志 -->
-    <div v-else class="exec-history-rows">
-      <div v-for="record in historyLogs"
+    <a-scrollbar v-else>
+      <div v-for="(record, index) in historyLogs"
           :key="record.id"
+           :style="{ marginBottom: index === historyLogs.length -1 ? 0 : '8px' }"
           class="exec-history"
           @click="emits('selected', record)">
        <!-- 机器数量 -->
@@ -32,7 +33,7 @@
          {{ record.description }}
        </span>
      </div>
-    </div>
+    </a-scrollbar>
  </div>
 </template>

@@ -110,14 +111,16 @@
 </script>

 <style lang="less" scoped>
-  .exec-history-rows {
-    position: absolute;
-    width: calc(100% - 32px);
-    height: calc(100% - 64px);
-    overflow: auto;
+  .container {
+    :deep(.arco-scrollbar) {
+      position: absolute;
+      width: calc(100% - 32px);
+      height: calc(100% - 64px);

-    &::-webkit-scrollbar-track {
-      display: none;
+      &-container {
+        height: 100%;
+        overflow-y: auto;
+      }
    }
  }

@@ -127,7 +130,6 @@
    display: flex;
    justify-content: space-between;
    align-items: center;
-    margin-bottom: 8px;
    background: var(--color-fill-2);
    transition: all .2s;
    user-select: none;
--- 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
@@ -77,8 +77,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 模板命令 -->
      <template #command="{ record }">
        <span class="copy-left" @click="copy(record.command, '已复制')">
@@ -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();

--- 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
@@ -107,8 +107,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 上传路径 -->
      <template #remotePath="{ record }">
        <span class="text-copy span-blue" @click="copy(record.remotePath)">
@@ -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();
--- a/orion-visor-ui/src/views/host/terminal/components/command-snippet/command-snippet-drawer.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/command-snippet/command-snippet-drawer.vue
@@ -320,6 +320,18 @@
    height: calc(100% - 56px);
    overflow: auto;
    padding-bottom: 4px;
+
+    &::-webkit-scrollbar-track {
+      display: none;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: transparent;
+    }
+
+    &:hover::-webkit-scrollbar-thumb {
+      background: var(--color-fill-4);
+    }
  }

  .loading-skeleton {
--- a/orion-visor-ui/src/views/host/terminal/components/layout/empty-recommend.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/layout/empty-recommend.vue
@@ -75,9 +75,8 @@
  import type { HostQueryResponse } from '@/api/asset/host';
  import { onMounted, ref } from 'vue';
  import { useTerminalStore } from '@/store';
-  import { PanelSessionType, TerminalTabs } from '../../types/const';
+  import { PanelSessionType, TerminalTabs, emptyRecommendCount } from '../../types/const';

-  const totalCount = 7;
  const { tabManager, hosts, openSession } = useTerminalStore();

  const combinedHandlers = ref<Array<CombinedHandlerItem>>([{
@@ -103,7 +102,7 @@
        ...hosts.hostList.filter(s => s.favorite).map(s => s.id),
        ...hosts.hostList.map(s => s.id)
      ])
-    ].slice(0, totalCount - 1)
+    ].slice(0, emptyRecommendCount - 1)
      .map(s => hosts.hostList.find(t => t.id === s) as HostQueryResponse)
      .filter(Boolean)
      .map(s => {
@@ -116,10 +115,10 @@
    // 插入主机列表
    combinedHandlers.value.push(...combinedHosts);
    // 不足显示的行数用设置补充
-    if (totalCount - 1 - combinedHosts.length > 0) {
+    if (emptyRecommendCount - 1 - combinedHosts.length > 0) {
      const fillTabs = Object.values(TerminalTabs)
        .filter(s => s.key !== TerminalTabs.NEW_CONNECTION.key)
-        .slice(0, totalCount - 1 - combinedHosts.length)
+        .slice(0, emptyRecommendCount - 1 - combinedHosts.length)
        .map(s => {
          return {
            title: s.title,
@@ -147,23 +146,19 @@

  .combined-container {
    padding: 12px;
-    margin: 64px auto 0 auto;
+    margin: 32px auto 0 auto;
    width: @container-width;
-    height: @container-height;
+    max-height: @container-height;
    display: flex;
    flex-direction: column;
    align-items: center;
    box-sizing: content-box;
    overflow: hidden;
-
-    &:hover {
-      overflow: auto;
-    }
  }

  .combined-handler {
    width: @container-width - @transform-x;
-    height: @handler-height;
+    max-height: @handler-height;
    border-radius: 4px;
    margin-bottom: 6px;
    color: var(--color-content-text-1);
--- a/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue
@@ -14,8 +14,8 @@
              :editable="true"
              :hide-content="true"
              :auto-switch="true"
-              @tab-click="k => tabManager.clickTab(k as string)"
-              @delete="k => tabManager.deleteTab(k as string)">
+              @tab-click="(k: string) => tabManager.clickTab(k)"
+              @delete="(k: string) => tabManager.deleteTab(k)">
        <a-tab-pane v-for="tab in tabManager.items"
                    :key="tab.key">
          <!-- 标题 -->
--- a/orion-visor-ui/src/views/host/terminal/components/layout/terminal-panel.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/layout/terminal-panel.vue
@@ -6,8 +6,8 @@
            :auto-switch="true"
            :show-add-button="true"
            @add="openNewConnect"
-            @tab-click="k => panel.clickTab(k as string)"
-            @delete="k => panel.deleteTab(k as string)">
+            @tab-click="(k: string) => panel.clickTab(k)"
+            @delete="(k: string) => panel.deleteTab(k)">
      <!-- 右侧按钮 -->
      <template #extra>
        <a-space class="panel-extra">
--- a/orion-visor-ui/src/views/host/terminal/components/new-connection/hosts-view.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/new-connection/hosts-view.vue
@@ -134,10 +134,4 @@
 </script>

 <style lang="less" scoped>
-  .list-view-container {
-    max-height: 100%;
-    width: 100%;
-    overflow: auto;
-    position: relative;
-  }
 </style>
--- a/orion-visor-ui/src/views/host/terminal/components/new-connection/new-connection-view.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/new-connection/new-connection-view.vue
@@ -10,7 +10,7 @@
                       type="button"
                       class="usn"
                       :options="toRadioOptions(newConnectionTypeKey)"
-                       @change="s => updateTerminalPreference(TerminalPreferenceItem.NEW_CONNECTION_TYPE, s as string, true)" />
+                       @change="(s: string) => updateTerminalPreference(TerminalPreferenceItem.NEW_CONNECTION_TYPE, s, true)" />
        <!-- 过滤 -->
        <a-auto-complete v-model="filterValue"
                         class="host-filter"
--- a/orion-visor-ui/src/views/host/terminal/components/path-bookmark/path-bookmark-drawer.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/path-bookmark/path-bookmark-drawer.vue
@@ -320,6 +320,18 @@
    height: calc(100% - 56px);
    overflow: auto;
    padding-bottom: 4px;
+
+    &::-webkit-scrollbar-track {
+      display: none;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: transparent;
+    }
+
+    &:hover::-webkit-scrollbar-thumb {
+      background: var(--color-fill-4);
+    }
  }

  .loading-skeleton {
--- 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
@@ -20,7 +20,7 @@
          <a-input size="small"
                   :ref="setAutoFocus as unknown as VNodeRef"
                   :model-value="filterValue[0]"
-                   @input="(value) => setFilterValue([value])"
+                   @input="(value: string) => setFilterValue([value])"
                   @press-enter="handleFilterConfirm" />
          <!-- 按钮 -->
          <div class="name-filter-footer">
@@ -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';
--- a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue
@@ -10,13 +10,15 @@
           :unmount-on-close="true"
           :on-before-ok="handlerOk"
           @cancel="handleClose">
-    <!-- 上传目录 -->
-    <div class="item-wrapper">
-      <div class="form-item">
-        <span class="item-label">上传至文件夹</span>
-        <a-input class="item-input"
-                 v-model="parentPath"
-                 placeholder="上传目录" />
+    <div class="upload-container">
+      <!-- 上传目录 -->
+      <div class="item-wrapper">
+        <div class="form-item">
+          <span class="item-label">上传至文件夹</span>
+          <a-input class="item-input"
+                   v-model="parentPath"
+                   placeholder="上传目录" />
+        </div>
      </div>
      <a-space>
        <!-- 选择文件 -->
@@ -112,7 +114,7 @@
    }
    // 获取上传的文件
    const files = fileList.value.map(s => s.file as File);
-    // 上传
+    // 普通上传
    transferManager.addUpload(hostId.value, parentPath.value, files);
    Message.success('已开始上传, 点击右侧传输列表查看进度');
    // 清空
@@ -136,6 +138,11 @@
  @file-size-width: 82px;
  @item-label: 104px;

+  .upload-container {
+    width: 100%;
+    padding: 20px;
+  }
+
  .item-wrapper {
    margin-bottom: 24px;
    display: flex;
@@ -163,6 +170,11 @@
      width: 376px;
    }

+    .form-help {
+      margin: 4px 0 0 @item-label;
+      font-size: 12px;
+      color: var(--color-text-2);
+    }
  }

  .file-list-uploader {
--- a/orion-visor-ui/src/views/host/terminal/components/ssh/ssh-view.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/ssh/ssh-view.vue
@@ -242,7 +242,7 @@
    width: 100%;
    height: calc(100% - @ssh-header-height);
    position: relative;
-    padding: 6px 0 0 6px;
+    padding: 8px;

    .ssh-inst {
      width: 100%;
--- a/orion-visor-ui/src/views/host/terminal/handler/sftp-session.ts
+++ b/orion-visor-ui/src/views/host/terminal/handler/sftp-session.ts
@@ -1,4 +1,5 @@
 import type { ISftpSession, ISftpSessionResolver, ITerminalChannel, TerminalPanelTabItem } from '../types/define';
+import { h } from 'vue';
 import { InputProtocol } from '@/types/protocol/terminal.protocol';
 import { PanelSessionType } from '../types/const';
 import { Modal } from '@arco-design/web-vue';
@@ -77,15 +78,32 @@ export default class SftpSession extends BaseSession implements ISftpSession {
  };

  // 删除文件
-  remove(path: string[]) {
+  remove(paths: string[]) {
+    // 内容
+    const contentNode = h('div', {
+        style: {
+          display: 'flex',
+          flexDirection: 'column',
+          maxHeight: '40vh',
+          overflowY: 'auto'
+        }
+      },
+      paths.map(s => {
+        return h('span', { style: { marginTop: '4px' } }, s);
+      }));
+    // 提示
    Modal.confirm({
-      title: '删除确认',
-      content: `确定要删除 ${path.join(',')} 吗? 确定后将立即删除且无法恢复!`,
+      title: '确定后将立即删除这些文件且无法恢复!',
+      modalStyle: { padding: '24px 32px' },
+      bodyStyle: { marginTop: '-14px' },
+      okButtonProps: { status: 'danger' },
+      okText: '删除',
+      content: () => contentNode,
      onOk: () => {
        this.resolver.setLoading(true);
        this.channel.send(InputProtocol.SFTP_REMOVE, {
          sessionId: this.sessionId,
-          path: path.join('|')
+          path: paths.join('|')
        });
      }
    });
--- a/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-manager.ts
+++ b/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-manager.ts
@@ -43,7 +43,6 @@ export default class SftpTransferManager implements ISftpTransferManager {
        file: s
      };
    });
-    this.transferList.push(...items);
    // 开始传输
    this.startTransfer(items);
  }
--- a/orion-visor-ui/src/views/host/terminal/types/const.ts
+++ b/orion-visor-ui/src/views/host/terminal/types/const.ts
@@ -1,5 +1,8 @@
 import type { ShortcutKeyItem } from './define';

+// 首页推荐数量
+export const emptyRecommendCount = 7;
+
 // 终端 tab
 export const TerminalTabs = {
  NEW_CONNECTION: {
--- 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';
--- 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
@@ -93,8 +93,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)"
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)"
             @expand="loadExecHost">
      <!-- 展开表格 -->
      <template #expand-row="{ record }">
@@ -148,7 +148,7 @@
                    type="text"
                    size="mini"
                    title="ctrl + 左键新页面打开"
-                    @click="(e) => emits('viewLog', record.id, e.ctrlKey)">
+                    @click="(e: any) => emits('viewLog', record.id, e.ctrlKey)">
            日志
          </a-button>
          <!-- 中断 -->
@@ -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();
--- a/orion-visor-ui/src/views/job/exec-job/components/exec-job-form-drawer.vue
+++ b/orion-visor-ui/src/views/job/exec-job/components/exec-job-form-drawer.vue
@@ -421,7 +421,7 @@

  .command-editor {
    width: 100%;
-    height: calc(100vh - 318px);
+    height: calc(100vh - 324px);
  }

  :deep(.arco-input-append) {
--- 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
@@ -84,8 +84,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- cron -->
      <template #expression="{ record }">
        <span class="copy-left"
@@ -118,7 +118,7 @@
                  :unchecked-text="getDictValue(execJobStatusKey, ExecJobStatus.DISABLED)"
                  :checked-value="ExecJobStatus.ENABLED"
                  :unchecked-value="ExecJobStatus.DISABLED"
-                  :before-change="s => updateStatus(record.id, s as number)" />
+                  :before-change="(s: number) => updateStatus(record.id, s)" />
        <!-- 状态 不可编辑 -->
        <a-tag v-else :color="getDictValue(execJobStatusKey, record.status, 'color')">
          {{ getDictValue(execJobStatusKey, record.status) }}
@@ -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();
--- 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
@@ -91,8 +91,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 配置项 -->
      <template #keyName="{ record }">
        <span class="text-copy" @click="copy(record.keyName)">{{ record.keyName }}</span>
@@ -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();
--- 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
@@ -77,8 +77,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 配置项 -->
      <template #keyName="{record}">
        {{ record.keyName }}<span style="margin: 0 4px;">-</span>{{ record.keyDescription }}
@@ -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();

--- a/orion-visor-ui/src/views/user/info/index.vue
+++ b/orion-visor-ui/src/views/user/info/index.vue
@@ -5,7 +5,7 @@
            position="left"
            :lazy-load="true"
            :destroy-on-hide="true"
-            @tab-click="k => clickTab(k as string)">
+            @tab-click="(k: string) => clickTab(k)">
      <!-- 个人信息 -->
      <a-tab-pane key="mineInfo"
                  v-if="!user || hasPermission('infra:system-user:update')"
--- 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
@@ -7,8 +7,8 @@
           :data="tableRenderData"
           :pagination="pagination"
           :bordered="false"
-           @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-           @page-size-change="(size) => fetchTableData(1, size)">
+           @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+           @page-size-change="(size: number) => fetchTableData(1, size)">
    <!-- 操作模块 -->
    <template #module="{ record }">
      <span>{{ getDictValue(operatorLogModuleKey, record.module) }}</span>
@@ -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();

--- 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
@@ -55,8 +55,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 操作模块 -->
      <template #module="{ record }">
        <span>{{ getDictValue(operatorLogModuleKey, record.module) }}</span>
@@ -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();
--- a/orion-visor-ui/src/views/user/role/components/role-table.vue
+++ b/orion-visor-ui/src/views/user/role/components/role-table.vue
@@ -60,8 +60,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 编码 -->
      <template #code="{ record }">
        <a-tag>{{ record.code }}</a-tag>
@@ -77,7 +77,7 @@
                  :unchecked-text="getDictValue(roleStatusKey, RoleStatus.DISABLED)"
                  :checked-value="RoleStatus.ENABLED"
                  :unchecked-value="RoleStatus.DISABLED"
-                  :before-change="(s) => updateStatus(record.id, s as number)" />
+                  :before-change="(s: number) => updateStatus(record.id, s)" />
        <!-- 无修改权限 -->
        <span v-else>
          <span class="circle" :style="{
@@ -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();
--- a/orion-visor-ui/src/views/user/user/components/user-table.vue
+++ b/orion-visor-ui/src/views/user/user/components/user-table.vue
@@ -88,8 +88,8 @@
             :data="tableRenderData"
             :pagination="pagination"
             :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
      <!-- 用户名 -->
      <template #username="{ record }">
        <span class="text-copy" @click="copy(record.username)">
@@ -107,7 +107,7 @@
                  :unchecked-text="getDictValue(userStatusKey, UserStatus.DISABLED)"
                  :checked-value="UserStatus.ENABLED"
                  :unchecked-value="UserStatus.DISABLED"
-                  :before-change="(s) => updateStatus(record.id, s as number)" />
+                  :before-change="(s: number) => updateStatus(record.id, s)" />
        <!-- 无修改权限 -->
        <span v-else>
          <span class="circle" :style="{
@@ -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();
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
    </modules>

    <properties>
-        <revision>2.1.0</revision>
+        <revision>2.1.2</revision>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
        <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
--- a/sql/init-2-schema-tables.sql
+++ b/sql/init-2-schema-tables.sql
@@ -411,9 +411,13 @@ DROP TABLE IF EXISTS `host`;
 CREATE TABLE `host`
 (
    `id`          bigint(0)                                                     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `type`        char(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci      NULL DEFAULT NULL COMMENT '主机类型',
    `name`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL COMMENT '主机名称',
    `code`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL COMMENT '主机编码',
    `address`     varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主机地址',
+    `port`        int(0)                                                        NULL DEFAULT NULL COMMENT '主机端口',
+    `status`      char(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci      NULL DEFAULT NULL COMMENT '主机状态',
+    `config`      json                                                          NULL COMMENT '主机配置',
    `create_time` datetime(0)                                                   NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
    `update_time` datetime(0)                                                   NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
    `creator`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NULL DEFAULT NULL COMMENT '创建人',
@@ -426,31 +430,6 @@ CREATE TABLE `host`
  COLLATE = utf8mb4_general_ci COMMENT = '主机'
  ROW_FORMAT = Dynamic;

-- ----------------------------
-- Table structure for host_config
-- ----------------------------
-DROP TABLE IF EXISTS `host_config`;
-CREATE TABLE `host_config`
-(
-    `id`          bigint(0)                                                    NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `host_id`     bigint(0)                                                    NULL DEFAULT NULL COMMENT '主机id',
-    `type`        varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置类型',
-    `status`      tinyint(0)                                                   NULL DEFAULT 1 COMMENT '状态 0停用 1启用',
-    `config`      json                                                         NULL COMMENT '配置详情',
-    `version`     int(0)                                                       NULL DEFAULT 0 COMMENT '配置版本号',
-    `create_time` datetime(0)                                                  NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `update_time` datetime(0)                                                  NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
-    `creator`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人',
-    `updater`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '更新人',
-    `deleted`     tinyint(1)                                                   NULL DEFAULT 0 COMMENT '是否删除 0未删除 1已删除',
-    PRIMARY KEY (`id`) USING BTREE,
-    INDEX `idx_host_type` (`host_id`, `type`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 1
-  CHARACTER SET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT = '主机配置'
-  ROW_FORMAT = Dynamic;
-
 -- ----------------------------
 -- Table structure for host_connect_log
 -- ----------------------------
Author	SHA1	Message	Date
李佳航	122b568cf5	Merge pull request #46 from dromara/dev Dev	2024-07-29 11:39:00 +08:00
lijiahang	8b97c02d15	🐳 修改 docker 配置.	2024-07-29 11:15:44 +08:00
lijiahang	dcfb016ce5	🔖 升级版本.	2024-07-29 10:33:59 +08:00
lijiahang	c842de9e23	⚡ 修改 hook 位置.	2024-07-29 10:25:11 +08:00
李佳航	1b2753a2b7	Merge pull request #44 from dromara/dev Dev	2024-07-26 11:11:47 +08:00
lijiahang	29b44b8b77	🚨 修复 ts 构建报错.	2024-07-26 10:56:36 +08:00
lijiahang	7290b1364c	🔖 升级版本.	2024-07-26 10:25:38 +08:00
lijiahang	3851ead8bb	💄 修改滚动条样式.	2024-07-26 10:18:39 +08:00
lijiahang	305312cc26	🐛 修复文件上传列表显示错误.	2024-07-25 13:46:48 +08:00