openxiangda 1.0.9 → 1.0.11

package/lib/cli.js

@@ -743,8 +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, flags['page-code']);
+    const pageId = flags['page-id'] || resolveOptionalPageId(target.bound, pageCode);
     const data = await requestWithAuth(
       config,
       target.profileName,
@@ -767,6 +769,9 @@ async function menu(args) {
         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);
@@ -1905,26 +1910,69 @@ function resolvePagePermissionMenuTargets(bound, flags = {}) {
     ...splitList(flags['menu-form-uuids']),
     ...splitList(flags['menu-ids']),
   ];
-  const fromMenuCodes = splitList(flags['menu-codes']).map(code => resolveMenuId(bound, code));
+  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']).map(code => resolvePageMenuTarget(bound, code));
+  const fromPageCodes = splitList(flags['page-codes']).flatMap(code => resolvePagePermissionTargets(bound, code));
   return unique([...direct, ...fromMenuCodes, ...fromFormCodes, ...fromPageCodes].filter(Boolean));
 }
 
-function resolvePageMenuTarget(bound, pageCode) {
+function resolveMenuPermissionTargets(bound, menuCode) {
+  const menuEntry = bound.resources?.menus?.[menuCode];
+  const menuId = resolveMenuId(bound, menuCode);
+  if (menuEntry?.formUuid) return [menuEntry.formUuid];
+  // Custom code pages are checked by three platform surfaces: the admin tree
+  // uses menu IDs, /view uses route keys, and bootstrap uses legacy PAGE IDs.
+  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 menuEntry.menuId;
+  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 = {}) {
   const key = formKey || flags['form-code'] || flags['form-uuid'];
   if (!key && !flags['form-uuid']) {

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

@@ -369,11 +369,11 @@ Body:
 {
   "name": "销售可见页面",
   "roles": ["sales"],
-  "menuFormUuids": ["FORM_XXX", "MENU_ID_FOR_CODE_PAGE"]
+  "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. For form menus this field can contain form UUIDs; for custom code page menus use the actual menu ID returned by `/apps/:appType/menus`, not the code page `PAGE_...` legacy form UUID.
+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, OpenXiangda CLI `--page-codes` / `--menu-codes` writes the actual menu ID used by the platform admin tree, the route key used by `/view`, and the legacy `PAGE_...` alias used by custom-page bootstrap.
 
 ### GET `/apps/:appType/page-permission-groups/:groupId`
 

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

@@ -18,13 +18,15 @@ Role IDs are platform-specific. Store them only in `.openxiangda/state.json` und
 
 ## Page Permission Groups
 
-Page permission groups map role codes to visible menu `formUuid` values:
+Page permission groups map role codes to visible menu targets. Form menus use their `FORM_...`
+form UUIDs; custom code page/display menus need the menu ID, route key, and legacy `PAGE_...`
+alias because current platform surfaces check different identifiers:
 
 ```json
 {
   "name": "销售页面",
   "roles": ["sales"],
-  "menuFormUuids": ["FORM_CUSTOMER", "FORM_ORDER", "MENU_ID_FOR_CODE_PAGE"]
+  "menuFormUuids": ["FORM_CUSTOMER", "FORM_ORDER", "MENU_ID_FOR_CODE_PAGE", "CODE_PAGE_ROUTE_KEY", "PAGE_LEGACY_FORM_UUID"]
 }
 ```
 
@@ -33,7 +35,7 @@ Rules:
 - `roles: []` means all roles can match.
 - `menuFormUuids: []` means all menus/pages are visible to matched roles.
 - 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 so each profile resolves to real menu IDs.
+- Prefer `--page-codes` or `--menu-codes` in CLI for custom code page menus. The CLI writes the menu ID for the admin tree, the route key for `/view`, and the legacy `PAGE_...` alias for custom-page bootstrap.
 
 ## Form Permission Groups
 

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

@@ -43,7 +43,7 @@ openxiangda permission page-group-create sales_pages --name "销售页面" --rol
 openxiangda permission page-group-create portal_pages --name "门户页面" --page-codes portal_pc,portal_mobile --profile dev
 ```
 
-Use `--page-codes` or `--menu-codes` for custom code page menus; the CLI resolves code pages to their published menu IDs. 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.
+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 the platform's current admin tree, `/view` guard, and custom-page bootstrap 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.9",
+  "version": "1.0.11",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {