diff --git a/README.md b/README.md index 0eba7c57..c49ed6c4 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,8 @@ demo: http://101.43.254.243:1081/#/ * 资产管理: 支持灵活配置主机分组, 统一管理主机、秘钥和身份。 * 资产授权: 可将资产数据授权给指定角色和用户。 * 权限控制: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。 -* 在线终端: 提供便捷的在线 Web 终端服务, 支持自定义快捷键和主题风格。 -* 文件管理: 实现远程主机文件的批量上传、下载和在线编辑等操作。 +* 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。 +* 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。 * 可扩展性: 前后端代码规范统一, 代码质量高、健壮且易于阅读和扩展。 [comment]: <> ( FIXME * 批量操作: 支持远程主机批量执行命令 以及 批量执行上传文件) diff --git a/docs/README.md b/docs/README.md index fa01eada..55b559e6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -44,8 +44,8 @@ demo: http://101.43.254.243:1081/#/ * 资产管理: 支持灵活配置主机分组, 统一管理主机、秘钥和身份。 * 资产授权: 可将资产数据授权给指定角色和用户。 * 权限控制: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。 -* 在线终端: 提供便捷的在线 Web 终端服务, 支持自定义快捷键和主题风格。 -* 文件管理: 实现远程主机文件的批量上传、下载和在线编辑等操作。 +* 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。 +* 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。 * 可扩展性: 前后端代码规范统一, 代码质量高、健壮且易于阅读和扩展。 [comment]: <> ( FIXME * 批量操作: 支持远程主机批量执行命令 以及 批量执行上传文件) diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataExtraServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataExtraServiceImpl.java index e362cfc5..13920b61 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataExtraServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataExtraServiceImpl.java @@ -147,7 +147,6 @@ public class DataExtraServiceImpl implements DataExtraService { @Override public Map getExtraItemValuesByCache(Long userId, String type, String item) { - // todo TEST // 查询缓存 String key = DataExtraCacheKeyDefine.DATA_EXTRA.format(userId, type, item); Map entities = RedisMaps.entities(key); @@ -187,7 +186,6 @@ public class DataExtraServiceImpl implements DataExtraService { @Override public Integer deleteByUserId(Long userId) { - // 查询数据 TODO TEST List list = this.getCacheSelectWrapper() .eq(DataExtraDO::getUserId, userId) .then() @@ -204,7 +202,6 @@ public class DataExtraServiceImpl implements DataExtraService { @Override public Integer deleteByRelId(String type, Long relId) { - // 查询数据 TODO TEST List list = this.getCacheSelectWrapper() .eq(DataExtraDO::getType, type) .eq(DataExtraDO::getRelId, relId) diff --git a/orion-ops-ui/src/components/app/navbar/index.vue b/orion-ops-ui/src/components/app/navbar/index.vue index 0a889302..a2684422 100644 --- a/orion-ops-ui/src/components/app/navbar/index.vue +++ b/orion-ops-ui/src/components/app/navbar/index.vue @@ -160,7 +160,7 @@
  • - + void>(openAppSettingKey); + const openAppSetting = inject(openAppSettingKey) as () => void; // 注入收缩菜单 - const toggleDrawerMenu = inject<() => void>(toggleDrawerMenuKey); + const toggleDrawerMenu = inject(toggleDrawerMenuKey) as () => void; // 切换主题 const handleToggleTheme = () => { diff --git a/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-view.vue b/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-view.vue index 6d95c78b..f97b0bb0 100644 --- a/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-view.vue +++ b/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-view.vue @@ -137,13 +137,13 @@ - + + content="主机设置">
    @@ -185,7 +185,7 @@ import { dataColor } from '@/utils'; import { tagColor } from '@/views/asset/host-list/types/const'; import { updateHostAlias } from '@/api/asset/host-extra'; - import { openSshSettingModalKey, PanelSessionType } from '../../types/terminal.const'; + import { openSettingModalKey, PanelSessionType } from '../../types/terminal.const'; import { useTerminalStore } from '@/store'; const props = defineProps<{ @@ -231,7 +231,7 @@ }; // 打开配置 - const openSetting = inject(openSshSettingModalKey) as (record: HostQueryResponse) => void; + const openSetting = inject(openSettingModalKey) as (record: HostQueryResponse) => void; // 设置收藏 const setFavorite = async (item: HostQueryResponse) => { diff --git a/orion-ops-ui/src/views/host/terminal/components/new-connection/hosts-view.vue b/orion-ops-ui/src/views/host/terminal/components/new-connection/hosts-view.vue index 80d6b4a8..2af34eb0 100644 --- a/orion-ops-ui/src/views/host/terminal/components/new-connection/hosts-view.vue +++ b/orion-ops-ui/src/views/host/terminal/components/new-connection/hosts-view.vue @@ -21,8 +21,8 @@ class="list-view-container" :hostList="hostList" empty-value="暂无连接记录, 快去体验吧!" /> - - + +
    @@ -34,12 +34,12 @@ + + + + diff --git a/orion-ops-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue b/orion-ops-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue new file mode 100644 index 00000000..cbc5b268 --- /dev/null +++ b/orion-ops-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue @@ -0,0 +1,89 @@ + + + + + + + diff --git a/orion-ops-ui/src/views/host/terminal/components/setting/ssh-extra-modal.vue b/orion-ops-ui/src/views/host/terminal/components/setting/ssh-extra-modal.vue deleted file mode 100644 index 65dfb2b5..00000000 --- a/orion-ops-ui/src/views/host/terminal/components/setting/ssh-extra-modal.vue +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - diff --git a/orion-ops-ui/src/views/host/terminal/types/terminal.const.ts b/orion-ops-ui/src/views/host/terminal/types/terminal.const.ts index 9711b117..c85ff292 100644 --- a/orion-ops-ui/src/views/host/terminal/types/terminal.const.ts +++ b/orion-ops-ui/src/views/host/terminal/types/terminal.const.ts @@ -42,6 +42,12 @@ export const NewConnectionType = { LATEST: 'latest' }; +// 主机额外配置项 +export const ExtraSettingItems = { + SSH: 'ssh', + COLOR: 'color' +}; + // 主机额外配置 ssh 认证方式 export const ExtraSshAuthType = { // 使用默认认证方式 @@ -318,8 +324,8 @@ export const TransferReceiverType = { DOWNLOAD_ERROR: 'downloadError', }; -// 打开 sshSettingModal key -export const openSshSettingModalKey = Symbol(); +// 打开 settingModal key +export const openSettingModalKey = Symbol(); // 打开 sftpCreateModal key export const openSftpCreateModalKey = Symbol();