From 4b0d8e5042a5d0dafa533823926ef2215432f426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=B4=E5=A4=A9?= Date: Sat, 16 May 2026 13:46:24 +0800 Subject: [PATCH] fix(ui): hide useless docker manager on desktop, auto-start hermes dashboard, polish layout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Four independent UI fixes the user spotted in one screenshot tour: services.js — desktop docker manager ClawPanel is not a docker management tool. The "Docker 多实例管理" block on the OpenClaw services page only makes sense for users who deployed ClawPanel itself in Web mode (serve.js / dev-api) and want to orchestrate multiple OpenClaw containers from one panel. On desktop Tauri this block always degrades to either "未启用" with a connect ENOENT error (no docker daemon on the user box) or to a generic "unavailable" placeholder — pure visual noise. Skip the whole config-section in render() and bail out of loadDockerManager() when isTauriRuntime() is true. Web mode keeps the feature. profiles.js — Hermes Profile manager could not load Profile API only exists on the Hermes Dashboard process at 9119, which the user has to start by hand. When it is offline, the page showed a raw "由于目标计算机积极拒绝, 无法连接 (10061)" error which is useless: users do not know they need to start a separate process. load() now does the same probe → auto-start dance that extensions.js / dashboard.js use for their 9119 links: probe first, call hermesDashboardStart() if not running, only then issue the /api/profiles request. If the start itself fails, we fall through to the original catch and humanize-error renders a real reason. lazy-deps.js — "[object Object]" on load failure humanizeError() returns { message, hint, raw, action? }, not a string. The catch branch passed the object straight into escapeHtml(), so String(obj) coerced to "[object Object]". Switch to humanizeErrorText() which is exactly the (message + hint) one-liner string variant. layout.css — header buttons crammed against the description Several pages (hermes profiles / lazy-deps / files / gateways / group-chat / kanban / oauth) put their header buttons inside
nested in
, but the existing flex layout rule only matched .page-actions. The buttons therefore stacked directly under .page-desc with zero visible gap. Add .config-actions to both the desktop flex selector and the @media (max-width:768px) column-stack selector so all these pages get the same title-left / actions-right layout. ## Verification - npm run build (no warnings beyond the existing chunk size note) - Playwright on /services in browser mode: docker section present; same page after mocking window.__TAURI_INTERNALS__: section gone - Playwright on /lazy-deps: rendered content does not contain the string "[object Object]" - Playwright dynamic-imports profiles / lazy-deps / files render(): computed style on .page-header is display:flex, flex-direction:row, title and button share the same getBoundingClientRect().top, button pushed to the right edge (justify-content:space-between effective) --- src/engines/hermes/pages/lazy-deps.js | 6 ++++-- src/engines/hermes/pages/profiles.js | 9 +++++++++ src/pages/services.js | 8 ++++++-- src/style/layout.css | 6 ++++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/engines/hermes/pages/lazy-deps.js b/src/engines/hermes/pages/lazy-deps.js index 75a48f6..91d90b1 100644 --- a/src/engines/hermes/pages/lazy-deps.js +++ b/src/engines/hermes/pages/lazy-deps.js @@ -10,7 +10,7 @@ import { t } from '../../../lib/i18n.js' import { api } from '../../../lib/tauri-api.js' import { toast } from '../../../components/toast.js' -import { humanizeError } from '../../../lib/humanize-error.js' +import { humanizeError, humanizeErrorText } from '../../../lib/humanize-error.js' import { svgIcon } from '../lib/svg-icons.js' // feature 分类配置（决定分组顺序 + 图标 + 文案） @@ -72,7 +72,9 @@ async function loadAndRender(page) { try { featuresResp = await api.hermesLazyDepsFeatures() } catch (e) { - content.innerHTML = `
${escapeHtml(humanizeError(e, t('hermesLazyDeps.loadFailed')))}
` + // humanizeError 返回 { message, hint, raw } 对象，String(obj) 会变成 "[object Object]"。 + // 这里用 humanizeErrorText 直接拿格式化后的字符串。 + content.innerHTML = `
${escapeHtml(humanizeErrorText(e, t('hermesLazyDeps.loadFailed')))}
` return } diff --git a/src/engines/hermes/pages/profiles.js b/src/engines/hermes/pages/profiles.js index e67ef41..de013b7 100644 --- a/src/engines/hermes/pages/profiles.js +++ b/src/engines/hermes/pages/profiles.js @@ -114,6 +114,15 @@ export function render() { loading = true error = '' draw() + // 9119 Dashboard 是独立进程，profile/* API 只由它提供。 + // 先 probe + 自动启动，避免用户看到「网络连接失败」这种无头错误。 + // 启动失败也不在这里中断，下面 hermesDashboardApi 抛出的连接错误会由 humanizeError 显示。 + try { + const probe = await api.hermesDashboardProbe() + if (!probe?.running) { + await api.hermesDashboardStart().catch(() => {}) + } + } catch { /* probe 失败也继续尝试调用 */ } try { const resp = await api.hermesDashboardApi('GET', '/api/profiles') const list = Array.isArray(resp) ? resp : (resp?.profiles || []) diff --git a/src/pages/services.js b/src/pages/services.js index 860c5e0..3be6b5a 100644 --- a/src/pages/services.js +++ b/src/pages/services.js @@ -2,7 +2,7 @@ * 服务管理页面 * 服务启停 + 更新检测 + 配置备份管理 */ -import { api } from '../lib/tauri-api.js' +import { api, isTauriRuntime } from '../lib/tauri-api.js' import { toast } from '../components/toast.js' import { humanizeError } from '../lib/humanize-error.js' import { showConfirm, showModal, showUpgradeModal } from '../components/modal.js' @@ -34,11 +34,12 @@ export async function render() {
+ ${isTauriRuntime() ? '' : `
${t('services.dockerManager')}
${t('services.dockerManagerHint')}
-
+
`}