From 305312cc26e95f1d21c493a0e2fb62fd8d0b06cd Mon Sep 17 00:00:00 2001 From: lijiahang Date: Thu, 25 Jul 2024 13:46:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/sftp/sftp-upload-modal.vue | 28 +++++++++++++------ .../host/terminal/handler/sftp-session.ts | 26 ++++++++++++++--- .../terminal/handler/sftp-transfer-manager.ts | 1 - 3 files changed, 42 insertions(+), 13 deletions(-) diff --git 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 index 4e2972f7..b517328f 100644 --- 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"> - -
-
- 上传至文件夹 - +
+ +
+
+ 上传至文件夹 + +
@@ -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 { diff --git a/orion-visor-ui/src/views/host/terminal/handler/sftp-session.ts b/orion-visor-ui/src/views/host/terminal/handler/sftp-session.ts index b2fc5573..c5c3f9fb 100644 --- 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('|') }); } }); diff --git 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 index 1beef917..8888f49f 100644 --- 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); } From 3851ead8bbd15114728df3930c24e22010c17609 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Fri, 26 Jul 2024 10:18:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?:lipstick:=20=E4=BF=AE=E6=94=B9=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E6=A0=B7=E5=BC=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/exec/log/panel-modal/index.vue | 5 -- .../components/exec/log/panel/exec-host.vue | 54 +++++++++++-------- .../src/store/modules/cache/index.ts | 10 +--- .../src/store/modules/cache/types.ts | 29 ++++------ .../src/store/modules/menu/index.ts | 2 +- .../components/exec-command-panel-history.vue | 24 +++++---- .../command-snippet-drawer.vue | 12 +++++ .../components/layout/empty-recommend.vue | 19 +++---- .../components/new-connection/hosts-view.vue | 6 --- .../path-bookmark/path-bookmark-drawer.vue | 12 +++++ .../host/terminal/components/ssh/ssh-view.vue | 2 +- .../src/views/host/terminal/types/const.ts | 3 ++ .../components/exec-job-form-drawer.vue | 2 +- 13 files changed, 91 insertions(+), 89 deletions(-) diff --git a/orion-visor-ui/src/components/exec/log/panel-modal/index.vue b/orion-visor-ui/src/components/exec/log/panel-modal/index.vue index 9d5e7f1c..7bb22859 100644 --- 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) { diff --git a/orion-visor-ui/src/components/exec/log/panel/exec-host.vue b/orion-visor-ui/src/components/exec/log/panel/exec-host.vue index 6289dd68..48877527 100644 --- 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 @@
-
- -
- {{ item.hostName }} - {{ item.hostAddress }} + +
+ +
+ {{ item.hostName }} + {{ item.hostAddress }} +
+ +
+ + {{ getDictValue(execHostStatusKey, item.status) }} + +
- -
- - {{ getDictValue(execHostStatusKey, item.status) }} - -
-
+
@@ -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; diff --git a/orion-visor-ui/src/store/modules/cache/index.ts b/orion-visor-ui/src/store/modules/cache/index.ts index 2c54ec0c..91a831ee 100644 --- 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 => ({}), diff --git a/orion-visor-ui/src/store/modules/cache/types.ts b/orion-visor-ui/src/store/modules/cache/types.ts index 41fda8f5..6414981c 100644 --- 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; } diff --git a/orion-visor-ui/src/store/modules/menu/index.ts b/orion-visor-ui/src/store/modules/menu/index.ts index 7a69ba9e..7ef85ba3 100644 --- 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', { diff --git 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 index 6a0bec60..7a6762e0 100644 --- 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 @@
-
-
+
@@ -32,7 +33,7 @@ {{ record.description }}
-
+
@@ -110,14 +111,16 @@ diff --git 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 index 04ab7e94..f917e048 100644 --- 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 { diff --git 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 index 1c073d71..f5af3cea 100644 --- 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%; diff --git a/orion-visor-ui/src/views/host/terminal/types/const.ts b/orion-visor-ui/src/views/host/terminal/types/const.ts index efbc7d06..66e467fb 100644 --- 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: { diff --git 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 index 0106658c..68a6d121 100644 --- 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) { From 7290b1364c7b38f45c8f524d41b95f712a9289c9 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Fri, 26 Jul 2024 10:25:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:bookmark:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docker-compose-testing.yml | 6 +++--- docker-compose.yml | 6 +++--- docker/mysql/build.sh | 2 +- docker/redis/build.sh | 2 +- docker/service/build.sh | 2 +- orion-visor-dependencies/pom.xml | 2 +- .../com/orion/visor/framework/common/constant/AppConst.java | 2 +- orion-visor-ui/.env.development | 2 +- orion-visor-ui/.env.production | 2 +- orion-visor-ui/package.json | 2 +- pom.xml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 58f6bd49..ca325231 100644 --- 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) * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目! * 🎭 演示环境部分功能不可用, 完整功能请本地部署! * 📛 演示环境请不要随便删除数据! diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml index bbbe180e..0629ee30 100644 --- a/docker-compose-testing.yml +++ b/docker-compose-testing.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-visor-service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.1 privileged: true ports: - 1081:80 @@ -32,7 +32,7 @@ services: - orion-visor-mysql - orion-visor-redis orion-visor-mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.1 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 10 start_period: 3s orion-visor-redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.1 privileged: true ports: - 6380:6379 diff --git a/docker-compose.yml b/docker-compose.yml index 1bc69d33..4672638a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-visor-service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.1 privileged: true ports: - 1081:80 @@ -32,7 +32,7 @@ services: - orion-visor-mysql - orion-visor-redis orion-visor-mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.1 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 10 start_period: 3s orion-visor-redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.1 privileged: true ports: - 6380:6379 diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 567ab812..5c9bfe5d 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.1.0 +version=2.1.1 cp -r ../../sql ./sql docker build -t orion-visor-mysql:${version} . rm -rf ./sql diff --git a/docker/redis/build.sh b/docker/redis/build.sh index 2dfa6413..6d3efd52 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.1.0 +version=2.1.1 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} diff --git a/docker/service/build.sh b/docker/service/build.sh index 50a453b0..238e887f 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.1.0 +version=2.1.1 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} . diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 1458dc65..8ed63d50 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/dromara/orion-visor - 2.1.0 + 2.1.1 2.7.17 2.7.15 1.5.0 diff --git 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 index 836aee9a..6f2af3e3 100644 --- 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.1"; /** * 同 ${spring.application.name} diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index 850ca935..d32c25d0 100644 --- 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.1' VITE_APP_RELEASE= 'community' VITE_SFTP_PREVIEW_MB= 2 VITE_DEMO_MODE= false diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index 2fd2a0f8..75894693 100644 --- 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.1' VITE_APP_RELEASE= 'community' VITE_SFTP_PREVIEW_MB= 2 VITE_DEMO_MODE= false diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index af3f2179..22779f40 100644 --- 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.1", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/pom.xml b/pom.xml index 9e4160dd..f8216ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.1.0 + 2.1.1 8 8 3.0.0-M5 From 29b44b8b7710ab7e026fbaf83b5bda05c84a30cf Mon Sep 17 00:00:00 2001 From: lijiahang Date: Fri, 26 Jul 2024 10:56:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?:rotating=5Flight:=20=E4=BF=AE=E5=A4=8D=20t?= =?UTF-8?q?s=20=E6=9E=84=E5=BB=BA=E6=8A=A5=E9=94=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/orion-vue-views-components-table.vue.vm | 4 ++-- orion-visor-ui/src/components/app/navbar/index.vue | 2 +- .../src/components/asset/host-group/tree/index.vue | 2 +- .../src/components/exec/template/modal/index.vue | 4 ++-- .../src/components/meta/history/modal/index.vue | 4 ++-- orion-visor-ui/src/components/system/menu/tree/index.vue | 4 ++-- .../components/view/card-list/components/card-header.vue | 8 ++++---- .../connect-log/components/connect-log-table.vue | 4 ++-- .../asset-audit/sftp-log/components/sftp-log-table.vue | 4 ++-- .../host-identity/components/host-identity-table.vue | 4 ++-- .../views/asset/host-key/components/host-key-table.vue | 4 ++-- .../src/views/asset/host-list/components/host-table.vue | 4 ++-- .../components/exec-command-log-table.vue | 6 +++--- .../exec/exec-template/components/exec-template-table.vue | 4 ++-- .../exec/upload-task/components/upload-task-table.vue | 4 ++-- .../host/terminal/components/layout/layout-header.vue | 4 ++-- .../host/terminal/components/layout/terminal-panel.vue | 4 ++-- .../components/new-connection/new-connection-view.vue | 2 +- .../views/host/terminal/components/sftp/sftp-table.vue | 2 +- .../job/exec-job-log/components/exec-job-log-table.vue | 6 +++--- .../src/views/job/exec-job/components/exec-job-table.vue | 6 +++--- .../views/system/dict-key/components/dict-key-table.vue | 4 ++-- .../system/dict-value/components/dict-value-table.vue | 4 ++-- orion-visor-ui/src/views/user/info/index.vue | 2 +- .../operator-log/components/operator-log-simple-table.vue | 4 ++-- .../user/operator-log/components/operator-log-table.vue | 4 ++-- .../src/views/user/role/components/role-table.vue | 6 +++--- .../src/views/user/user/components/user-table.vue | 6 +++--- 28 files changed, 58 insertions(+), 58 deletions(-) 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 d89b76f8..145d5db4 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 @@ -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})}) diff --git a/orion-visor-ui/src/components/app/navbar/index.vue b/orion-visor-ui/src/components/app/navbar/index.vue index 0ec8d4da..cad3a25d 100644 --- a/orion-visor-ui/src/components/app/navbar/index.vue +++ b/orion-visor-ui/src/components/app/navbar/index.vue @@ -50,7 +50,7 @@ - +