@oj-module/runtime 0.2.14 → 0.2.15

package/dist/router/utils/group-solution-menus.d.ts

@@ -0,0 +1,28 @@
+import type { SolutionRouteRow } from "../../api/rbac/types";
+import type { MenuItemType } from "../../layout/layout-menu/types";
+/**
+ * 方案路由注册菜单归组（2026-10-21，docs/plans/2026-10-21-1028-solution-menu-grouping.md）。
+ *
+ * 纯函数、单一职责（SRP）：只把已生成的菜单做"视觉层归组"，不动路由树、不触碰
+ * i18n/翻译（组标题存裸 i18n key，交由渲染层 translateMenus 翻译）。跨列表操作
+ * （admin 项在 wholeMenus、`/system` 在 bottomMenus），故一次调用吃两段菜单。
+ *
+ * 依赖倒置（DIP）：告警通道 onWarn 由调用方注入，缺省为模块级 warnOnce，便于单测
+ * 断言与生产环境接管。无副作用、不 mutate 入参（未变动项复用原引用，返回新数组）。
+ */
+export interface GroupSolutionMenusOptions {
+    /** 宿主系统设置菜单 key，默认 "/system" */
+    systemKey?: string;
+    /** 告警回调；缺省走模块级 warnOnce（同消息只打一次） */
+    onWarn?: (msg: string) => void;
+}
+/**
+ * 归组入口。
+ *
+ * - 空表（未安装/端点失败）或无命中行 → 返回新数组（内容相等），开发形态不变；
+ * - 不 mutate 入参对象，未变动项复用原 menuItem 引用（仅重组数组与合成父项）。
+ */
+export declare function groupSolutionMenus(top: MenuItemType[], bottom: MenuItemType[], rows: SolutionRouteRow[], opts?: GroupSolutionMenusOptions): {
+    top: MenuItemType[];
+    bottom: MenuItemType[];
+};

package/dist/runtime.js

@@ -256,10 +256,10 @@ function getAppInfo() {
 	return {
 		"pkg": {
 			"name": "@oj-module/runtime",
-			"version": "0.2.14",
+			"version": "0.2.15",
 			"license": "MIT"
 		},
-		"lastBuildTime": "2026-10-21 09:05:39"
+		"lastBuildTime": "2026-10-21 12:22:16"
 	};
 }
 var init_get_app_info = __esmMin((() => {}));
