openxiangda 1.0.8 → 1.0.10

package/lib/cli.js

@@ -743,6 +743,10 @@ async function menu(args) {
       fail('用法: openxiangda menu create <menuCode> --name <text>');
     }
     const target = getWorkspaceTarget(config, profileName, flags);
+    const pageCode = flags['page-code'];
+    const pageEntry = pageCode ? findPageEntry(target.bound, entry => entry.pageCode === pageCode || entry.routeKey === pageCode) : undefined;
+    const formUuid = flags['form-uuid'] || resolveOptionalFormUuid(target.bound, flags['form-code']);
+    const pageId = flags['page-id'] || resolveOptionalPageId(target.bound, pageCode);
     const data = await requestWithAuth(
       config,
       target.profileName,
@@ -752,14 +756,24 @@ async function menu(args) {
         body: {
           name,
           type: flags.type || 'nav',
-          formUuid: flags['form-uuid'] || resolveOptionalFormUuid(target.bound, flags['form-code']),
-          pageId: flags['page-id'] || resolveOptionalPageId(target.bound, flags['page-code']),
+          formUuid,
+          pageId,
           parentId: flags['parent-id'] || null,
           icon: flags.icon || null,
         },
       }
     );
-    if (data?.id) saveMenuResource(target, menuCode, data.id, { name });
+    if (data?.id) {
+      saveMenuResource(target, menuCode, data.id, {
+        name,
+        type: flags.type || 'nav',
+        ...(formUuid ? { formUuid } : {}),
+        ...(pageId ? { pageId } : {}),
+        ...(pageCode ? { pageCode } : {}),
+        ...(pageEntry?.routeKey ? { routeKey: pageEntry.routeKey } : pageCode ? { routeKey: pageCode } : {}),
+        ...(pageEntry?.legacyFormUuid ? { legacyFormUuid: pageEntry.legacyFormUuid } : {}),
+      });
+    }
     if (flags.json) return writeJson(data);
     print(JSON.stringify(data, null, 2));
     return;
