@oj-module/cli 0.2.14 → 0.2.17

package/shell-dist/assets/{index-CLdhl3Qd.js → index-B3g19Uet.js}

@@ -38,8 +38,71 @@ import { jsx, jsxs } from "react/jsx-runtime";
 	}
 })();
 //#endregion
+//#region shell/src/site-urls.ts
+/**
+* 宿主 shell 侧的站点 base 解析（子路径部署，2026-10-21）。
+*
+* shell 产物（`shell-dist/index.html` + `assets/*`）里的 URL 一律是**站点根绝对路径**
+* （`/assets/react.js`）。`ojm build` 合并全站时按 `web.config.ts` 的 `siteBase`
+* 重写 index.html 并注入 `window.__OJ_BASE__`，运行期这里读它把 modules.json
+* 里的入口 / CSS / 预载 URL 补齐——否则站点挂在 `/oj` 时资源全部 404（首页白屏）。
+*
+* 为什么 shell 不直接 import runtime 的同名工具：本文件被 vitest 直接加载做纯函数
+* 断言，而 runtime 主入口会拉进 antd/react 整棵树。规则与
+* `packages/runtime/src/utils/site-base.ts` 逐条一致，由
+* `tests/cli/site-base.test.ts` 用同一张用例表对撞防漂移。
+*/
+var ROOT_BASE = "/";
+/** 归一化为「以 `/` 开头且以 `/` 结尾」；空值与 `"/"` 归为根路径 */
+function normalizeSiteBase(raw) {
+	if (!raw) return ROOT_BASE;
+	const trimmed = raw.trim();
+	if (!trimmed || trimmed === ROOT_BASE) return ROOT_BASE;
+	const withLeading = trimmed.startsWith(ROOT_BASE) ? trimmed : `${ROOT_BASE}${trimmed}`;
+	return withLeading.endsWith(ROOT_BASE) ? withLeading : `${withLeading}${ROOT_BASE}`;
+}
+/**
+* 当前站点部署 base（恒以 `/` 结尾）。
+*
+* 优先级：`window.__OJ_BASE__`（`ojm build` 按 siteBase 注入）> `import.meta.env.BASE_URL`
+* （shell 构建期固定为 `"/"`，仅在未注入时兜底，即根路径部署与 `ojm dev`）。
+*/
+function resolveSiteBase() {
+	const injected = globalThis.__OJ_BASE__;
+	if (typeof injected === "string") return normalizeSiteBase(injected);
+	return normalizeSiteBase("/");
+}
+/** 站内绝对路径（`/modules/x/entry.js`）→ 带部署 base；已带 base 的幂等，绝对域原样 */
+function withSiteBase(url, base = resolveSiteBase()) {
+	if (!url.startsWith(ROOT_BASE) || url.startsWith("//")) return url;
+	const normalized = normalizeSiteBase(base);
+	if (normalized === ROOT_BASE || url.startsWith(normalized)) return url;
+	return `${normalized.slice(0, -1)}${url}`;
+}
+//#endregion
 //#region shell/src/manifest.ts
 /**
+* 把 modules.json 里的站内绝对 URL 补上部署 base（子路径部署，2026-10-21）。
+*
+* modules.json 是**构建期**产物（`ojm build`），URL 与站点挂载前缀无关
+* （恒为 `/modules/...`）；真实前缀只有运行期才知道（`window.__OJ_BASE__`）。
+* 因此在宿主拿到清单后立刻归一，后续所有消费者（信任根校验、CSS 注入、
+* modulepreload、loader entry）看到的都是最终 URL——只此一处，漏改即 404 白屏。
+*
+* 绝对域（CDN 模块）原样保留，见 `web.config.ts` 的 `baseUrl`。
+*/
+function resolveModuleUrls(list, base) {
+	return list.map((m) => ({
+		...m,
+		entry: m.entry === void 0 ? m.entry : withSiteBase(m.entry, base),
+		css: m.css?.map((href) => withSiteBase(href, base)),
+		chunks: m.chunks?.map((chunk) => ({
+			...chunk,
+			url: withSiteBase(chunk.url, base)
+		}))
+	}));
+}
+/**
 * P7.7：modules.json（cli BuiltModule[]）→ loader Manifest 的字段透传。
 *
 * 评审 F1/F2：此前裁剪成 {name, entry}，导致 enabled 过滤（US-9 下线）
@@ -206,10 +269,10 @@ function Boot() {
 		(async () => {
 			try {
 				ensureI18n();
-				const base = "/";
+				const base = resolveSiteBase();
 				const [res, versionsRes] = await Promise.all([fetch(`${base}modules.json`), fetch(`${base}versions.json`).catch(() => null)]);
 				if (!res.ok) throw new Error(`modules.json 加载失败：HTTP ${res.status}`);
-				const list = await res.json();
+				const list = resolveModuleUrls(await res.json(), base);
 				const runtimeVersion = versionsRes?.ok ? extractRuntimeVersion(await versionsRes.json()) : void 0;
 				if (!runtimeVersion) console.warn("[shell] 未获取到宿主 runtime 版本（versions.json 缺失），peerRuntime 校验跳过");
 				assertTrustedModules(list);
@@ -257,7 +320,17 @@ function Boot() {
 							element: /* @__PURE__ */ jsx(CatchAll, {})
 						}
 					]
