diff --git a/docs/about/change-log.md b/docs/about/change-log.md index 9c34ea0e..e06b3fc8 100644 --- a/docs/about/change-log.md +++ b/docs/about/change-log.md @@ -17,6 +17,7 @@ * 🌈 新增 主机终端书签路径 * 🌈 新增 命令执行日志添加 `ansi` 日志 `app.exec-log.append-ansi` * 🌈 新增 定时删除命令执行日志文件 `app.exec-log.auto-clear` +* 🌈 新增 终端设置添加了几个全局快捷键 * 🔨 优化 通用分组模型添加 `userId` * 🔨 优化 退出登录不重定向 * 🔨 优化 动态设置页面标题 diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/AppConst.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/AppConst.java index cfea15dc..9ab18991 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/AppConst.java +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/AppConst.java @@ -22,6 +22,6 @@ public interface AppConst extends OrionConst { String GITEE = "https://gitee.com/lijiahangmax/orion-ops-pro"; - String ISSUES = "https://gitee.com/lijiahangmax/orion-ops-pro/issues"; + String ISSUES = "https://github.com/lijiahangmax/orion-ops-pro/issues"; } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java index 6d694692..a4778512 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java @@ -66,6 +66,10 @@ public class TerminalPreferenceStrategy implements IPreferenceStrategy roles = systemRoleDAO.selectRoleByUserId(id); + // 返回 + SystemUserVO user = SystemUserConvert.MAPPER.to(record); + user.setRoles(SystemRoleConvert.MAPPER.to(roles)); + return user; } @Override diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml index 6f5442eb..101b4020 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml @@ -28,4 +28,11 @@ AND role_id IN (SELECT id FROM system_role WHERE CODE = #{code} AND deleted = 0) LIMIT 1 + + diff --git a/orion-ops-ui/src/assets/style/arco-extends.less b/orion-ops-ui/src/assets/style/arco-extends.less index adf66ba3..87470c5f 100644 --- a/orion-ops-ui/src/assets/style/arco-extends.less +++ b/orion-ops-ui/src/assets/style/arco-extends.less @@ -74,7 +74,7 @@ & > .arco-card-header { height: auto; - padding: 16px; + padding: 12px 16px; border: none; } diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue b/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue index 7fac4797..bf0fb944 100644 --- a/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue +++ b/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue @@ -46,6 +46,8 @@ import TerminalShortcutSetting from '../setting/shortcut/terminal-shortcut-setting.vue'; import TerminalPanelsView from '@/views/host/terminal/components/layout/terminal-panels-view.vue'; + const emits = defineEmits(['openCommandSnippet', 'openPathBookmark', 'openTransferList', 'screenshot']); + const { preference, tabManager, getCurrentSession } = useTerminalStore(); // 监听 tab 切换 @@ -97,6 +99,22 @@ // 切换到新建连接 tab tabManager.openTab(TerminalTabs.NEW_CONNECTION); break; + case TerminalShortcutKeys.OPEN_COMMAND_SNIPPET: + // 打开命令片段 + emits('openCommandSnippet'); + break; + case TerminalShortcutKeys.OPEN_PATH_BOOKMARK: + // 打开书签路径 + emits('openPathBookmark'); + break; + case TerminalShortcutKeys.OPEN_TRANSFER_LIST: + // 打开文件传输列表 + emits('openTransferList'); + break; + case TerminalShortcutKeys.SCREENSHOT: + // 截图 + emits('screenshot'); + break; default: break; } diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/right-sidebar.vue b/orion-ops-ui/src/views/host/terminal/components/layout/right-sidebar.vue index cae07693..0a7a0a59 100644 --- a/orion-ops-ui/src/views/host/terminal/components/layout/right-sidebar.vue +++ b/orion-ops-ui/src/views/host/terminal/components/layout/right-sidebar.vue @@ -8,12 +8,6 @@ - - - - - - @@ -24,38 +18,28 @@