node-red-contrib-room-tools 1.8.8 → 1.8.9

package/CONTROL_PANEL_AI_GUIDE.md

@@ -1,6 +1,6 @@
 # ControlPanel 前端页面编写指南
 
-适用基线：`node-red-contrib-room-tools@1.8.8` 的 `ui-control-panel`，Dashboard 2，Vue Options API。本文按当前代码审核，不表示支持任意 Vue、Vuetify 或第三方组件。
+适用基线：`node-red-contrib-room-tools@1.8.9` 的 `ui-control-panel`，Dashboard 2，Vue Options API。本文按当前代码审核，不表示支持任意 Vue、Vuetify 或第三方组件。
 
 给 AI 编写页面前阅读本文。目标是：页面作者只写普通前端页面；部署人员在网页编辑模式选择设备与点位；ControlPanel 保存映射并负责设备命令、反馈和网页侧量程换算。
 
@@ -137,7 +137,7 @@ export default {
 ## 5. 部署与绑定
 
 1. 将页面粘贴到 `ui-control-panel` Template，选择 Dashboard 页面，设置 Room ID、普通账号及独立的编辑账号。普通账号密码至少 12 个字符；账号密码由节点配置，不能写入 H5。保存并 Deploy。
-2. 重新打开节点，点击 `Open page binding editor`，用编辑账号登录。Select 默认激活，可以点击、右键或触屏长按可绑定控件。
+2. 重新打开节点，点击 `Open binding editor`，用编辑账号登录。Select 默认激活，可以点击、右键或触屏长按可绑定控件。`Open page` 打开普通控制页面，使用普通用户账号登录。
 3. 选择在线设备、模式、Write point、Feedback point、编号方式，保存草稿。草稿和亮紫色边框不表示已部署；边框只在编辑模式显示。
 4. 点 Apply。节点检查当前模板、目录参数和 Flow 版本，备份后替换该面板此前生成的桥接并部署。不会无限追加旧桥接，也不会清除其他面板的绑定。Apply 成功后仍在编辑页，无需再次登录。
 5. 点 Exit，回到普通页面登录页，再输入普通账号密码。普通账号不能进入编辑模式；不登录不能操作设备。进程重启或凭据变化可能要求重新登录。

package/README.md

@@ -4,7 +4,7 @@ This package provides `ui-control-panel` for Node-RED and MUSE Automator.
 
 ## ControlPanel
 
-The page author writes ordinary HTML/CSS/Vue and pastes it into the `ui-control-panel` Template. After configuring a Dashboard page, room ID, control login, and separate editor login, save and Deploy. Reopen the node and select **Open page binding editor**. Sign in with the editor account, right-click a supported control, choose its device points, and Apply.
+The page author writes ordinary HTML/CSS/Vue and pastes it into the `ui-control-panel` Template. After configuring a Dashboard page, room ID, control login, and separate editor login, save and Deploy. Reopen the node and select **Open binding editor**. Sign in with the editor account, right-click a supported control, choose its device points, and Apply. **Open page** opens the normal control page with its separate user login.
 
 Both logins work over HTTP on a trusted local network. HTTPS is recommended for other networks because HTTP transmits credentials without encryption. Session cookies are marked `Secure` when the connection uses HTTPS.
 

package/control-panel.html

@@ -229,9 +229,11 @@
                 })
 
                 $('#control-binding-auth').show()
-                $('#control-visual-open').on('click', function () {
+                const openDashboardPage = (editMode) => {
+                    const scope = $templateScope.val() || that.templateScope || 'local'
                     const group = RED.nodes.node($('#node-input-group').val() || that.group)
-                    const page = RED.nodes.node($('#node-input-page').val() || that.page || group?.page)
+                    const pageId = scope === 'local' ? group?.page : ($('#node-input-page').val() || that.page)
+                    const page = RED.nodes.node(pageId)
                     const base = RED.nodes.node(page?.ui)
                     if (!page?.path) {
                         RED.notify('Choose a Dashboard page, then save and deploy this node.', { type: 'warning' })
@@ -239,9 +241,11 @@
                     }
                     const url = new URL((base?.path || '/dashboard').replace(/\/$/, '') + '/' +
                         page.path.replace(/^\//, ''), window.location.origin)
-                    url.searchParams.set('cp-edit', that.id)
+                    if (editMode) url.searchParams.set('cp-edit', that.id)
                     window.open(url.href, '_blank', 'noopener')
-                })
+                }
+                $('#control-page-open').on('click', () => openDashboardPage(false))
+                $('#control-visual-open').on('click', () => openDashboardPage(true))
                 RED.library.create({
                     url: 'uitemplates', // where to get the data from
                     type: 'ui-template', // the type of object the library is for
@@ -350,7 +354,7 @@
     <p>普通 HTML/Vue 控件由页面绑定编辑器自动识别，并通过面板的 authenticated session 发送控制。开发者不需要添加标签、调用自定义节点 API，或在 Template 中实现 throttling、latest-wins、队列和设备协议。</p>
     <p>页面只需按普通 H5/Vue 方式编写控件；编辑模式下在控件上打开绑定菜单，选择设备参数即可。登录、发送、反馈和状态同步由节点负责，Template 不应主动查询设备或把反馈回发成命令。</p>
     <p>See <code>CONTROL_PANEL_AI_GUIDE.md</code> in the node package for the complete AI authoring contract and examples.</p>
-    <p>Save and Deploy the panel, then use Open page binding editor. Apply in that page validates and saves bindings, backs up the Flow, regenerates the native bridge, and deploys it. Ordinary Deploy alone does not apply bindings. Check targets and numbering before using real hardware.</p>
+    <p>Save and Deploy the panel, then use Open binding editor. Apply in that page validates and saves bindings, backs up the Flow, regenerates the native bridge, and deploys it. Ordinary Deploy alone does not apply bindings. Check targets and numbering before using real hardware.</p>
 </script>
 
 <script type="text/html" data-template-name="ui-control-panel">
@@ -428,10 +432,10 @@
         <div style="height:250px; min-height:100px" class="node-text-editor" id="node-input-format-editor" ></div>
     </div>
     <div class="form-row">
-        <label>Page binding</label>
+        <label>Page</label>
         <input type="hidden" id="node-input-visualBindings">
-        <button type="button" id="control-visual-open" class="red-ui-button">Open page binding editor</button>
-        <span class="control-binding-hint">Use ordinary HTML/Vue controls. Binding is configured from the page.</span>
+        <button type="button" id="control-page-open" class="red-ui-button">Open page</button>
+        <button type="button" id="control-visual-open" class="red-ui-button">Open binding editor</button>
     </div>
     <div class="form-row" style="display:none">
         <input type="hidden" id="node-input-bridgeRevisionApplied">

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "node-red-contrib-room-tools",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "node-red-contrib-room-tools",
-      "version": "1.8.8",
+      "version": "1.8.9",
       "license": "UNLICENSED",
       "dependencies": {
         "@vue/compiler-sfc": "3.5.42",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-room-tools",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "description": "Authenticated visual control panel binding for Node-RED and MUSE Automator",
   "license": "UNLICENSED",
   "engines": { "node": ">=18.16.0" },