diff --git a/docker/orion-ops-pro/build.sh b/docker/orion-ops-pro/build.sh index be4e2a1f..4e93fa61 100644 --- a/docker/orion-ops-pro/build.sh +++ b/docker/orion-ops-pro/build.sh @@ -1,3 +1,3 @@ mv ../../orion-ops-launch/target/orion-ops-launch.jar ./ mv ../../orion-ops-ui/dist ./dist -docker build -t orion-ops-pro:1.0.2 . +docker build -t orion-ops-pro:1.0.3 . diff --git a/docs/about/change-log.md b/docs/about/change-log.md index 9914952d..a5fc99e2 100644 --- a/docs/about/change-log.md +++ b/docs/about/change-log.md @@ -2,18 +2,20 @@ ## v1.0.3 -`2024-03-2` `release` +`2024-03-24` `release` * 🚀 升级 `arco design` 到 `2.55.0` * 🐞 修复 新创建的用户登录会跳转到 **404** * 🐞 修复 分配菜单模态框没有子菜单不显示的问题 -* 🐞 修复 终端无法粘贴 -* 🐞 修复 `工作台` `快捷操作` 会展示隐藏的菜单 +* 🐞 修复 工作台页面快捷操作面板会展示隐藏的菜单 +* 🐞 修复 主机终端无法粘贴 +* 🐞 修复 卡片列表组件控制台 warn 提示 +* 🐞 修复 关闭终端时控制台提示 handleResize 错误信息 * 🔨 修改 系统菜单渲染逻辑 (移除 JSX 构建时不会提示 JSX.IntrinsicElements) [如何升级](/about/update.md?id=_v103) -## v1.0.2 +## v1.0.3 `2024-03-22` `release` diff --git a/docs/about/roadmap.md b/docs/about/roadmap.md index 3a63dc57..75e9b7f6 100644 --- a/docs/about/roadmap.md +++ b/docs/about/roadmap.md @@ -12,3 +12,7 @@ * 资产授权 UI 改版 * RDP 远程桌面 * 接入 config 后端动态配置 + +## 已知问题 🐞 + +* 顶部菜单折叠宽度计算有问题 (arco 框架内问题) diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpListHandler.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpListHandler.java index e45c91fe..35ba4830 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpListHandler.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpListHandler.java @@ -26,6 +26,8 @@ import java.util.List; @Component public class SftpListHandler extends AbstractTerminalHandler { + private static final String HOME_PATH = "~"; + @Override public void handle(WebSocketSession channel, SftpListRequest payload) { // 获取会话 @@ -37,7 +39,7 @@ public class SftpListHandler extends AbstractTerminalHandler { List list = Lists.empty(); try { // 空目录则直接获取 home 目录 - if (Strings.isBlank(path)) { + if (HOME_PATH.equals(path)) { path = session.getHome(); } // 文件列表 diff --git a/orion-ops-ui/src/components/app/footer/index.vue b/orion-ops-ui/src/components/app/app-footer/index.vue similarity index 100% rename from orion-ops-ui/src/components/app/footer/index.vue rename to orion-ops-ui/src/components/app/app-footer/index.vue diff --git a/orion-ops-ui/src/components/exec/log/panel/log-appender.ts b/orion-ops-ui/src/components/exec/log/panel/log-appender.ts index 3551201b..33da5bb2 100644 --- a/orion-ops-ui/src/components/exec/log/panel/log-appender.ts +++ b/orion-ops-ui/src/components/exec/log/panel/log-appender.ts @@ -272,7 +272,9 @@ export default class LogAppender implements ILogAppender { .filter(Boolean) .forEach(s => s.dispose()); // 卸载终端 - s.terminal?.dispose(); + setTimeout(() => { + s.terminal?.dispose(); + }, 300); } catch (e) { // 卸载可能会报错 } diff --git a/orion-ops-ui/src/components/view/card-list/components/card-item.vue b/orion-ops-ui/src/components/view/card-list/components/card-item.vue index 88831318..9d2b47d7 100644 --- a/orion-ops-ui/src/components/view/card-list/components/card-item.vue +++ b/orion-ops-ui/src/components/view/card-list/components/card-item.vue @@ -49,7 +49,10 @@ 'field-value', field.ellipsis ? 'field-value-ellipsis' : '' ]"> - + {{ item[field.dataIndex] }} @@ -87,7 +90,7 @@ const props = defineProps(); const emits = defineEmits(['emitter']); diff --git a/orion-ops-ui/src/components/view/card-list/index.vue b/orion-ops-ui/src/components/view/card-list/index.vue index 32243330..c4c769f8 100644 --- a/orion-ops-ui/src/components/view/card-list/index.vue +++ b/orion-ops-ui/src/components/view/card-list/index.vue @@ -29,7 +29,7 @@ @@ -41,12 +41,18 @@ @emitter="dispatchEmitter"> @@ -82,7 +88,7 @@ import useEmitter from '@/hooks/emitter'; const props = withDefaults(defineProps(), { - key: 'id', + rowKey: 'id', pagination: false, loading: false, cardHeight: '100%', diff --git a/orion-ops-ui/src/components/view/card-list/types/props.ts b/orion-ops-ui/src/components/view/card-list/types/props.ts index a0d702ad..3ac624cc 100644 --- a/orion-ops-ui/src/components/view/card-list/types/props.ts +++ b/orion-ops-ui/src/components/view/card-list/types/props.ts @@ -4,7 +4,7 @@ import type { CardFieldConfig, CardPosition, CardRecord, ColResponsiveValue, Han // 卡片属性 export interface CardProps { - key?: string; + rowKey?: string; pagination?: PaginationProps | boolean; loading?: boolean; fieldConfig?: CardFieldConfig; diff --git a/orion-ops-ui/src/layout/default-layout.vue b/orion-ops-ui/src/layout/default-layout.vue index a2aadf52..11f959b3 100644 --- a/orion-ops-ui/src/layout/default-layout.vue +++ b/orion-ops-ui/src/layout/default-layout.vue @@ -47,7 +47,7 @@ -