@oj-module/cli 0.2.8 → 0.2.14

package/templates/web/src/notification/locales/en-US.json

@@ -0,0 +1,19 @@
+{
+	"menu": {
+		"notificationCenter": "Notifications"
+	},
+	"center": {
+		"tabAll": "All",
+		"category": {
+			"notice": "Notice",
+			"pm": "Direct",
+			"mention": "Mentions"
+		},
+		"markAllRead": "Mark all as read",
+		"clear": "Clear",
+		"clearConfirm": "Clear all notifications? (Broadcasts are hidden for you only)",
+		"empty": "No notifications",
+		"scopeBroadcast": "Broadcast",
+		"scopeUser": "Personal"
+	}
+}

package/templates/web/src/notification/locales/zh-CN.json

@@ -0,0 +1,19 @@
+{
+	"menu": {
+		"notificationCenter": "通知中心"
+	},
+	"center": {
+		"tabAll": "全部",
+		"category": {
+			"notice": "通知",
+			"pm": "私信",
+			"mention": "@我"
+		},
+		"markAllRead": "全部已读",
+		"clear": "清空",
+		"clearConfirm": "确定清空所有通知吗？（广播仅对您隐藏，不影响他人）",
+		"empty": "暂无通知",
+		"scopeBroadcast": "广播",
+		"scopeUser": "个人"
+	}
+}

package/templates/web/src/notification/pages/center/index.tsx

@@ -0,0 +1,131 @@
+import type { NoticeCategory } from "@oj-module/runtime/notify";
+
+import { CheckOutlined, ClearOutlined } from "@ant-design/icons";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { App, Avatar, Button, Empty, List, Popconfirm, Segmented, Tag, Tooltip } from "antd";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import {
+	notificationNotificationsClearPost,
+	notificationNotificationsGet,
+	notificationNotificationsReadAllPost,
+	notificationNotificationsReadPost,
+} from "../../__client/api";
+
+type Item = Awaited<ReturnType<typeof notificationNotificationsGet>>[number];
+type CatFilter = "all" | NoticeCategory;
+
+const CAT_COLOR: Record<NoticeCategory, string> = {
+	notice: "blue",
+	pm: "magenta",
+	mention: "orange",
+};
+
+/**
+ * 通知中心（N3 落地）：全量消息页，铃铛弹层「查看全部」跳转至此。
+ * 按类型（notice/pm/mention）Tab 过滤；单条点击标记已读并跳深链；
+ * 全部已读/清空与铃铛弹层同一数据路径（/api/notification/*）。
+ */
+export default function NotificationCenter() {
+	const { t } = useTranslation("notification");
+	const { message } = App.useApp();
+	const queryClient = useQueryClient();
+	const [cat, setCat] = useState<CatFilter>("all");
+
+	const { data, isPending } = useQuery({
+		queryKey: ["notification-center"],
+		queryFn: notificationNotificationsGet,
+	});
+
+	const invalidate = () => queryClient.invalidateQueries({ queryKey: ["notification-center"] });
+
+	const readMut = useMutation({
+		mutationFn: (id: string) => notificationNotificationsReadPost({ id }),
+		onSettled: invalidate,
+		onError: e => message.error(String(e)),
+	});
+	const readAllMut = useMutation({
+		mutationFn: notificationNotificationsReadAllPost,
+		onSettled: invalidate,
+		onError: e => message.error(String(e)),
+	});
+	const clearMut = useMutation({
+		mutationFn: notificationNotificationsClearPost,
+		onSettled: invalidate,
+		onError: e => message.error(String(e)),
+	});
+
+	const items = (data ?? []).filter(x => cat === "all" || x.category === cat);
+
+	const handleClick = (item: Item) => {
+		if (!item.isRead)
+			readMut.mutate(item.id);
+		// 深链与铃铛弹层同约定：标记已读后新标签打开
+		if (item.link)
+			window.open(item.link, "_blank", "noopener");
+	};
+
+	const hasUnread = (data ?? []).some(x => !x.isRead);
+
+	return (
+		<div className="max-w-2xl mx-auto p-4">
+			<div className="flex items-center justify-between mb-3">
+				<Segmented
+					value={cat}
+					onChange={v => setCat(v as CatFilter)}
+					options={[
+						{ label: t("center.tabAll"), value: "all" },
+						{ label: t("center.category.notice"), value: "notice" },
+						{ label: t("center.category.pm"), value: "pm" },
+						{ label: t("center.category.mention"), value: "mention" },
+					]}
+				/>
+				<div className="flex items-center gap-2">
+					<Tooltip title={hasUnread ? t("center.markAllRead") : null}>
+						<Button
+							disabled={!hasUnread || readAllMut.isPending}
+							icon={<CheckOutlined />}
+							onClick={() => readAllMut.mutate()}
+						>
+							{t("center.markAllRead")}
+						</Button>
+					</Tooltip>
+					<Popconfirm title={t("center.clearConfirm")} onConfirm={() => clearMut.mutate()}>
+						<Button danger disabled={!(data ?? []).length || clearMut.isPending} icon={<ClearOutlined />}>
+							{t("center.clear")}
+						</Button>
+					</Popconfirm>
+				</div>
+			</div>
+			<List
+				loading={isPending}
+				itemLayout="horizontal"
+				locale={{ emptyText: <Empty description={t("center.empty")} /> }}
+				dataSource={items}
+				renderItem={item => (
+					<List.Item className="cursor-pointer hover:bg-gray-100" onClick={() => handleClick(item)}>
+						<List.Item.Meta
+							avatar={<Avatar src={item.avatar || undefined}>{item.title.slice(0, 1)}</Avatar>}
+							title={(
+								<span className="flex items-center gap-2">
+									{!item.isRead && <span className="w-2 h-2 rounded bg-blue-600 inline-block shrink-0" />}
+									<span className="font-semibold">{item.title}</span>
+									<Tag color={CAT_COLOR[item.category ?? "notice"]}>
+										{t(`center.category.${item.category ?? "notice"}`)}
+									</Tag>
+								</span>
+							)}
+							description={(
+								<div className="flex flex-col gap-1">
+									<span>{item.message}</span>
+									<span className="text-xs text-muted-foreground">{item.date}</span>
+								</div>
+							)}
+						/>
+					</List.Item>
+				)}
+			/>
+		</div>
+	);
+}

