From 213514f64c071407e6c9da294d9a2dd06ac22c59 Mon Sep 17 00:00:00 2001 From: wangdequan Date: Mon, 15 Jun 2026 04:30:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=BF=9B=20INI=20=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=20shell=20view-model=20helper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- text11.txt | 64 +++++++++++++++++++ wasm-port/docs/panel-entry.md | 5 ++ wasm-port/runtime/ui/ini-panel/ui-shell.js | 21 ++++++ .../ui/node/verify_ini_panel_entry_docs.mjs | 6 ++ .../ui/node/verify_ini_panel_ui_shell.mjs | 20 ++++++ 5 files changed, 116 insertions(+) diff --git a/text11.txt b/text11.txt index 926f91a..7bd8779 100644 --- a/text11.txt +++ b/text11.txt @@ -1758,3 +1758,67 @@ host_wasm_opfs_browser_smokes=ok 继续推进 UI/API surface 的可复用边界。下一批建议新增一个 `createIniPanelShellViewModel()`，把 launcher links、可用页面和 control-page helper 暴露为 单一 shell model，供外层应用一次性挂载；仍保持只读，不新增控制按钮，不解析 G-code。 + +二十三、2026-06-15 继续执行记录：INI panel shell view-model helper + +本轮按“第一原则：加快实质性推进”继续推进 UI/API surface，新增单一 shell view-model， +让外层应用可以一次性读取 launcher links、页面列表和 control-page 挂载 helper。 + +完成内容： + +- `wasm-port/runtime/ui/ini-panel/ui-shell.js` 新增 `createIniPanelShellViewModel()`； +- shell view-model 返回： + - `pages`：只读页面列表； + - `launcherLinks`：可直接渲染的 launcher link view-model； + - `controlPage.createController`：现有 read-only control-page controller； + - `controlPage.renderView`：现有 read-only control-view renderer； +- `wasm-port/tests/ui/node/verify_ini_panel_ui_shell.mjs` 覆盖 shell view-model 结构、 + helper 引用和复制语义； +- `wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs` 同步校验文档和 shell helper； +- `wasm-port/docs/panel-entry.md` 记录 `createIniPanelShellViewModel()`； +- 未新增控制按钮； +- 未解析 G-code； +- 未解释 canonical events； +- 未改变 OPFS/session persistence、LinuxCNC interpreter、tool、parameter、planner 或 + LinuxCNC-owned runtime semantics。 + +验证已通过： + +```bash +git diff --check +wasm-port/tests/ui/node/verify_ini_panel_ui_shell.sh +wasm-port/tests/ui/node/verify_ini_panel_entry_docs.sh +SKIP_INI_BUILD=1 SKIP_INTERP_BUILD=1 wasm-port/tests/browser/verify_ini_panel_browser.sh +wasm-port/tests/ui/node/verify_ui_node_smokes.sh +wasm-port/tools/verify_vendor_sync.sh +wasm-port/tools/verify_no_standalone_cnc_semantics.sh +SKIP_INTERP_BUILD=1 wasm-port/tests/wasm/node/verify_interp_wasm.sh +SKIP_INTERP_BUILD=1 wasm-port/tests/wasm/node/verify_sim_configs_inventory_wasm.sh +wasm-port/tests/host/verify_host_smokes.sh +``` + +关键输出： + +```text +ini_panel_ui_shell_node_smoke=ok +ini_panel_entry_docs_node_smoke=ok +browser_ini_opfs_smoke=ok +browser_ini_control_page_smoke=ok +browser_ini_launch_smoke=ok +ui_node_smokes=ok +vendor sync up to date +standalone CNC semantics guard complete +interp_wasm_node_smoke=ok +sim_configs_wasm_node_inventory_executed=28 +sim_configs_wasm_node_inventory_passed=28 +sim_configs_wasm_node_inventory_skipped=131 +sim_configs_wasm_node_inventory_unexpected_fail=0 +browser_interp_smoke=ok +host_wasm_opfs_browser_smokes=ok +``` + +下一步建议： + +继续推进 OPFS/session persistence 或 browser/UI workflow 的实质链路。下一批建议在 +`app.js` 外抽出一个 control-page snapshot refresh workflow helper，让 read-only 页面能复用 +明确的 refresh 状态模型；仍保持只读，不新增控制按钮，不解析 G-code。 diff --git a/wasm-port/docs/panel-entry.md b/wasm-port/docs/panel-entry.md index f42453c..ce957a1 100644 --- a/wasm-port/docs/panel-entry.md +++ b/wasm-port/docs/panel-entry.md @@ -11,6 +11,7 @@ control view: import { INI_PANEL_ENTRIES, createIniPanelLauncherLinkViewModel, + createIniPanelShellViewModel, getIniPanelEntryByHref, getVisibleIniPanelEntries, createMachineSessionControlPageController, @@ -42,6 +43,10 @@ Launcher pages can render links from `createIniPanelLauncherLinkViewModel()` without reading manifest field names directly. Each item has `entryId`, `href`, and `label`. +Outer shells can call `createIniPanelShellViewModel()` when they need one +read-only model with `pages`, `launcherLinks`, and `controlPage` helpers for +mounting the existing control-page controller and renderer. + ## Boundary The entry shell only links pages and renders already-observed panel state. It diff --git a/wasm-port/runtime/ui/ini-panel/ui-shell.js b/wasm-port/runtime/ui/ini-panel/ui-shell.js index 88967bd..82e2855 100644 --- a/wasm-port/runtime/ui/ini-panel/ui-shell.js +++ b/wasm-port/runtime/ui/ini-panel/ui-shell.js @@ -3,6 +3,12 @@ import { getIniPanelEntryByHref, getIniPanelEntryManifest, } from "./entry-manifest.js"; +import { + createMachineSessionControlPageController, +} from "./control-page-controller.js"; +import { + renderMachineSessionControlView, +} from "./control-view-renderer.js"; export { INI_PANEL_ENTRIES, getIniPanelEntryByHref, @@ -26,3 +32,18 @@ export function createIniPanelLauncherLinkViewModel(entries = getVisibleIniPanel label: title, })); } + +export function createIniPanelShellViewModel(entries = getVisibleIniPanelEntries()) { + return { + pages: entries.map(({ id, href, title }) => ({ + id, + href, + title, + })), + launcherLinks: createIniPanelLauncherLinkViewModel(entries), + controlPage: { + createController: createMachineSessionControlPageController, + renderView: renderMachineSessionControlView, + }, + }; +} diff --git a/wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs b/wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs index c7d09e8..910cb78 100644 --- a/wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs +++ b/wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs @@ -6,6 +6,7 @@ import { dirname, resolve } from "node:path"; import { INI_PANEL_ENTRIES, createIniPanelLauncherLinkViewModel, + createIniPanelShellViewModel, getVisibleIniPanelEntries, } from "../../../runtime/ui/ini-panel/ui-shell.js"; @@ -17,6 +18,7 @@ const shellText = readFileSync(resolve(root, "runtime/ui/ini-panel/ui-shell.js") const requiredShellExports = [ "INI_PANEL_ENTRIES", "createIniPanelLauncherLinkViewModel", + "createIniPanelShellViewModel", "getIniPanelEntryByHref", "getVisibleIniPanelEntries", "createMachineSessionControlPageController", @@ -47,6 +49,10 @@ assert.deepEqual( label: title, })), ); +assert.deepEqual(createIniPanelShellViewModel().pages, getVisibleIniPanelEntries()); +assert.deepEqual(createIniPanelShellViewModel().launcherLinks, createIniPanelLauncherLinkViewModel()); +assert.equal(typeof createIniPanelShellViewModel().controlPage.createController, "function"); +assert.equal(typeof createIniPanelShellViewModel().controlPage.renderView, "function"); for (const entry of INI_PANEL_ENTRIES) { const escapedHref = entry.href.replace(".", "\\."); diff --git a/wasm-port/tests/ui/node/verify_ini_panel_ui_shell.mjs b/wasm-port/tests/ui/node/verify_ini_panel_ui_shell.mjs index 5941b40..45201fc 100644 --- a/wasm-port/tests/ui/node/verify_ini_panel_ui_shell.mjs +++ b/wasm-port/tests/ui/node/verify_ini_panel_ui_shell.mjs @@ -3,6 +3,7 @@ import assert from "node:assert/strict"; import { INI_PANEL_ENTRIES, createIniPanelLauncherLinkViewModel, + createIniPanelShellViewModel, createMachineSessionControlPageController, getIniPanelEntryByHref, getIniPanelEntryManifest, @@ -37,6 +38,25 @@ assert.deepEqual(createIniPanelLauncherLinkViewModel(), [ const launcherLinks = createIniPanelLauncherLinkViewModel(); launcherLinks[0].label = "changed"; assert.equal(INI_PANEL_ENTRIES[0].title, "Open edit and run panel"); +const shellViewModel = createIniPanelShellViewModel(); +assert.deepEqual(shellViewModel.pages, [ + { + id: "edit-run", + href: "./index.html", + title: "Open edit and run panel", + }, + { + id: "control-view", + href: "./control-page.html", + title: "Open read-only control view", + }, +]); +assert.deepEqual(shellViewModel.launcherLinks, createIniPanelLauncherLinkViewModel()); +assert.equal(shellViewModel.controlPage.createController, createMachineSessionControlPageController); +assert.equal(shellViewModel.controlPage.renderView, renderMachineSessionControlView); +shellViewModel.pages[0].title = "changed"; +shellViewModel.launcherLinks[0].label = "changed"; +assert.equal(INI_PANEL_ENTRIES[0].title, "Open edit and run panel"); const panelFrame = { contentWindow: {