-				}]));
+				}], { 
+				/**
+				* 子路径部署（oj `mounts: [{ prefix: /oj, web: dist, spa: true }]`）：
+				* 不设 basename 时 react-router 看到的是含前缀的 `/oj/wiki/...`，
+				* 匹配不到模块路由（`routes[].path` 恒为 `/wiki/...`，无模块根以外的
+				* 前缀），深链刷新直接落 catch-all 404。取值同 modules.json 的
+				* base（`resolveSiteBase()`），保证资源与路由用同一个前缀。
+				*
+				* 浏览器 URL 不受影响：react-router 只是在匹配/生成时剥/补前缀。
+				*/
+basename: base }));
 			} catch (e) {
 				if (!cancelled) setError(e instanceof Error ? e.message : String(e));
 			}

package/shell-dist/assets/runtime.js

@@ -152,21 +152,68 @@ var notify = {
 	}
 };
 //#endregion
+//#region src/utils/site-base.ts
+/**
+* 归一化为「以 `/` 开头且以 `/` 结尾」的形式。
+*
+* 接受 `oj` / `/oj` / `/oj/` / `oj/` 四种写法（配置手写极易带或不带斜杠），
+* 空值与 `"/"` 一律归为根路径。
+*/
+function normalizeSiteBase(raw) {
+	if (!raw) return ROOT_BASE;
+	const trimmed = raw.trim();
+	if (!trimmed || trimmed === ROOT_BASE) return ROOT_BASE;
+	const withLeading = trimmed.startsWith(ROOT_BASE) ? trimmed : `${ROOT_BASE}${trimmed}`;
+	return withLeading.endsWith(ROOT_BASE) ? withLeading : `${withLeading}${ROOT_BASE}`;
+}
+/**
+* 当前站点的部署 base（恒以 `/` 结尾）。
+*
+* 优先级：`window.__OJ_BASE__`（部署期注入）> `import.meta.env.BASE_URL`（构建期值）。
+*
+* 每次调用都重新读取——不做模块级缓存。原因：测试需要在不重启模块的情况下模拟
+* 不同部署前缀（`vi.stubGlobal`），而字符串归一化的成本可忽略。
+*/
+function resolveSiteBase() {
+	const injected = globalThis.__OJ_BASE__;
+	if (typeof injected === "string") return normalizeSiteBase(injected);
+	return normalizeSiteBase("/");
+}
+/**
+* 把站内绝对路径（`/assets/x.js`）拼到站点 base 上（`/oj/assets/x.js`）。
+*
+* 已带 base 的路径幂等；`http(s)://`、`//cdn`、`data:` 等一切非站内绝对路径原样返回
+* （模块 entry 允许是 CDN 绝对域，见 `web.config.ts` 的 `baseUrl`）。
+*/
+function withSiteBase(url, base = resolveSiteBase()) {
+	if (!url.startsWith(ROOT_BASE) || url.startsWith("//")) return url;
+	const normalized = normalizeSiteBase(base);
+	if (normalized === ROOT_BASE || url.startsWith(normalized)) return url;
+	return `${normalized.slice(0, -1)}${url}`;
+}
+var ROOT_BASE;
+var init_site_base = __esmMin((() => {
+	ROOT_BASE = "/";
+}));
+//#endregion
 //#region src/router/extra-info/route-path.ts
 /**
 * 判断 pathname 是否为登录页（basename 感知，P0）。
 *
 * 供 ky hooks 等 React 之外的场景使用：原始 `location.pathname` 含 BASE_URL，
-* 子路径部署（/app/）下直接与 loginPath 比较恒为 false，401 时会重复 goLogin。
+* 子路径部署（/oj/wiki/...）下直接与 loginPath 比较恒为 false，401 时会重复 goLogin。
 * React 组件内请用 `useLocation()`（react-router 已剥离 basename），无需本函数。
 *
-* @param base 部署 basename，Vite 保证以 `/` 结尾
+* @param base 部署 base，恒以 `/` 结尾；缺省取 `resolveSiteBase()`（部署期注入优先，
+* 见 utils/site-base.ts —— runtime 产物里的 `import.meta.env.BASE_URL` 是构建期
+* 内联的 `/`，子路径部署下直接用它恒错）
 */
