diff --git a/text12.txt b/text12.txt index f9a3cff..cb3b56f 100644 --- a/text12.txt +++ b/text12.txt @@ -997,3 +997,71 @@ host_wasm_opfs_browser_smokes=ok 继续推进 browser/UI workflow。下一批建议把 browser control-page API methods manifest 纳入 launch page 或 shell view-model 暴露,让入口页也能展示/消费可用 read-only control-page API 清单;仍保持只读,不新增控制按钮,不解析 G-code,不解释 canonical events。 + +十二、2026-06-15 继续执行记录:INI panel launch exposes control-page API methods + +本轮按“第一原则:加快实质性推进”继续推进 browser/UI workflow,把 browser control-page API +methods manifest 纳入 shell view-model 和 launch page,使入口页也能消费可用 read-only +control-page API 清单,而不需要先加载 control-page iframe。 + +完成内容: + +- `createControlPageBrowserApiMethods()` 从 `control-page.js` 迁移到 `ui-shell.js`; +- `control-page.js` 复用 shell 侧 `createControlPageBrowserApiMethods()`; +- `createIniPanelShellViewModel().controlPage` 新增 `browserApiMethods`; +- `launch.html` 改为基于 `createIniPanelShellViewModel()` 渲染 launcher links; +- `launch.html` 新增只读 `window.linuxCncIniPanelLaunchApi`: + - `getLauncherLinks()` + - `getControlPageApiMethods()` +- `ini_panel_launch_smoke.html` 在真实 launch iframe 中校验 launch API 与 shell helper + 返回同一份 control-page browser methods 清单; +- `verify_ini_panel_ui_shell.mjs`、`verify_ini_panel_shell_control_page_contract.mjs` 和 + `verify_ini_panel_entry_docs.mjs` 覆盖 shell view-model、launch API 与文档入口; +- `docs/panel-entry.md` 记录 `linuxCncIniPanelLaunchApi.getControlPageApiMethods()`; +- 未新增控制按钮; +- 未解析 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_shell_control_page_contract.sh +wasm-port/tests/ui/node/verify_ini_panel_ui_shell.sh +wasm-port/tests/ui/node/verify_ini_panel_entry_docs.sh +wasm-port/tests/ui/node/verify_ui_node_smokes.sh +SKIP_INI_BUILD=1 SKIP_INTERP_BUILD=1 wasm-port/tests/browser/verify_ini_panel_browser.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_shell_control_page_contract_node_smoke=ok +ini_panel_ui_shell_node_smoke=ok +ini_panel_entry_docs_node_smoke=ok +ui_node_smokes=ok +browser_ini_opfs_smoke=ok +browser_ini_control_page_smoke=ok +browser_ini_launch_smoke=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 +host_wasm_opfs_browser_smokes=ok +``` + +下一步建议: + +继续推进 SDK/API surface。下一批建议把 `linuxCncIniPanelLaunchApi` 也整理为轻量 launch API +manifest,明确 `getLauncherLinks()`、`getControlPageApiMethods()`、visible entries 和目标页面 +路径,供外部 shell 在不读 DOM 的情况下发现入口;仍保持只读,不新增控制按钮,不解析 G-code。 diff --git a/wasm-port/docs/panel-entry.md b/wasm-port/docs/panel-entry.md index 5095409..969acee 100644 --- a/wasm-port/docs/panel-entry.md +++ b/wasm-port/docs/panel-entry.md @@ -10,6 +10,7 @@ control view: ```js import { INI_PANEL_ENTRIES, + createControlPageBrowserApiMethods, createIniPanelLauncherLinkViewModel, createIniPanelShellControlPageContract, createIniPanelShellViewModel, @@ -77,6 +78,9 @@ control page API. Use `linuxCncIniPanelControlPageApi.readControlPageStatus()` when a browser outer page needs the same readonly status snapshot from the real embedded control page after save/load session workflows. +The launch page exposes `linuxCncIniPanelLaunchApi.getControlPageApiMethods()` +from the same shell view-model so entry pages can consume the available +read-only control-page API list without loading the control-page iframe first. The control-page refresh workflow lives in `runtime/ui/ini-panel/control-page-refresh-workflow.js`. Use diff --git a/wasm-port/runtime/ui/ini-panel/control-page.js b/wasm-port/runtime/ui/ini-panel/control-page.js index 9b9cb7f..f2bfa60 100644 --- a/wasm-port/runtime/ui/ini-panel/control-page.js +++ b/wasm-port/runtime/ui/ini-panel/control-page.js @@ -5,6 +5,7 @@ import { createMachineSessionControlPageController, } from "./control-page-controller.js"; import { + createControlPageBrowserApiMethods, createIniPanelShellControlPageContract, } from "./ui-shell.js"; @@ -21,19 +22,6 @@ const controller = createMachineSessionControlPageController({ controller.mount(); -export function createControlPageBrowserApiMethods() { - return [ - "getControlPageApiMethods", - "getControlPageContract", - "getControlView", - "getPanelApi", - "loadControlPageSessionState", - "readControlPageStatus", - "refreshControlPage", - "renderControlPage", - ]; -} - window.linuxCncIniPanelControlPageApi = { getControlPageApiMethods: createControlPageBrowserApiMethods, getControlView: controller.getControlView, diff --git a/wasm-port/runtime/ui/ini-panel/launch.html b/wasm-port/runtime/ui/ini-panel/launch.html index 8c5f2f1..5e4adb3 100644 --- a/wasm-port/runtime/ui/ini-panel/launch.html +++ b/wasm-port/runtime/ui/ini-panel/launch.html @@ -73,9 +73,13 @@ diff --git a/wasm-port/runtime/ui/ini-panel/ui-shell.js b/wasm-port/runtime/ui/ini-panel/ui-shell.js index 7f1aed8..5ed9033 100644 --- a/wasm-port/runtime/ui/ini-panel/ui-shell.js +++ b/wasm-port/runtime/ui/ini-panel/ui-shell.js @@ -78,6 +78,19 @@ export function createIniPanelShellControlPageContract() { }; } +export function createControlPageBrowserApiMethods() { + return [ + "getControlPageApiMethods", + "getControlPageContract", + "getControlView", + "getPanelApi", + "loadControlPageSessionState", + "readControlPageStatus", + "refreshControlPage", + "renderControlPage", + ]; +} + export function createIniPanelShellViewModel(entries = getVisibleIniPanelEntries()) { return { pages: entries.map(({ id, href, title }) => ({ @@ -87,6 +100,7 @@ export function createIniPanelShellViewModel(entries = getVisibleIniPanelEntries })), launcherLinks: createIniPanelLauncherLinkViewModel(entries), controlPage: { + browserApiMethods: createControlPageBrowserApiMethods(), contract: createIniPanelShellControlPageContract(), createController: createMachineSessionControlPageController, loadSessionState: loadMachineSessionForControlPageWorkflow, diff --git a/wasm-port/tests/browser/ini_panel_launch_smoke.html b/wasm-port/tests/browser/ini_panel_launch_smoke.html index 1ce7b37..6fc7782 100644 --- a/wasm-port/tests/browser/ini_panel_launch_smoke.html +++ b/wasm-port/tests/browser/ini_panel_launch_smoke.html @@ -8,7 +8,9 @@
running