From 10e79ef1cf00e3e22585816840c3af4f41b57636 Mon Sep 17 00:00:00 2001 From: engigu Date: Wed, 14 Jan 2026 19:25:26 +0800 Subject: [PATCH 1/4] fix: xterminal run error --- web/src/components/XTerminal.vue | 20 +++++++++++++++----- web/src/views/editor/Editor.vue | 11 ++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/web/src/components/XTerminal.vue b/web/src/components/XTerminal.vue index a3c8374..b913e72 100644 --- a/web/src/components/XTerminal.vue +++ b/web/src/components/XTerminal.vue @@ -71,7 +71,7 @@ function initTerminal(forceConnect = false) { try { fitAddon?.fit() } catch (e) { - console.warn('Terminal fit failed:', e) + // 忽略 fit 错误 } }, 50) @@ -79,10 +79,10 @@ function initTerminal(forceConnect = false) { // autoConnect 或者强制连接时才连接 if (props.autoConnect || forceConnect) { - // 延迟连接，确保终端完全初始化 + // 延迟连接，确保终端完全初始化和旧连接完全关闭 setTimeout(() => { connectWebSocket() - }, 100) + }, 200) } // 清除当前输入行（Windows 模式用） @@ -144,12 +144,23 @@ function initTerminal(forceConnect = false) { } function connectWebSocket() { + // 如果已有连接，先关闭 + if (ws && (ws.readyState === WebSocket.OPEN || ws.readyState === WebSocket.CONNECTING)) { + ws.close() + ws = null + } + const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:' const baseUrl = (window as any).__BASE_URL__ || '' const apiVersion = (window as any).__API_VERSION__ || '/api/v1' const wsUrl = `${protocol}//${window.location.host}${baseUrl}${apiVersion}/terminal/ws` - ws = new WebSocket(wsUrl) + try { + ws = new WebSocket(wsUrl) + } catch { + terminal?.writeln('\x1b[31m无法创建 WebSocket 连接\x1b[0m') + return + } ws.onopen = () => { terminal?.writeln('\x1b[32m已连接到终端\x1b[0m') @@ -159,7 +170,6 @@ function connectWebSocket() { if (props.initialCommand) { setTimeout(() => { if (ws && ws.readyState === WebSocket.OPEN) { - // 直接发送命令，PTY 会回显 ws.send(props.initialCommand + '\r') } }, 100) diff --git a/web/src/views/editor/Editor.vue b/web/src/views/editor/Editor.vue index 75a02c7..9876e0b 100644 --- a/web/src/views/editor/Editor.vue +++ b/web/src/views/editor/Editor.vue @@ -195,14 +195,19 @@ async function runScript() { } showTerminalDialog.value = true - // 等待 DOM 更新后初始化终端 + // 等待 DOM 更新后初始化终端，增加延迟确保 Dialog 完全渲染 await nextTick() - terminalRef.value?.initTerminal(true) + setTimeout(() => { + terminalRef.value?.initTerminal(true) + }, 100) } function closeTerminal() { showTerminalDialog.value = false - terminalRef.value?.dispose() + // 延迟清理，确保 Dialog 关闭动画完成 + setTimeout(() => { + terminalRef.value?.dispose() + }, 300) } async function handleMove(oldPath: string, newPath: string) { From b37eaf02fb0f7d951ea68854ab6992412954e690 Mon Sep 17 00:00:00 2001 From: engigu Date: Wed, 14 Jan 2026 19:46:25 +0800 Subject: [PATCH 2/4] fix: open url file render error --- web/src/router/index.ts | 2 +- web/src/views/editor/Editor.vue | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/src/router/index.ts b/web/src/router/index.ts index 7bf0afd..08fae73 100644 --- a/web/src/router/index.ts +++ b/web/src/router/index.ts @@ -39,7 +39,7 @@ const router = createRouter({ children: [ { path: '', name: 'dashboard', component: () => import('@/views/dashboard/Dashboard.vue') }, { path: 'tasks', name: 'tasks', component: () => import('@/views/tasks/Tasks.vue') }, - { path: 'editor/:path(.*)?', name: 'editor', component: () => import('@/views/editor/Editor.vue') }, + { path: 'editor', name: 'editor', component: () => import('@/views/editor/Editor.vue') }, { path: 'environments', name: 'environments', component: () => import('@/views/environments/Environments.vue') }, { path: 'dependencies', name: 'dependencies', component: () => import('@/views/dependencies/Dependencies.vue') }, { path: 'agents', name: 'agents', component: () => import('@/views/agents/Agents.vue') }, diff --git a/web/src/views/editor/Editor.vue b/web/src/views/editor/Editor.vue index 9876e0b..19d5565 100644 --- a/web/src/views/editor/Editor.vue +++ b/web/src/views/editor/Editor.vue @@ -76,8 +76,8 @@ async function loadTree() { async function handleSelect(node: FileNode) { selectedPath.value = node.path - // 更新 URL - router.replace({ name: 'editor', params: { path: node.path } }) + // 更新 URL 使用 query 参数 + router.replace({ name: 'editor', query: { file: node.path } }) if (node.isDir) { if (expandedDirs.value.has(node.path)) { @@ -217,10 +217,10 @@ async function handleMove(oldPath: string, newPath: string) { if (selectedFile.value === oldPath) { selectedFile.value = newPath selectedPath.value = newPath - router.replace({ name: 'editor', params: { path: newPath } }) + router.replace({ name: 'editor', query: { file: newPath } }) } else if (selectedPath.value === oldPath) { selectedPath.value = newPath - router.replace({ name: 'editor', params: { path: newPath } }) + router.replace({ name: 'editor', query: { file: newPath } }) } await loadTree() } catch { @@ -314,7 +314,7 @@ function expandParentDirs(path: string) { // 从 URL 初始化选中状态 async function initFromUrl() { await loadTree() - const urlPath = route.params.path as string + const urlPath = route.query.file as string if (urlPath) { selectedPath.value = urlPath expandParentDirs(urlPath) @@ -324,6 +324,7 @@ async function initFromUrl() { selectedFile.value = urlPath fileContent.value = res.content originalContent.value = res.content + isEditMode.value = false } catch { // 可能是文件夹，忽略错误 } From 8c5731f9f87acf9367d584e40ccb20258530c615 Mon Sep 17 00:00:00 2001 From: engigu Date: Thu, 15 Jan 2026 10:06:55 +0800 Subject: [PATCH 3/4] Enhance README with additional badges Added badges for image tags, latest version, and image size. --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 73ab024..6ce33bb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,10 @@ -# 白虎面板 [![Hits](https://hits.sh/github.com/engigu/baihu-panel.svg?view=today-total)](https://hits.sh/github.com/engigu/baihu-panel/) +# 白虎面板 + +[![Hits](https://hits.sh/github.com/engigu/baihu-panel.svg?view=today-total)](https://hits.sh/github.com/engigu/baihu-panel/) +[![Image Tags](https://ghcr-badge.egpl.dev/engigu/baihu/tags?color=%2344cc11&ignore=latest%2Cmain*%2Cdev&n=3&label=image+tags&trim=)](https://ghcr-badge.egpl.dev/engigu/baihu/tags) +![Latest Version](https://ghcr-badge.egpl.dev/engigu/baihu/latest_tag?color=%2344cc11&ignore=latest&label=version&trim=) +![Image Size](https://ghcr-badge.egpl.dev/engigu/baihu/size?color=%2344cc11&tag=latest&label=image+size&trim=) + 白虎面板是一个轻量级定时任务管理系统，基于`Go`+`Vue3`构建，`docker`或者`docker-compose`，内置`python3`、`nodejs`、`bash`环境，开箱即用。 From 8f30c926a42a36c4361bff62da7915ff992d4734 Mon Sep 17 00:00:00 2001 From: engigu Date: Thu, 15 Jan 2026 11:04:04 +0800 Subject: [PATCH 4/4] Update README with new Docker badge information --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6ce33bb..4700a4f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # 白虎面板 [![Hits](https://hits.sh/github.com/engigu/baihu-panel.svg?view=today-total)](https://hits.sh/github.com/engigu/baihu-panel/) -[![Image Tags](https://ghcr-badge.egpl.dev/engigu/baihu/tags?color=%2344cc11&ignore=latest%2Cmain*%2Cdev&n=3&label=image+tags&trim=)](https://ghcr-badge.egpl.dev/engigu/baihu/tags) -![Latest Version](https://ghcr-badge.egpl.dev/engigu/baihu/latest_tag?color=%2344cc11&ignore=latest&label=version&trim=) -![Image Size](https://ghcr-badge.egpl.dev/engigu/baihu/size?color=%2344cc11&tag=latest&label=image+size&trim=) - +[![Image Tags](https://ghcr-badge.egpl.dev/engigu/baihu/tags?color=%2344cc11&ignore=latest%2Cmain*%2Cdev&n=3&label=docker+tags&trim=)](https://ghcr-badge.egpl.dev/engigu/baihu/tags) +![Latest Version](https://ghcr-badge.egpl.dev/engigu/baihu/latest_tag?color=%2344cc11&ignore=latest%2Cmain*&label=docker+version&trim=) +![Image Size](https://ghcr-badge.egpl.dev/engigu/baihu/size?color=%2344cc11&tag=latest&label=docker+image&trim=) +![Image pulls](https://img.shields.io/badge/dynamic/json?url=https://ghcr-badge.elias.eu.org/api/engigu/baihu-panel/baihu&query=downloadCount&style=flat&label=docker%20pulls&color=44cc11) 白虎面板是一个轻量级定时任务管理系统，基于`Go`+`Vue3`构建，`docker`或者`docker-compose`，内置`python3`、`nodejs`、`bash`环境，开箱即用。