package/templates/web/src/oj-market/entry.ts

@@ -1,4 +1,5 @@
-import { defineModule } from "@oj-module/runtime";
+import { defineModule, OutsidePageIcon } from "@oj-module/runtime";
+import { createElement } from "react";
 import MarketApp from "./pages/MarketApp";
 
 // 方案市场前端模块（第一方专用，R29：消费 /api/_platform/market/* 编排面，第三方方案不得仿照此调用面）。
@@ -10,7 +11,12 @@ export default defineModule({
 	routes: [
 		{
 			path: "/oj-market",
-			handle: { layout: "container", order: 200, title: "oj-market:menu.main" },
+			handle: {
+				layout: "container",
+				order: 200,
+				title: "oj-market:menu.main",
+				icon: createElement(OutsidePageIcon),
+			},
 			children: [
 				{
 					index: true,

package/templates/web/src/personal-center/__client/api.schemas.ts

@@ -4,6 +4,15 @@
 import { z } from "@oj-module/runtime";
 
 export const schemas = {
+	"personalCenterProfilePost": {
+		body: z.object({
+	"username": z.string().optional(),
+	"email": z.string().optional(),
+	"phoneNumber": z.string().optional(),
+	"description": z.string().optional()
+}),
+		data: z.null(),
+	},
 	"personalCenterUploadPost": {
 		data: z.string(),
 	},

package/templates/web/src/personal-center/__client/api.ts

@@ -33,7 +33,7 @@ export function createPersonalCenterClient(ctx: ModuleContext) {
 	}
 	ctx.register.apiPrefix(API_PREFIX);
 	bindRequest(ctx.utils.request);
-	return { personalCenterUploadPost };
+	return { personalCenterProfilePost, personalCenterUploadPost };
 }
 
 /**
@@ -64,6 +64,30 @@ async function toApiError(e: unknown): Promise<unknown> {
 	return e;
 }
 
+export type PersonalCenterProfilePostBody = z.input<(typeof schemas)["personalCenterProfilePost"]["body"]>;
+export type PersonalCenterProfilePostData = z.infer<(typeof schemas)["personalCenterProfilePost"]["data"]>;
+
+export async function personalCenterProfilePost(body: PersonalCenterProfilePostBody): Promise<PersonalCenterProfilePostData> {
+	const client = ensureReq();
+	try {
+		const env = await client.post(`personal-center/profile`, { json: body }).json<OjEnvelope<PersonalCenterProfilePostData>>();
+		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
+		if (typeof env.code === "number" && env.code !== 0)
+			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
+		const data = env.data as PersonalCenterProfilePostData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["personalCenterProfilePost"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] personalCenterProfilePost 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
+		return data;
+	}
+	catch (e) {
+		throw await toApiError(e);
+	}
+}
+
 export type PersonalCenterUploadPostData = z.infer<(typeof schemas)["personalCenterUploadPost"]["data"]>;
 
 export async function personalCenterUploadPost(): Promise<PersonalCenterUploadPostData> {

package/templates/web/src/personal-center/entry.ts

@@ -3,6 +3,8 @@ import { ProfileCardIcon, RiAccountCircleLine, useAuthStore } from "@oj-module/r
 
 import { createElement, lazy } from "react";
 
+import { createPersonalCenterClient } from "./__client/api";
+
 const MyProfile = lazy(() => import("./pages/my-profile"));
 
 const routes: AppRouteRecordRaw[] = [
@@ -40,6 +42,9 @@ const mod: ModuleDefinition = {
 		// P4-3：接管头像上传端点（D9）。antd Upload 直连 action，headers 在上传瞬间
 		// 取当前 token 注入 Bearer（token 存 runtime auth store，跨渲染期读 getState）。
 		async onInit(ctx) {
+			// 构造即接线：登记契约前缀 /personal-center + 绑定 scoped request，
+			// 页面直接 import 的 personalCenterProfilePost 才有可用的请求通道
+			createPersonalCenterClient(ctx);
 			const provider: UploadApiProvider = {
 				action: "/api/personal-center/upload",
 				headers: (): Record<string, string> => {

package/templates/web/src/personal-center/pages/my-profile/index.tsx

@@ -5,10 +5,13 @@ import {
 	ProFormTextArea,
 } from "@ant-design/pro-components";
 import { BasicContent, FormAvatarItem, useUserStore } from "@oj-module/runtime";
-import { Form, Input } from "antd";
+import { App, Form, Input } from "antd";
+
+import { personalCenterProfilePost } from "../../__client/api";
 
 export default function Profile() {
 	const currentUser = useUserStore();
+	const { message } = App.useApp();
 	const getAvatarURL = () => {
 		if (currentUser) {
 			if (currentUser.avatar) {
@@ -20,8 +23,27 @@ export default function Profile() {
 		return "";
 	};
 
-	const handleFinish = async () => {
-		window.$message?.success("更新基本信息成功");
+	// 真实入库：POST /api/personal-center/profile（只传资料四字段，avatar 走 upload 通道），
+	// 成功后重拉 user-info 刷新全局 store（表单 initialValues 随之更新）。
+	const handleFinish = async (values: {
+		username?: string
+		email?: string
+		phoneNumber?: string
+		description?: string
+	}) => {
+		try {
+			await personalCenterProfilePost({
+				username: values.username,
+				email: values.email,
+				phoneNumber: values.phoneNumber,
+				description: values.description,
+			});
+			await useUserStore.getState().getUserInfo();
+			message.success("更新基本信息成功");
+		}
+		catch (e) {
+			message.error(`更新基本信息失败：${e instanceof Error ? e.message : String(e)}`);
+		}
 	};
 
 	return (

package/templates/web/src/system/entry.ts

@@ -20,7 +20,8 @@ const routes: AppRouteRecordRaw[] = [
 		handle: {
 			icon: createElement(SettingOutlined),
 			title: "system:menu.system",
-			order: 100,
+			// 负 order = 底部固定区：系统管理 pin 在侧边栏底部（2026-10-20 序轴约定）
+			order: -100,
 			layout: "container",
 		},
 		children: [

package/templates/web.config.ts

@@ -2,12 +2,15 @@
  * 模块工程配置：共享依赖一律不进 dependencies（宿主 importmap 提供），
  * 这里只登记模块清单（entry 相对本工程根）。
  *
- * 模块顺序即导航顺序：`home` 必须第一个（shell 的 "/" 重定向到它）。
+ * 注意：这里的登记顺序只影响模块加载顺序，**不决定侧边栏导航顺序**——
+ * 菜单顺序由各模块 entry 路由的 handle.order 决定（≥0 主菜单区升序；
+ * <0 底部固定区，pin 在侧边栏底部；同 order 按根 path 字母序）。
+ * `home` 必须第一个登记（shell 的 "/" 重定向到它）。
  */
 const allModules = [
 	// /home 必须是首个模块：shell 的 "/" → VITE_BASE_HOME_PATH（=/home）重定向
 	{ name: "home", entry: "web/src/home/entry.ts" },
-	{ name: "demo", entry: "web/src/demo/entry.ts" },
+	// { name: "demo", entry: "web/src/demo/entry.ts" },
 	// /login 路由由模块提供：shell 宿主不挂 runtime 内置 baseRoutes
 	{ name: "login", entry: "web/src/login/entry.ts" },
 	// 个人中心：runtime 用户菜单固定导航 /personal-center/my-profile，缺则点击落空
@@ -25,11 +28,11 @@ const allModules = [
 	// 用于把 templates 当可运行 demo 直接跑；其文件不在 `ojm init` 的
 	// init.include.yaml 白名单里，不拷入新工程，故本区间连同这些条目会被
 	// init 一并剥离，脚手架产出的配置不会残留指向缺失文件的死条目。
-	{ name: "about", entry: "web/src/about/entry.ts" },
-	{ name: "access", entry: "web/src/access/entry.ts" },
-	{ name: "exception", entry: "web/src/exception/entry.ts" },
-	{ name: "outside", entry: "web/src/outside/entry.ts" },
-	{ name: "route-nest", entry: "web/src/route-nest/entry.ts" },
+	// { name: "about", entry: "web/src/about/entry.ts" },
+	// { name: "access", entry: "web/src/access/entry.ts" },
+	// { name: "exception", entry: "web/src/exception/entry.ts" },
+	// { name: "outside", entry: "web/src/outside/entry.ts" },
+	// { name: "route-nest", entry: "web/src/route-nest/entry.ts" },
 	// #endregion demo-only
 ];
 

package/vendor/host-versions.json

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

package/templates/api/src/notifications/api.ts

@@ -1,29 +0,0 @@
-// GET /api/notifications —— 通知列表（runtime 通知铃的内置 root 级兜底端点）。
-//
-// runtime 的 fetchNotifications 在未注册 notificationsApi provider 时，直接
-// `request.get("notifications")` → 本端点；返回 NotificationItem[]（信封内 data）。
-// 查 notifications 表，is_read(0/1) 映射为布尔 isRead；Bearer 守卫保护。
-//
-// G5：本目录只保留只读兜底——表结构/种子迁归 api/src/notification/ 模块
-// （评审 b3 双模块同表冲突决策）；查询须返回 id（G4 NotificationItem.id 必填）。
-//
-// 注意：root 级路径无法写进业务契约（defineApi 要求 route 以 "/" 开头），
-// 故本模块已在 api/.ojm-api-exempt.json 豁免，ojm api --check 不会误报。
-export default {
-	async get() {
-		try {
-			const rows = await db.table("notifications").select(["id", "avatar", "date", "is_read", "message", "title"]).orderBy([{ field: "id", dir: "desc" }]).all();
-			json.ok(rows.map(r => ({
-				id: Number(r.id),
-				avatar: String(r.avatar),
-				date: String(r.date),
-				isRead: Number(r.is_read) === 1,
-				message: String(r.message),
-				title: String(r.title),
-			})));
-		}
-		catch (e) {
-			json.fail(500, String(e));
-		}
-	},
-};

package/templates/api/src/notifications/manifest.yaml

@@ -1,5 +0,0 @@
-name: notifications
-desc: 通知兜底（runtime 通知铃未接 provider 时的 root 级 /api/notifications 只读回落；表结构/种子归 notification 模块）
-version: 0.1.0
-deps: # root 兜底只读查询 notifications 表（S003：跨模块表须声明依赖，同库只读先例见 personal-center → _platform）
-  notification: ^0.1.0

package/templates/web/src/notifications/__client/api.schemas.ts

@@ -1,8 +0,0 @@
-/* eslint-disable */
-// 生成物：ojm api 从契约生成，勿手改（改动请改契约文件后重跑 ojm api）
-// AC-D15：仅供 DEV 校验动态 import，生产构建不进产物
-import { z } from "@oj-module/runtime";
-
-export const schemas = {
-
-};

package/templates/web/src/notifications/__client/api.ts

@@ -1,80 +0,0 @@
-/* eslint-disable */
-// 生成物：ojm api 从契约生成，勿手改（改动请改契约文件后重跑 ojm api）
-import { ContractApiError } from "@oj-module/runtime/contract/errors";
-import type { ScopedRequestLike } from "@oj-module/runtime/contract/errors";
-import type { ModuleContext } from "@oj-module/runtime";
-import type { z } from "@oj-module/runtime";
-import type { schemas } from "./api.schemas";
-
-/** oj 信封（AC-D16）：code=0 成功；非 0 时 HTTP status=code，由 toApiError 归一为 ContractApiError */
-interface OjEnvelope<T> { code: number, msg?: string, data?: T }
-
-let req: ScopedRequestLike | undefined;
-
-/** 线上 API 前缀（ojm api 从契约抽取，唯一真源，勿手改）：请求基址 + 前缀登记用 */
-export const API_PREFIX = "/notifications";
-
-/** 认领身份前缀（契约 apiPrefix，字面等于模块目录名）：跨模块认领护栏对比基准 */
-export const MODULE_PREFIX = "/notifications";
-
-/**
- * 模块 entry 的 onInit 里一行创建（构造即 install）：完成 apiPrefix 登记 +
- * scoped request 绑定，返回绑好前缀的端点函数集合。一模块一 client；
- * 重复构造幂等安全（前缀重复登记同值、request 重绑同值）。
- */
-export function createNotificationsClient(ctx: ModuleContext) {
-	// 跨模块认领护栏（DEV）：工厂知道自己该属于谁（MODULE_PREFIX = 契约 apiPrefix），
-	// ctx 又带 module.name——名实不符说明别的模块在替本模块创建 client，会共享 request
-	// 单槽、卸载互相耦合；跨模块需求应由本模块创建后经 provider 暴露。
-	// 注意对比基准是 MODULE_PREFIX（目录名）而非 API_PREFIX——D-M8 映射时线上前缀
-	// 属于别的命名空间，认领身份仍按目录名。
-	if (import.meta.env.DEV && ctx.module.name !== MODULE_PREFIX.slice(1)) {
-		console.warn(`[ojm-api] 模块 "${ctx.module.name}" 正在认领 ${MODULE_PREFIX} 的 client——跨模块认领会共享 request 单槽、卸载互相耦合；应由 "${MODULE_PREFIX.slice(1)}" 模块在自身 onInit 创建，跨模块需求经 provider 暴露。`);
-	}
-	ctx.register.apiPrefix(API_PREFIX);
-	bindRequest(ctx.utils.request);
-	return { notificationsGet };
-}
-
-/**
- * @deprecated 请改用 createNotificationsClient(ctx)——工厂构造即完成
- * 前缀登记 + request 绑定，不会出现「登记了前缀没绑 request」的半接线状态。
- */
-export function bindRequest(r: ScopedRequestLike): void {
-	req = r;
-}
-
-function ensureReq(): ScopedRequestLike {
-	if (!req)
-		throw new ContractApiError(-1, "[ojm-api] 请求未绑定——请在模块 entry.ts 的 onInit 里调用 createNotificationsClient(ctx)（或 bindRequest(ctx.utils.request)）。");
-	return req;
-}
-
-/** ky HTTPError → ContractApiError（错误体为信封时取 code/msg）；契约违例与原错误原样透传 */
-async function toApiError(e: unknown): Promise<unknown> {
-	if (e instanceof ContractApiError)
-		return e;
-	// ky 2.x 构造 HTTPError 时已用 getReader() 消费掉原 response 体（res.clone().json() 按规范抛 TypeError，
-	// 体方法一律失效），解析好的错误体在公开字段 error.data——故读 error.data，勿改回 clone().json()。
-	const err = e as { data?: { code?: unknown, msg?: string }, response?: Response } | null;
-	const res = err?.response;
-	const d = err?.data;
-	if (res instanceof Response && d && typeof d.code === "number")
-		return new ContractApiError(d.code, d.msg ?? res.statusText);
-	return e;
-}
-
-export async function notificationsGet(): Promise<unknown> {
-	const client = ensureReq();
-	try {
-		const env = await client.get(`notifications`).json<OjEnvelope<unknown>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as unknown;
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}