-function isLoginPathname(pathname, base = "/") {
+function isLoginPathname(pathname, base = resolveSiteBase()) {
 	return pathname === `${base}${loginPath.slice(1)}`;
 }
 var loginPath, exceptionPath, exception403Path, exception404Path, exception500Path;
 var init_route_path = __esmMin((() => {
+	init_site_base();
 	loginPath = "/login";
 	exceptionPath = "/exception";
 	exception403Path = `${exceptionPath}/403`;
@@ -256,10 +303,10 @@ function getAppInfo() {
 	return {
 		"pkg": {
 			"name": "@oj-module/runtime",
-			"version": "0.2.14",
+			"version": "0.2.17",
 			"license": "MIT"
 		},
-		"lastBuildTime": "2026-10-21 09:05:39"
+		"lastBuildTime": "2026-10-21 21:54:09"
 	};
 }
 var init_get_app_info = __esmMin((() => {}));
@@ -3300,7 +3347,7 @@ function openMustChangeModal() {
 		maskClosable: false,
 		cancelButtonProps: { style: { display: "none" } },
 		onOk: () => {
-			window.location.href = `/change-password`;
+			window.location.href = `${resolveSiteBase()}change-password`;
 		},
 		afterClose: () => {
 			mustChangeModalOpen = false;
@@ -3310,6 +3357,7 @@ function openMustChangeModal() {
 var mustChangeModalOpen;
 var init_must_change = __esmMin((() => {
 	init_is();
+	init_site_base();
 	init_static_antd();
 	mustChangeModalOpen = false;
 }));
@@ -6077,6 +6125,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);
@@ -7477,6 +7526,24 @@ function getModules() {
 function getModule(name) {
 	return modules.get(name);
 }
+/**
+* 给模块路由打 module 标（R1，0.2.16）：递归 children，非突变返回新对象。
+* module 来自 `definition.name`，作者无需手写——归组据此甄别方案路由、
+* 生成 `solgroup:<category>:<module>` 父键，不再依赖宿主 DB 行。
+*/
+function tagModuleRoutes(routes, name) {
+	return routes.map((route) => {
+		const tagged = {
+			...route,
+			handle: {
+				...route.handle,
+				module: name
+			}
+		};
+		if (Array.isArray(route.children) && route.children.length > 0) tagged.children = tagModuleRoutes(route.children, name);
+		return tagged;
+	});
+}
 function getRoutes() {
 	const { roles, permissions = [] } = useUserStore.getState();
 	const routes = [];
@@ -7486,7 +7553,7 @@ function getRoutes() {
 		if (requiredRoles?.length && !requiredRoles.some((role) => roles.includes(role))) continue;
 		const requiredPermissions = instance.definition.config?.requiredPermissions;
 		if (requiredPermissions?.length && !requiredPermissions.every((perm) => permissions.includes(perm))) continue;
-		if (instance.definition.routes.length > 0) routes.push(...resolveRouteLayouts(instance.definition.routes));
+		if (instance.definition.routes.length > 0) routes.push(...resolveRouteLayouts(tagModuleRoutes(instance.definition.routes, instance.definition.name)));
 	}
 	return addRouteIdByPath(routes);
 }
@@ -8293,13 +8360,23 @@ var init_constants = __esmMin((() => {
 //#endregion
 //#region src/router/index.ts
 function createRouter() {
-	return createBrowserRouter(rootRoute, { basename: "/" });
+	return createBrowserRouter(rootRoute, { 
+	/**
+	* @zh 子路径部署（oj `mounts: [{ prefix: /oj }]`）下 basename 必须是部署前缀，
+	* 否则 react-router 不剥前缀，深链 `/oj/wiki/...` 匹配不到任何路由（落到 404 兜底）。
+	* 取值走 `resolveSiteBase()`：优先宿主注入的 `window.__OJ_BASE__`，回退构建期
+	* `import.meta.env.BASE_URL`——后者在预构建产物里被内联成 `/`，单独用不可靠。
+	* @en Under sub-path deployment the basename must be the deploy prefix; read it
+	* through `resolveSiteBase()` instead of the build-time `import.meta.env.BASE_URL`.
+	*/
+basename: resolveSiteBase() });
 }
 var loadedPaths, rootRoute, router;
 var init_router = __esmMin((() => {
 	init_layout_root();
 	init_preferences$3();
 	init_progress();
+	init_site_base();
 	init_constants();
 	init_routes();
 	loadedPaths = /* @__PURE__ */ new Set();
@@ -8360,9 +8437,10 @@ function resolveMenuKey(path, parentPath) {
 */
 function generateMenuItemsFromRoutes(routeList, parentPath = "/") {
 	return routeList.reduce((acc, item) => {
-		const label = item.handle?.title;
-		const externalLink = item?.handle?.externalLink;
-		const icon = item?.handle?.icon;
+		const handle = item.handle;
+		const label = handle?.title;
+		const externalLink = handle?.externalLink;
+		const icon = handle?.icon;
 		const absolutePath = resolveMenuKey(item.path, parentPath);
 		const menuItem = {
 			key: absolutePath,
@@ -8376,45 +8454,151 @@ function generateMenuItemsFromRoutes(routeList, parentPath = "/") {
 			}, label) : label
 		};
 		if (icon) menuItem.icon = icon;
+		if (handle?.module) menuItem.module = handle.module;
+		if (handle?.category) menuItem.category = handle.category;
+		if (handle?.order !== void 0) menuItem.order = handle.order;
 		if (Array.isArray(item.children) && item.children.length > 0) {
-			const noIndexRoute = item.children.filter((route) => !route.index && !route?.handle?.hideInMenu);
+			const noIndexRoute = item.children.filter((route) => !route.index && !route?.handle?.hideInMenu && route?.handle?.category !== "hidden");
 			if (noIndexRoute.length > 0) menuItem.children = generateMenuItemsFromRoutes(noIndexRoute, absolutePath);
 		}
-		if (item?.handle?.hideInMenu) return acc;
+		if (handle?.hideInMenu || handle?.category === "hidden") return acc;
 		return [...acc, menuItem];
 	}, []);
 }
 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);
+}
+/** 取某 item 的有效归组元数据（handle 优先，行回退） */
+function effective(item, row) {
+	return {
+		module: item.module ?? row?.module,
+		category: item.category ?? row?.category
+	};
+}
+/**
+* 递归摘除 category==="admin" 的菜单项（handle 优先、行回退兜底），按 module 分桶收集；
+* 收集时压平 admin 项自身的层级——直接取 admin 项的 children，使"管理"中间级消失、
+* 子项直挂 `<module>:menu.main` 子组下，无 children 时退回 admin 项本身。
+* 其余项原样保留（children 递归同样处理），非突变；无变动的子树复用原引用。
+*
+* 返回新数组（有项被摘除/被重写父级时）或原数组引用（整段无 admin 时），便于调用方
+* 判断是否需重建 /system children（避免无 admin 项时给 /system 强加空 children）。
+*/
+function stripAdmin(list, byPath, buckets) {
+	let changed = false;
+	const out = [];
+	for (const it of list) {
+		const { module, category } = effective(it, byPath.get(it.key));
+		if (category === "admin" && module) {
+			const subItems = it.children && it.children.length > 0 ? it.children : [it];
+			const bucket = buckets.get(module) ?? {
+				items: [],
+				module,
+				minOrder: Infinity
+			};
+			for (const s of subItems) bucket.items.push(s);
+			bucket.minOrder = Math.min(bucket.minOrder, it.order ?? 0);
+			buckets.set(module, bucket);
+			changed = true;
+			continue;
+		}
+		if (it.children && it.children.length > 0) {
+			const newChildren = stripAdmin(it.children, byPath, buckets);
+			if (newChildren !== it.children) {
+				changed = true;
+				out.push({
+					...it,
+					children: newChildren
+				});
+			} else out.push(it);
+		} else out.push(it);
+	}
+	return changed ? out : list;
+}
+function makeAdminGroup(module, items) {
+	const paired = items.map((item) => ({
+		item,
+		order: item.order ?? 0
+	})).sort((a, b) => a.order - b.order);
+	return {
+		key: `${ADMIN_PREFIX}${module}`,
+		label: `${module}:menu.main`,
+		children: paired.map((p) => p.item)
+	};
+}
+/**
+* 归组入口。
+*
+* @param top 主区菜单项（order >= 0）
+* @param bottom 底部固定区菜单项（order < 0，含 /system）
+* @param rows 宿主方案路由行（可选）：缺省或空时归组完全依赖 handle 元数据（dev 形态）；
+*   提供时仅作 category 的向后兼容回退（0.2.15 已装站点），不参与新 bundle 的归组真源。
+* @param opts 选项（systemKey / onWarn）
+*/
+function groupSolutionMenus(top, bottom, rows, opts = {}) {
+	const systemKey = opts.systemKey ?? "/system";
+	const onWarn = opts.onWarn ?? defaultWarn;
+	const byPath = /* @__PURE__ */ new Map();
+	for (const r of rows ?? []) if (r.category === "admin" && r.enabled !== false) byPath.set(r.path, r);
+	const buckets = /* @__PURE__ */ new Map();
+	const newTop = stripAdmin(top, byPath, buckets);
+	const newBottom = stripAdmin(bottom, byPath, buckets);
+	const adminGroups = [...buckets.entries()].map(([module, b]) => ({
+		minOrder: b.minOrder,
+		group: makeAdminGroup(module, b.items)
+	})).sort((a, b) => a.minOrder - b.minOrder);
+	let resultBottom = newBottom;
+	const sysIdx = newBottom.findIndex((it) => it.key === systemKey);
+	if (adminGroups.length > 0) {
+		if (sysIdx !== -1) {
+			const system = newBottom[sysIdx];
+			resultBottom = newBottom.slice();
+			resultBottom[sysIdx] = {
+				...system,
+				children: [...system.children ?? [], ...adminGroups.map((g) => g.group)]
+			};
+		} else onWarn(`[solution-menu-grouping] system menu "${systemKey}" not found; admin items dropped from menu.`);
+	}
+	return {
+		top: newTop,
+		bottom: resultBottom
+	};
+}
+var ADMIN_PREFIX, warnedOnce;
+var init_group_solution_menus = __esmMin((() => {
+	ADMIN_PREFIX = "solgroup:admin:";
+	warnedOnce = /* @__PURE__ */ new Set();
+}));
+//#endregion
 //#region src/router/utils/merge-solution-categories.ts
 /**
-* 方案路由归并（纯函数，R21）：按 path 把 sys_solution_route 行注记到已注册路由上。
+* 方案路由归并（纯函数，R21 / 0.2.16 收窄）：DB 行仅作为「管理覆写层」。
 *
-* - 三值 category 原样落 handle.category（main=常规组、admin=管理组、hidden=不进菜单）；
-* - hidden 与 enabled=0（禁用）复用既有 hideInMenu 通路——只过滤菜单层，路由仍可达
-*   （禁用的路由摘除归装载层三处同写，D12）；
-* - order 覆写为声明序（2026-10-20 双段序轴）：框架常规项 ≥0 升序、管理面负数入
-*   底部固定区（pin 侧边栏底部，ascending 双段排序）、方案项从 200 起编，共用一条序轴；
-*   同 order 按根 path 字母序；
-* - 未匹配路由（框架/后端）原样保留（同一对象引用），入参不突变；
-* - solRoutes 为空（端点失败/未登录降级空表）时原样返回——降级不阻断，路由照常。
+* 0.2.16 起 `category`/`order`/`module` 已是路由 handle 真源（作者声明 + module-loader 注入，
+* 见 R1/R2），不再由本函数从行注写。本函数只保留一项管理语义：
 *
-* title 不在此覆写：entry.ts 是模块元数据唯一来源（module-loader 既有惯例），
-* title_key 随行下发仅供深检对比。
+* - **禁用覆写**：行 `enabled === false`（或 deprecated）时追加 `hideInMenu: true`，
+*   使该菜单项不可见（路由仍可达，D12 口径——禁用在装载层三处同写）；
+* - 其余字段（category/order/module/title）一律不覆写，保持 handle 原值；
+* - 入参不突变（未命中行或无需覆写时返回同一对象引用）；
+* - solRoutes 为空（端点失败/未登录/dev 零行降级）时原样返回——降级不阻断，路由照常。
 */
 function mergeSolutionCategories(routes, solRoutes) {
 	if (solRoutes.length === 0) return routes;
 	const byPath = new Map(solRoutes.map((r) => [r.path, r]));
 	return routes.map((route) => {
 		const row = route.path ? byPath.get(route.path) : void 0;
-		if (!row) return route;
+		if (!row || row.enabled !== false) return route;
 		return {
 			...route,
 			handle: {
 				...route.handle,
-				category: row.category,
-				order: row.order,
-				hideInMenu: row.category === "hidden" || !row.enabled || (route.handle.hideInMenu ?? false)
+				hideInMenu: true
 			}
 		};
 	});
@@ -8471,6 +8655,42 @@ var init_resolve_login_route = __esmMin((() => {
 	isInternalLoginRoute = (r) => r?.handle?.login === true && r?.handle?.internal === true;
 }));
 //#endregion
+//#region src/router/utils/rewrite-admin-paths.ts
+/** 解析路由绝对路径（与 generate-menu-items-from-routes 同语义） */
+function resolveAbs(path, parentAbs) {
+	if (!path) return parentAbs;
+	return path.startsWith("/") ? path : `${parentAbs.replace(/\/+$/, "")}/${path}`;
+}
+function rewriteAdminPaths(routes, systemKey = SYSTEM_KEY) {
+	const hoisted = [];
+	return [...routes.map((r) => processRoute(r, "/", systemKey, hoisted, void 0)).filter((r) => r !== null), ...hoisted];
+}
+function processRoute(route, parentAbs, systemKey, hoisted, moduleRootAbs) {
+	const abs = resolveAbs(route.path, parentAbs);
+	const rootAbs = moduleRootAbs ?? abs;
+	if (route.handle?.category === "admin") {
+		const newAbs = `${systemKey}${rootAbs}${abs.slice(rootAbs.length) || ""}`;
+		hoisted.push({
+			...route,
+			path: newAbs
+		});
+		return null;
+	}
+	if (!route.children || route.children.length === 0) return { ...route };
+	const newChildren = [];
+	for (const c of route.children) {
+		const processed = processRoute(c, abs, systemKey, hoisted, rootAbs);
+		if (processed !== null) newChildren.push(processed);
+	}
+	const result = { ...route };
+	result.children = newChildren;
+	return result;
+}
+var SYSTEM_KEY;
+var init_rewrite_admin_paths = __esmMin((() => {
+	SYSTEM_KEY = "/system";
+}));
+//#endregion
 //#region src/store/access.ts
 /**
 * 切分主区/底部固定区路由（ascending 已双段排序：负 order 段整体在后）。
@@ -8495,8 +8715,10 @@ 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();
+	init_rewrite_admin_paths();
 	baseMenuRoutes = splitMenuRoutes(baseRoutes);
 	initialState$1 = {
 		wholeMenus: generateMenuItemsFromRoutes(baseMenuRoutes.top),
@@ -8510,13 +8732,15 @@ var init_access = __esmMin((() => {
 	useAccessStore = create((set, get) => ({
 		...initialState$1,
 		setAccessStore: (routes) => {
-			const newRoutes = ascending([...resolveLoginRoute(baseRoutes, routes, router, rootRoute), ...mergeSolutionCategories(routes, get().solutionRoutes)]);
-			router.patchRoutes(ROOT_ROUTE_ID, routes);
+			const rewrittenRoutes = rewriteAdminPaths(routes);
+			const newRoutes = ascending([...resolveLoginRoute(baseRoutes, rewrittenRoutes, router, rootRoute), ...mergeSolutionCategories(rewrittenRoutes, get().solutionRoutes)]);
+			router.patchRoutes(ROOT_ROUTE_ID, rewrittenRoutes);
 			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
@@ -8691,15 +8915,20 @@ var init_remember_route = __esmMin((() => {
 /**
 * 跳转到登录页面
 *
+* 必须带上部署 base（`resolveSiteBase()`）：子路径部署下 `location.href = "/login"`
+* 会跳到宿主机根，而不是 `/oj/login`。不能用 `import.meta.env.BASE_URL`——预构建
+* 产物里它是构建期内联的 `/`。
+*
 * @returns 无返回值
 */
 function goLogin() {
 	useAuthStore.getState().reset();
-	window.location.href = `/login${rememberRoute()}`;
+	window.location.href = `${resolveSiteBase()}login${rememberRoute()}`;
 }
 var init_go_login = __esmMin((() => {
 	init_auth();
 	init_remember_route();
+	init_site_base();
 }));
 //#endregion
 //#region src/utils/request/header-safe.ts
@@ -27814,10 +28043,11 @@ init_user();
 init_get_app_info();
 init_get_redirect_path();
 init_request();
+init_site_base();
 init_user$1();
 init_local_icons();
 init_ri();
 init_menu_icons();
 init_tree();
 //#endregion
-export { AccessControl, AccessControlRoles, AntdApp, BasicButton, BasicContent, BasicTable, EmbeddedIcon, ErrorBoundary, ExternalIcon, FormAvatarItem, FormTreeItem, Iframe, LayoutCenterIcon, LayoutEffects, LayoutLeftIcon, LayoutRightIcon, MixedNavigationIcon, OutsidePageIcon, PageError, ProfileCardIcon, RiAccountCircleLine, RiContrastFill, RiFullscreenExitLine, RiFullscreenLine, RiMailCheckLine, RiMoonIcon, RiReactjsLine, RiSunIcon, RiUserSettingsLine, ServerErrorIcon, SideNavigationIcon, TopNavigationIcon, TwoColumnNavigationIcon, accessControlCodes, bindingDiff, canAssignRole, canDeleteRole, canEditRoleBindings, defineModule, fetchAddMenuItem, fetchAddRoleItem, fetchAsyncRoutes, fetchChangePassword, fetchDeleteMenuItem, fetchDeleteRoleItem, fetchLdapLogin, fetchLogin, fetchLoginMethods, fetchLogout, fetchMenuByRoleId, fetchMenuList, fetchRbacAdminResetPassword, fetchRbacContactDetail, fetchRbacContacts, fetchRbacCreateRole, fetchRbacCreateUser, fetchRbacDeleteRole, fetchRbacOplog, fetchRbacOplogPost, fetchRbacPermissionList, fetchRbacRoleList, fetchRbacSetForbidden, fetchRbacSettings, fetchRbacUpdateBindings, fetchRbacUpdateSetting, fetchRbacUpdateUserRoles, fetchRbacUserList, fetchRefreshToken, fetchRoleList, fetchRoleMenu, fetchSolutionRoutes, fetchUpdateMenuItem, fetchUpdateRoleItem, fetchUserInfo, filterTree, getAllExpandedKeys, getAppInfo, getBooleanOptions, getModule, getModules, getRedirectPath, getRegisteredApiPrefix, getRegisteredStore, getRoutes, getYesNoOptions, groupByModule, groupSettingsByModule, handleTree, loadAll, mapTree, menuIcons, notify, permissionPrefix, request, roleLabel, setupI18n, traverseTreeValues, unloadModule, useAccess, useAuthStore, usePreferences, useSlotNodes, useSolutionRoutes, useTabKey, useTabsStore, useUserStore, external_exports as z };
+export { AccessControl, AccessControlRoles, AntdApp, BasicButton, BasicContent, BasicTable, EmbeddedIcon, ErrorBoundary, ExternalIcon, FormAvatarItem, FormTreeItem, Iframe, LayoutCenterIcon, LayoutEffects, LayoutLeftIcon, LayoutRightIcon, MixedNavigationIcon, OutsidePageIcon, PageError, ProfileCardIcon, RiAccountCircleLine, RiContrastFill, RiFullscreenExitLine, RiFullscreenLine, RiMailCheckLine, RiMoonIcon, RiReactjsLine, RiSunIcon, RiUserSettingsLine, ServerErrorIcon, SideNavigationIcon, TopNavigationIcon, TwoColumnNavigationIcon, accessControlCodes, bindingDiff, canAssignRole, canDeleteRole, canEditRoleBindings, defineModule, fetchAddMenuItem, fetchAddRoleItem, fetchAsyncRoutes, fetchChangePassword, fetchDeleteMenuItem, fetchDeleteRoleItem, fetchLdapLogin, fetchLogin, fetchLoginMethods, fetchLogout, fetchMenuByRoleId, fetchMenuList, fetchRbacAdminResetPassword, fetchRbacContactDetail, fetchRbacContacts, fetchRbacCreateRole, fetchRbacCreateUser, fetchRbacDeleteRole, fetchRbacOplog, fetchRbacOplogPost, fetchRbacPermissionList, fetchRbacRoleList, fetchRbacSetForbidden, fetchRbacSettings, fetchRbacUpdateBindings, fetchRbacUpdateSetting, fetchRbacUpdateUserRoles, fetchRbacUserList, fetchRefreshToken, fetchRoleList, fetchRoleMenu, fetchSolutionRoutes, fetchUpdateMenuItem, fetchUpdateRoleItem, fetchUserInfo, filterTree, getAllExpandedKeys, getAppInfo, getBooleanOptions, getModule, getModules, getRedirectPath, getRegisteredApiPrefix, getRegisteredStore, getRoutes, getYesNoOptions, groupByModule, groupSettingsByModule, handleTree, loadAll, mapTree, menuIcons, notify, permissionPrefix, request, resolveSiteBase, roleLabel, setupI18n, traverseTreeValues, unloadModule, useAccess, useAuthStore, usePreferences, useSlotNodes, useSolutionRoutes, useTabKey, useTabsStore, useUserStore, withSiteBase, external_exports as z };

package/shell-dist/index.html

@@ -5,9 +5,9 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<link rel="icon" href="/favicon.ico" />
 		<title>React Antd Admin · Shell</title>
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' https://modules.cdn.example.com 'wasm-unsafe-eval' 'nonce-+pwCPvP4yV4ptlEA55QxXw=='; script-src-attr 'none'; connect-src 'self' data: https://modules.cdn.example.com; style-src 'self' https://modules.cdn.example.com 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; frame-src https://ant.design https://react.dev https://condorheroblog.github.io; form-action 'none'; base-uri 'none'; object-src 'none'; upgrade-insecure-requests" />
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' https://modules.cdn.example.com 'wasm-unsafe-eval' 'nonce-NKdPzzWoLWlLgH/F6SaXrg=='; script-src-attr 'none'; connect-src 'self' data: https://modules.cdn.example.com; style-src 'self' https://modules.cdn.example.com 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; frame-src https://ant.design https://react.dev https://condorheroblog.github.io; form-action 'none'; base-uri 'none'; object-src 'none'; upgrade-insecure-requests" />
 
-		<script type="importmap" nonce="+pwCPvP4yV4ptlEA55QxXw==">{
+		<script type="importmap" nonce="NKdPzzWoLWlLgH/F6SaXrg==">{
   "imports": {
     "react": "/assets/react.js",
     "react/jsx-runtime": "/assets/jsx-runtime.js",
@@ -133,7 +133,7 @@
     "dayjs/locale/zh-cn": "/assets/ojm-dayjs-locale-zh-cn.js"
   }
 }</script>
-		<script type="module" crossorigin src="/assets/index-CLdhl3Qd.js"></script>
+		<script type="module" crossorigin src="/assets/index-B3g19Uet.js"></script>
 	</head>
 	<body>
 		<div id="root"></div>

package/shell-dist/versions.json

@@ -7,9 +7,9 @@
   "react-router": "7.18.2",
   "react-router/dom": "7.18.2",
   "@tanstack/react-query": "5.102.8",
-  "@oj-module/runtime": "0.2.14",
-  "@oj-module/runtime/contract": "0.2.14",
-  "@oj-module/runtime/contract/errors": "0.2.14",
+  "@oj-module/runtime": "0.2.17",
+  "@oj-module/runtime/contract": "0.2.17",
+  "@oj-module/runtime/contract/errors": "0.2.17",
   "@plane/kit": "0.1.20",
   "@plane/editor": "0.1.20",
   "antd": "6.6.1",