@@ -6077,6 +6077,7 @@ function useMenu() {
 	* 菜单点击事件处理
 	*/
 	const handleMenuSelect = (key, mode) => {
+		if (key.startsWith("solgroup:")) return;
 		if (key === removeTrailingSlash(pathname)) return;
 		if (!shouldSplitMenuItems || mode !== "horizontal") {
 			if (/http(s)?:/.test(key)) window.open(key);
@@ -8386,6 +8387,135 @@ function generateMenuItemsFromRoutes(routeList, parentPath = "/") {
 }
 var init_generate_menu_items_from_routes = __esmMin((() => {}));
 //#endregion
+//#region src/router/utils/group-solution-menus.ts
+function defaultWarn(msg) {
+	if (warnedOnce.has(msg)) return;
+	warnedOnce.add(msg);
+	console.warn(msg);
+}
+/**
+* 处理单段菜单（顶层扫描，不递归 children）：
+* - main 路由：模块可见项 ≥2 则延迟建组（组插到该模块首个被摘项原序位）；否则原样直出；
+* - admin 路由：可挂载 `/system` 时摘除（交由调用方挂入 bottom 的 /system children），
+*   否则原样直出（回落顶层平铺，保持原序）；
+* - 无对应行项：原样直出。
+*/
+function processList(list, byPath, groupedModules, mountPossible) {
+	const out = [];
+	const groupsByModule = /* @__PURE__ */ new Map();
+	const adminItems = [];
+	list.forEach((it, idx) => {
+		const row = byPath.get(it.key);
+		if (!row) {
+			out.push(it);
+			return;
+		}
+		if (row.category === "admin") {
+			adminItems.push({
+				item: it,
+				row
+			});
+			if (mountPossible) return;
+			out.push(it);
+			return;
+		}
+		if (groupedModules.has(row.module)) {
+			let g = groupsByModule.get(row.module);
+			if (!g) {
+				g = {
+					items: [],
+					rows: [],
+					firstIdx: idx
+				};
+				groupsByModule.set(row.module, g);
+			}
+			g.items.push(it);
+			g.rows.push(row);
+			return;
+		}
+		out.push(it);
+	});
+	const inserts = [...groupsByModule.values()].map((g) => ({
+		index: g.firstIdx,
+		group: makeGroup(MAIN_PREFIX, g.rows[0].module, g.items, g.rows)
+	})).sort((a, b) => b.index - a.index);
+	for (const ins of inserts) out.splice(ins.index, 0, ins.group);
+	return {
+		out,
+		adminItems
+	};
+}
+function makeGroup(prefix, module, items, rows) {
+	const paired = items.map((item, i) => ({
+		item,
+		order: rows[i].order
+	})).sort((a, b) => a.order - b.order);
+	return {
+		key: `${prefix}${module}`,
+		label: `${module}:menu.group`,
+		children: paired.map((p) => p.item)
+	};
+}
+/**
+* 归组入口。
+*
+* - 空表（未安装/端点失败）或无命中行 → 返回新数组（内容相等），开发形态不变；
+* - 不 mutate 入参对象，未变动项复用原 menuItem 引用（仅重组数组与合成父项）。
+*/
+function groupSolutionMenus(top, bottom, rows, opts = {}) {
+	const systemKey = opts.systemKey ?? "/system";
+	const onWarn = opts.onWarn ?? defaultWarn;
+	if (rows.length === 0) return {
+		top: [...top],
+		bottom: [...bottom]
+	};
+	const byPath = /* @__PURE__ */ new Map();
+	for (const r of rows) if ((r.category === "main" || r.category === "admin") && r.enabled !== false) byPath.set(r.path, r);
+	if (byPath.size === 0) return {
+		top: [...top],
+		bottom: [...bottom]
+	};
+	const mainCount = /* @__PURE__ */ new Map();
+	for (const list of [top, bottom]) for (const it of list) {
+		const row = byPath.get(it.key);
+		if (row?.category === "main") mainCount.set(row.module, (mainCount.get(row.module) ?? 0) + 1);
+	}
+	const groupedModules = new Set([...mainCount].filter(([, n]) => n >= 2).map(([module]) => module));
+	const mountPossible = bottom.some((it) => it.key === systemKey);
+	const topRes = processList(top, byPath, groupedModules, mountPossible);
+	const bottomRes = processList(bottom, byPath, groupedModules, mountPossible);
+	const adminGroupsMap = /* @__PURE__ */ new Map();
+	for (const a of [...topRes.adminItems, ...bottomRes.adminItems]) {
+		const arr = adminGroupsMap.get(a.row.module) ?? [];
+		arr.push(a);
+		adminGroupsMap.set(a.row.module, arr);
+	}
+	const adminGroups = [...adminGroupsMap.entries()].map(([module, items]) => ({
+		minOrder: Math.min(...items.map((i) => i.row.order)),
+		group: makeGroup(ADMIN_PREFIX, module, items.map((i) => i.item), items.map((i) => i.row))
+	})).sort((a, b) => a.minOrder - b.minOrder);
+	let newBottom = bottomRes.out;
+	const sysIdx = newBottom.findIndex((it) => it.key === systemKey);
+	if (mountPossible && sysIdx !== -1) {
+		const system = newBottom[sysIdx];
+		newBottom = newBottom.slice();
+		newBottom[sysIdx] = {
+			...system,
+			children: [...system.children ?? [], ...adminGroups.map((g) => g.group)]
+		};
+	} else if (adminGroups.length > 0) onWarn(`[solution-menu-grouping] system menu "${systemKey}" not found; admin items keep top-level (grouping degraded).`);
+	return {
+		top: topRes.out,
+		bottom: newBottom
+	};
+}
+var MAIN_PREFIX, ADMIN_PREFIX, warnedOnce;
+var init_group_solution_menus = __esmMin((() => {
+	MAIN_PREFIX = "solgroup:main:";
+	ADMIN_PREFIX = "solgroup:admin:";
+	warnedOnce = /* @__PURE__ */ new Set();
+}));
+//#endregion
 //#region src/router/utils/merge-solution-categories.ts
 /**
 * 方案路由归并（纯函数，R21）：按 path 把 sys_solution_route 行注记到已注册路由上。
@@ -8495,6 +8625,7 @@ var init_access = __esmMin((() => {
 	init_ascending();
 	init_flatten_routes();
 	init_generate_menu_items_from_routes();
+	init_group_solution_menus();
 	init_merge_solution_categories();
 	init_resolve_login_route();
 	baseMenuRoutes = splitMenuRoutes(baseRoutes);
@@ -8514,9 +8645,10 @@ var init_access = __esmMin((() => {
 			router.patchRoutes(ROOT_ROUTE_ID, routes);
 			const flatRouteList = flattenRoutes(newRoutes);
 			const { top, bottom } = splitMenuRoutes(newRoutes);
+			const grouped = groupSolutionMenus(generateMenuItemsFromRoutes(top), generateMenuItemsFromRoutes(bottom), get().solutionRoutes);
 			const newState = {
-				wholeMenus: generateMenuItemsFromRoutes(top),
-				bottomMenus: generateMenuItemsFromRoutes(bottom),
+				wholeMenus: grouped.top,
+				bottomMenus: grouped.bottom,
 				routeList: newRoutes,
 				flatRouteList,
 				isAccessChecked: true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oj-module/runtime",
   "type": "module",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "description": "React Antd Admin 框架运行时，供模块工程消费",
   "license": "MIT",
   "imports": {