@@ -1308,7 +1322,7 @@ async function permission(args) {
     const [groupCode] = positional;
     const name = flags.name || positional.slice(1).join(' ') || groupCode;
     if (!groupCode || !name) {
-      fail('用法: openxiangda permission page-group-create <groupCode> --name <text>');
+      fail('用法: openxiangda permission page-group-create <groupCode> --name <text> [--menu-codes <menuCode...>|--page-codes <pageCode...>|--form-codes <formCode...>|--menu-ids <id...>]');
     }
     const target = getWorkspaceTarget(config, profileName, flags);
     const data = await requestWithAuth(
@@ -1320,7 +1334,7 @@ async function permission(args) {
         body: {
           name,
           roles: splitList(flags.roles),
-          menuFormUuids: resolveFormUuidList(target.bound, flags['menu-form-uuids'], flags['form-codes']),
+          menuFormUuids: resolvePagePermissionMenuTargets(target.bound, flags),
         },
       }
     );
@@ -1891,10 +1905,70 @@ function resolveRoleId(bound, roleKey, flags = {}) {
   return mapped || roleKey;
 }
 
-function resolveFormUuidList(bound, rawFormUuids, rawFormCodes) {
-  const direct = splitList(rawFormUuids);
-  const fromCodes = splitList(rawFormCodes).map(code => resolveOptionalFormUuid(bound, code));
-  return [...direct, ...fromCodes].filter(Boolean);
+function resolvePagePermissionMenuTargets(bound, flags = {}) {
+  const direct = [
+    ...splitList(flags['menu-form-uuids']),
+    ...splitList(flags['menu-ids']),
+  ];
+  const fromMenuCodes = splitList(flags['menu-codes']).flatMap(code => resolveMenuPermissionTargets(bound, code));
+  const fromFormCodes = splitList(flags['form-codes']).map(code => resolveOptionalFormUuid(bound, code));
+  const fromPageCodes = splitList(flags['page-codes']).flatMap(code => resolvePagePermissionTargets(bound, code));
+  return unique([...direct, ...fromMenuCodes, ...fromFormCodes, ...fromPageCodes].filter(Boolean));
+}
+
+function resolveMenuPermissionTargets(bound, menuCode) {
+  const menuEntry = bound.resources?.menus?.[menuCode];
+  const menuId = resolveMenuId(bound, menuCode);
+  if (menuEntry?.formUuid) return [menuEntry.formUuid];
+  if (menuEntry?.pageId || menuEntry?.pageCode || menuEntry?.routeKey || menuEntry?.legacyFormUuid) {
+    return unique([menuId, ...resolveCodePagePermissionAliases(bound, menuEntry)]);
+  }
+  return [menuId];
+}
+
+function resolvePagePermissionTargets(bound, pageCode) {
+  const pageId = resolveOptionalPageId(bound, pageCode);
+  const menuEntry = findMenuEntry(bound, entry => {
+    if (!entry) return false;
+    return entry.pageId === pageId || entry.pageCode === pageCode || entry.routeKey === pageCode;
+  });
+  if (menuEntry?.menuId) {
+    return unique([menuEntry.menuId, ...resolveCodePagePermissionAliases(bound, menuEntry, pageCode)]);
+  }
+  fail(`页面 ${pageCode} 未找到已绑定菜单。请先发布/创建菜单，或直接传 --menu-codes/--menu-ids。`);
+}
+
+function resolveCodePagePermissionAliases(bound, menuEntry = {}, pageCode) {
+  const pageEntry = findPageEntry(bound, entry => {
+    if (!entry) return false;
+    return (
+      entry.pageCode === pageCode ||
+      entry.routeKey === pageCode ||
+      entry.pageId === menuEntry.pageId ||
+      entry.pageCode === menuEntry.pageCode ||
+      entry.routeKey === menuEntry.routeKey ||
+      entry.legacyFormUuid === menuEntry.legacyFormUuid
+    );
+  });
+  return unique([
+    pageCode,
+    menuEntry.pageCode,
+    menuEntry.routeKey,
+    menuEntry.legacyFormUuid,
+    pageEntry?.pageCode,
+    pageEntry?.routeKey,
+    pageEntry?.legacyFormUuid,
+  ].filter(Boolean));
+}
+
+function findMenuEntry(bound, predicate) {
+  return Object.values(bound.resources?.menus || {}).find(predicate);
+}
+
+function findPageEntry(bound, predicate) {
+  return Object.entries(bound.resources?.pages || {})
+    .map(([pageCode, entry]) => ({ pageCode, ...(entry || {}) }))
+    .find(predicate);
 }
 
 function resolveSettingsFormUuid(bound, formKey, flags = {}) {
@@ -2249,6 +2323,10 @@ function splitList(value) {
     .filter(Boolean);
 }
 
+function unique(values) {
+  return [...new Set(values)];
+}
+
 function renderTerminalQr(text) {
   try {
     require('qrcode-terminal').generate(text, { small: true });

package/openxiangda-skills/references/openxiangda-api.md

@@ -369,11 +369,11 @@ Body:
 {
   "name": "销售可见页面",
   "roles": ["sales"],
-  "menuFormUuids": ["FORM_XXX"]
+  "menuFormUuids": ["FORM_XXX", "MENU_ID_FOR_CODE_PAGE", "CODE_PAGE_ROUTE_KEY", "PAGE_LEGACY_FORM_UUID"]
 }
 ```
 
-An empty `menuFormUuids` array means all menus/pages are visible to the matched roles.
+An empty `menuFormUuids` array means all menus/pages are visible to the matched roles. For form menus this field can contain form UUIDs. For custom code page menus, current platform runtimes may check different identifiers at different layers, so OpenXiangda CLI `--page-codes` / `--menu-codes` writes the actual menu ID, the code page route key, and the legacy `PAGE_...` form UUID alias.
 
 ### GET `/apps/:appType/page-permission-groups/:groupId`
 

package/openxiangda-skills/references/permissions-settings.md

@@ -24,7 +24,7 @@ Page permission groups map role codes to visible menu `formUuid` values:
 {
   "name": "销售页面",
   "roles": ["sales"],
-  "menuFormUuids": ["FORM_CUSTOMER", "FORM_ORDER"]
+  "menuFormUuids": ["FORM_CUSTOMER", "FORM_ORDER", "MENU_ID_FOR_CODE_PAGE", "CODE_PAGE_ROUTE_KEY", "PAGE_LEGACY_FORM_UUID"]
 }
 ```
 
@@ -32,7 +32,8 @@ Rules:
 
 - `roles: []` means all roles can match.
 - `menuFormUuids: []` means all menus/pages are visible to matched roles.
-- Prefer `--form-codes` in CLI so each profile resolves its own form UUIDs.
+- Prefer `--form-codes` in CLI for form menus so each profile resolves its own form UUIDs.
+- Prefer `--page-codes` or `--menu-codes` in CLI for custom code page menus. The CLI writes the menu ID plus the code page route key and legacy `PAGE_...` alias required by current `/view` and custom-page runtime permission checks.
 
 ## Form Permission Groups
 

package/openxiangda-skills/skills/openxiangda-permission-settings/SKILL.md

@@ -40,9 +40,10 @@ Page permission groups control menu/page visibility:
 
 ```bash
 openxiangda permission page-group-create sales_pages --name "销售页面" --roles sales --form-codes customer,orders --profile dev
+openxiangda permission page-group-create portal_pages --name "门户页面" --page-codes portal_pc,portal_mobile --profile dev
 ```
 
-Empty `--form-codes` and `--menu-form-uuids` means all menus/pages are visible to matched roles.
+Use `--page-codes` or `--menu-codes` for custom code page menus; the CLI resolves code pages to the published menu ID plus the route key and legacy `PAGE_...` alias required by current runtime permission checks. Use `--form-codes` for form menus; the CLI resolves forms to profile-local form UUIDs. Empty target lists mean all menus/pages are visible to matched roles.
 
 ## Form Permission Groups
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {