@oj-module/cli 0.2.53 → 0.2.56

package/templates/src/{system/web/__client/api.ts → app/web/system/__client/index.ts}

@@ -17,6 +17,9 @@ export const API_PREFIX = "/system";
 /** 认领身份前缀（契约 apiPrefix，字面等于模块目录名）：跨模块认领护栏对比基准 */
 export const MODULE_PREFIX = "/system";
 
+/** 认领方模块（web.config clientOwners 指定）：跨模块认领护栏对比基准 */
+export const MODULE_OWNER = "/app";
+
 /**
  * 模块 entry 的 onInit 里一行创建（构造即 install）：完成 apiPrefix 登记 +
  * scoped request 绑定，返回绑好前缀的端点函数集合。一模块一 client；
@@ -28,12 +31,12 @@ export function createSystemClient(ctx: ModuleContext) {
 	// 单槽、卸载互相耦合；跨模块需求应由本模块创建后经 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 暴露。`);
+	if (import.meta.env.DEV && ctx.module.name !== MODULE_OWNER.slice(1)) {
+		console.warn(`[ojm-api] 模块 "${ctx.module.name}" 正在认领 ${MODULE_PREFIX} 的 client——跨模块认领会共享 request 单槽、卸载互相耦合；应由 "${MODULE_OWNER.slice(1)}" 模块在自身 onInit 创建，跨模块需求经 provider 暴露。`);
 	}
 	ctx.register.apiPrefix(API_PREFIX);
 	bindRequest(ctx.utils.request);
-	return { systemDepartmentsGet, systemDepartmentsPost, systemDepartmentsPut, systemDepartmentsDelete, systemDepartmentsMovePut, systemDepartmentsDetachPost, systemDepartmentsMembersGet, systemDepartmentsMembersPost, systemDepartmentsMembersPut, systemDepartmentsMembersDelete, systemLoginMethodsGet, systemOplogGet, systemOplogPost, systemPermissionsGet, systemRolesGet, systemRolesPost, systemRolesDelete, systemRolesBindingsPut, systemSettingsGet, systemSettingsPut, systemUsersGet, systemUsersPost, systemUsersDelete, systemUsersProfilePut, systemUsersForbiddenPut, systemUsersPasswordPut, systemUsersRolesPut };
+	return { systemDepartmentsGet, systemDepartmentsPost, systemDepartmentsPut, systemDepartmentsDelete, systemDepartmentsDetachPost, systemDepartmentsMembersGet, systemDepartmentsMembersPost, systemDepartmentsMembersPut, systemDepartmentsMembersDelete, systemDepartmentsMovePut, systemLoginMethodsGet, systemOplogGet, systemOplogPost, systemPermissionsGet, systemRolesGet, systemRolesPost, systemRolesDelete, systemRolesBindingsPut, systemSettingsGet, systemSettingsPut, systemUsersGet, systemUsersPost, systemUsersDelete, systemUsersForbiddenPut, systemUsersPasswordPut, systemUsersProfilePut, systemUsersRolesPut };
 }
 
 /**
@@ -160,31 +163,6 @@ export async function systemDepartmentsDelete(query: SystemDepartmentsDeleteQuer
 	}
 }
 
-export type SystemDepartmentsMovePutQuery = z.input<(typeof schemas)["systemDepartmentsMovePut"]["query"]>;
-export type SystemDepartmentsMovePutBody = z.input<(typeof schemas)["systemDepartmentsMovePut"]["body"]>;
-export type SystemDepartmentsMovePutData = z.infer<(typeof schemas)["systemDepartmentsMovePut"]["data"]>;
-
-export async function systemDepartmentsMovePut(input: { query: SystemDepartmentsMovePutQuery, body: SystemDepartmentsMovePutBody }): Promise<SystemDepartmentsMovePutData> {
-	const client = ensureReq();
-	try {
-		const env = await client.put(`system/departments/move`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<SystemDepartmentsMovePutData>>();
-		// 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 SystemDepartmentsMovePutData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["systemDepartmentsMovePut"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] systemDepartmentsMovePut 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
 export type SystemDepartmentsDetachPostQuery = z.input<(typeof schemas)["systemDepartmentsDetachPost"]["query"]>;
 export type SystemDepartmentsDetachPostData = z.infer<(typeof schemas)["systemDepartmentsDetachPost"]["data"]>;
 
@@ -307,6 +285,31 @@ export async function systemDepartmentsMembersDelete(query: SystemDepartmentsMem
 	}
 }
 
+export type SystemDepartmentsMovePutQuery = z.input<(typeof schemas)["systemDepartmentsMovePut"]["query"]>;
+export type SystemDepartmentsMovePutBody = z.input<(typeof schemas)["systemDepartmentsMovePut"]["body"]>;
+export type SystemDepartmentsMovePutData = z.infer<(typeof schemas)["systemDepartmentsMovePut"]["data"]>;
+
+export async function systemDepartmentsMovePut(input: { query: SystemDepartmentsMovePutQuery, body: SystemDepartmentsMovePutBody }): Promise<SystemDepartmentsMovePutData> {
+	const client = ensureReq();
+	try {
+		const env = await client.put(`system/departments/move`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<SystemDepartmentsMovePutData>>();
+		// 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 SystemDepartmentsMovePutData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["systemDepartmentsMovePut"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] systemDepartmentsMovePut 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
+		return data;
+	}
+	catch (e) {
+		throw await toApiError(e);
+	}
+}
+
 export type SystemLoginMethodsGetData = z.infer<(typeof schemas)["systemLoginMethodsGet"]["data"]>;
 
 export async function systemLoginMethodsGet(): Promise<SystemLoginMethodsGetData> {
@@ -449,15 +452,22 @@ export async function systemRolesPost(body: SystemRolesPostBody): Promise<System
 }
 
 export type SystemRolesDeleteQuery = z.input<(typeof schemas)["systemRolesDelete"]["query"]>;
+export type SystemRolesDeleteData = z.infer<(typeof schemas)["systemRolesDelete"]["data"]>;
 
-export async function systemRolesDelete(query: SystemRolesDeleteQuery): Promise<unknown> {
+export async function systemRolesDelete(query: SystemRolesDeleteQuery): Promise<SystemRolesDeleteData> {
 	const client = ensureReq();
 	try {
-		const env = await client.delete(`system/roles`, { searchParams: query as Record<string, string | number | boolean> }).json<OjEnvelope<unknown>>();
+		const env = await client.delete(`system/roles`, { searchParams: query as Record<string, string | number | boolean> }).json<OjEnvelope<SystemRolesDeleteData>>();
 		// 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;
+		const data = env.data as SystemRolesDeleteData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["systemRolesDelete"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] systemRolesDelete 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
 		return data;
 	}
 	catch (e) {
@@ -467,15 +477,22 @@ export async function systemRolesDelete(query: SystemRolesDeleteQuery): Promise<
 
 export type SystemRolesBindingsPutQuery = z.input<(typeof schemas)["systemRolesBindingsPut"]["query"]>;
 export type SystemRolesBindingsPutBody = z.input<(typeof schemas)["systemRolesBindingsPut"]["body"]>;
+export type SystemRolesBindingsPutData = z.infer<(typeof schemas)["systemRolesBindingsPut"]["data"]>;
 
-export async function systemRolesBindingsPut(input: { query: SystemRolesBindingsPutQuery, body: SystemRolesBindingsPutBody }): Promise<unknown> {
+export async function systemRolesBindingsPut(input: { query: SystemRolesBindingsPutQuery, body: SystemRolesBindingsPutBody }): Promise<SystemRolesBindingsPutData> {
 	const client = ensureReq();
 	try {
-		const env = await client.put(`system/roles/bindings`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<unknown>>();
+		const env = await client.put(`system/roles/bindings`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<SystemRolesBindingsPutData>>();
 		// 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;
+		const data = env.data as SystemRolesBindingsPutData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["systemRolesBindingsPut"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] systemRolesBindingsPut 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
 		return data;
 	}
 	catch (e) {
@@ -507,15 +524,22 @@ export async function systemSettingsGet(): Promise<SystemSettingsGetData> {
 }
 
 export type SystemSettingsPutBody = z.input<(typeof schemas)["systemSettingsPut"]["body"]>;
+export type SystemSettingsPutData = z.infer<(typeof schemas)["systemSettingsPut"]["data"]>;
 
-export async function systemSettingsPut(body: SystemSettingsPutBody): Promise<unknown> {
+export async function systemSettingsPut(body: SystemSettingsPutBody): Promise<SystemSettingsPutData> {
 	const client = ensureReq();
 	try {
-		const env = await client.put(`system/settings`, { json: body }).json<OjEnvelope<unknown>>();
+		const env = await client.put(`system/settings`, { json: body }).json<OjEnvelope<SystemSettingsPutData>>();
 		// 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;
+		const data = env.data as SystemSettingsPutData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["systemSettingsPut"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] systemSettingsPut 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
 		return data;
 	}
 	catch (e) {
@@ -594,23 +618,23 @@ export async function systemUsersDelete(query: SystemUsersDeleteQuery): Promise<
 	}
 }
 
-export type SystemUsersProfilePutQuery = z.input<(typeof schemas)["systemUsersProfilePut"]["query"]>;
-export type SystemUsersProfilePutBody = z.input<(typeof schemas)["systemUsersProfilePut"]["body"]>;
-export type SystemUsersProfilePutData = z.infer<(typeof schemas)["systemUsersProfilePut"]["data"]>;
+export type SystemUsersForbiddenPutQuery = z.input<(typeof schemas)["systemUsersForbiddenPut"]["query"]>;
+export type SystemUsersForbiddenPutBody = z.input<(typeof schemas)["systemUsersForbiddenPut"]["body"]>;
+export type SystemUsersForbiddenPutData = z.infer<(typeof schemas)["systemUsersForbiddenPut"]["data"]>;
 
-export async function systemUsersProfilePut(input: { query: SystemUsersProfilePutQuery, body: SystemUsersProfilePutBody }): Promise<SystemUsersProfilePutData> {
+export async function systemUsersForbiddenPut(input: { query: SystemUsersForbiddenPutQuery, body: SystemUsersForbiddenPutBody }): Promise<SystemUsersForbiddenPutData> {
 	const client = ensureReq();
 	try {
-		const env = await client.put(`system/users/profile`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<SystemUsersProfilePutData>>();
+		const env = await client.put(`system/users/forbidden`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<SystemUsersForbiddenPutData>>();
 		// 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 SystemUsersProfilePutData;
+		const data = env.data as SystemUsersForbiddenPutData;
 		if (import.meta.env.DEV) {
 			const { schemas } = await import("./api.schemas");
-			const r = schemas["systemUsersProfilePut"].data.safeParse(data);
+			const r = schemas["systemUsersForbiddenPut"].data.safeParse(data);
 			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] systemUsersProfilePut 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+				throw new ContractApiError(-1, `[契约违例] systemUsersForbiddenPut 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
 		}
 		return data;
 	}
@@ -619,17 +643,24 @@ export async function systemUsersProfilePut(input: { query: SystemUsersProfilePu
 	}
 }
 
-export type SystemUsersForbiddenPutQuery = z.input<(typeof schemas)["systemUsersForbiddenPut"]["query"]>;
-export type SystemUsersForbiddenPutBody = z.input<(typeof schemas)["systemUsersForbiddenPut"]["body"]>;
+export type SystemUsersPasswordPutQuery = z.input<(typeof schemas)["systemUsersPasswordPut"]["query"]>;
+export type SystemUsersPasswordPutBody = z.input<(typeof schemas)["systemUsersPasswordPut"]["body"]>;
+export type SystemUsersPasswordPutData = z.infer<(typeof schemas)["systemUsersPasswordPut"]["data"]>;
 
-export async function systemUsersForbiddenPut(input: { query: SystemUsersForbiddenPutQuery, body: SystemUsersForbiddenPutBody }): Promise<unknown> {
+export async function systemUsersPasswordPut(input: { query: SystemUsersPasswordPutQuery, body: SystemUsersPasswordPutBody }): Promise<SystemUsersPasswordPutData> {
 	const client = ensureReq();
 	try {
-		const env = await client.put(`system/users/forbidden`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<unknown>>();
+		const env = await client.put(`system/users/password`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<SystemUsersPasswordPutData>>();
 		// 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;
+		const data = env.data as SystemUsersPasswordPutData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["systemUsersPasswordPut"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] systemUsersPasswordPut 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
 		return data;
 	}
 	catch (e) {
@@ -637,17 +668,24 @@ export async function systemUsersForbiddenPut(input: { query: SystemUsersForbidd
 	}
 }
 
-export type SystemUsersPasswordPutQuery = z.input<(typeof schemas)["systemUsersPasswordPut"]["query"]>;
-export type SystemUsersPasswordPutBody = z.input<(typeof schemas)["systemUsersPasswordPut"]["body"]>;
+export type SystemUsersProfilePutQuery = z.input<(typeof schemas)["systemUsersProfilePut"]["query"]>;
+export type SystemUsersProfilePutBody = z.input<(typeof schemas)["systemUsersProfilePut"]["body"]>;
+export type SystemUsersProfilePutData = z.infer<(typeof schemas)["systemUsersProfilePut"]["data"]>;
 
-export async function systemUsersPasswordPut(input: { query: SystemUsersPasswordPutQuery, body: SystemUsersPasswordPutBody }): Promise<unknown> {
+export async function systemUsersProfilePut(input: { query: SystemUsersProfilePutQuery, body: SystemUsersProfilePutBody }): Promise<SystemUsersProfilePutData> {
 	const client = ensureReq();
 	try {
-		const env = await client.put(`system/users/password`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<unknown>>();
+		const env = await client.put(`system/users/profile`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<SystemUsersProfilePutData>>();
 		// 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;
+		const data = env.data as SystemUsersProfilePutData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["systemUsersProfilePut"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] systemUsersProfilePut 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
 		return data;
 	}
 	catch (e) {
@@ -657,15 +695,22 @@ export async function systemUsersPasswordPut(input: { query: SystemUsersPassword
 
 export type SystemUsersRolesPutQuery = z.input<(typeof schemas)["systemUsersRolesPut"]["query"]>;
 export type SystemUsersRolesPutBody = z.input<(typeof schemas)["systemUsersRolesPut"]["body"]>;
+export type SystemUsersRolesPutData = z.infer<(typeof schemas)["systemUsersRolesPut"]["data"]>;
 
-export async function systemUsersRolesPut(input: { query: SystemUsersRolesPutQuery, body: SystemUsersRolesPutBody }): Promise<unknown> {
+export async function systemUsersRolesPut(input: { query: SystemUsersRolesPutQuery, body: SystemUsersRolesPutBody }): Promise<SystemUsersRolesPutData> {
 	const client = ensureReq();
 	try {
-		const env = await client.put(`system/users/roles`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<unknown>>();
+		const env = await client.put(`system/users/roles`, { searchParams: input.query as Record<string, string | number | boolean>, json: input.body }).json<OjEnvelope<SystemUsersRolesPutData>>();
 		// 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;
+		const data = env.data as SystemUsersRolesPutData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["systemUsersRolesPut"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] systemUsersRolesPut 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
 		return data;
 	}
 	catch (e) {

package/templates/src/{system/web → app/web/system}/locales/en-US.json

@@ -99,10 +99,9 @@
 	},
 	"oplog": {
 		"filterAction": "Action",
-		"filterUsername": "Username (prefix)",
+		"filterUsername": "Username (contains)",
 		"filterModule": "Module",
-		"filterLimit": "Limit",
-		"truncated": "Results truncated by limit; narrow your filters",
+		"total": "{{total}} total",
 		"columns": {
 			"time": "Time",
 			"username": "Username",

package/templates/src/{system/web → app/web/system}/locales/zh-CN.json

@@ -99,10 +99,9 @@
 	},
 	"oplog": {
 		"filterAction": "操作 (action)",
-		"filterUsername": "用户名（前缀匹配）",
+		"filterUsername": "用户名（包含匹配）",
 		"filterModule": "模块",
-		"filterLimit": "条数上限",
-		"truncated": "结果已按上限截断，请缩小过滤范围",
+		"total": "共 {{total}} 条",
 		"columns": {
 			"time": "时间",
 			"username": "用户名",

package/templates/src/{system/web → app/web/system}/pages/departments/index.tsx

@@ -1,4 +1,4 @@
-import type { SystemDepartmentsGetData, SystemDepartmentsMembersGetData } from "../../__client/api";
+import type { SystemDepartmentsGetData, SystemDepartmentsMembersGetData } from "../../__client";
 
 import { PlusOutlined } from "@ant-design/icons";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
@@ -32,7 +32,7 @@ import {
 	systemDepartmentsPost,
 	systemDepartmentsPut,
 	systemUsersGet,
-} from "../../__client/api";
+} from "../../__client";
 import { explainError, isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";
 import { WecomSyncBar } from "./sync-bar";

package/templates/src/{system/web → app/web/system}/pages/login-methods/index.tsx

@@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
 import { Card, Descriptions, Tag } from "antd";
 import { useTranslation } from "react-i18next";
 
-import { systemLoginMethodsGet } from "../../__client/api";
+import { systemLoginMethodsGet } from "../../__client";
 
 const METHOD_KEY: Record<string, string> = {
 	local: "system:loginMethodsPage.methodLocal",

package/templates/src/{system/web → app/web/system}/pages/oplog/index.tsx

@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
-import { Alert, Button, Form, Input, InputNumber, Space, Table, Tooltip } from "antd";
+import { Button, Form, Input, Space, Table, Tooltip } from "antd";
 import dayjs from "dayjs";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import { systemOplogGet } from "../../__client/api";
+import { systemOplogGet } from "../../__client";
 import { isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";
 
@@ -12,20 +12,26 @@ interface OplogFilters {
 	action?: string
 	username?: string
 	module?: string
-	limit?: number
 }
 
+const DEFAULT_PAGE_SIZE = 20;
+const PAGE_SIZE_OPTIONS = [20, 50, 100];
+
 /**
- * 操作日志（AC1-29/D13）：action 精确 / username 前缀 / module 精确，limit 钳 200。
- * truncated=true 表示结果被截断（服务端 paged），顶部提示缩小过滤范围。
+ * 操作日志（AC1-29/D13）：action 精确 / username 包含 / module 精确。
+ *
+ * 分页交给服务端：`page` + `limit`（每页条数，钳 200），响应带 `total`，页面按 total 出页码。
+ * 不再有「结果被截断」的横幅——记录再多也能通过页码翻到，不必靠缩小过滤范围。
  */
 export default function OplogPage() {
 	const { t } = useTranslation();
 	const [filters, setFilters] = useState<OplogFilters>({});
+	const [page, setPage] = useState(1);
+	const [size, setSize] = useState(DEFAULT_PAGE_SIZE);
 
 	const query = useQuery({
-		queryKey: ["system", "oplog", filters],
-		queryFn: () => systemOplogGet(filters),
+		queryKey: ["system", "oplog", filters, page, size],
+		queryFn: () => systemOplogGet({ ...filters, page, limit: size }),
 	});
 
 	if (query.error && isForbidden(query.error))
@@ -50,12 +56,14 @@ export default function OplogPage() {
 		<Space direction="vertical" style={{ width: "100%", paddingTop: 16 }}>
 			<Form
 				layout="inline"
-				onFinish={values => setFilters({
-					action: values.action || undefined,
-					username: values.username || undefined,
-					module: values.module || undefined,
-					limit: values.limit || undefined,
-				})}
+				onFinish={(values) => {
+					setFilters({
+						action: values.action || undefined,
+						username: values.username || undefined,
+						module: values.module || undefined,
+					});
+					setPage(1);
+				}}
 			>
 				<Form.Item name="action" label={t("system:oplog.filterAction")}>
 					<Input allowClear />
@@ -66,25 +74,42 @@ export default function OplogPage() {
 				<Form.Item name="module" label={t("system:oplog.filterModule")}>
 					<Input allowClear />
 				</Form.Item>
-				<Form.Item name="limit" label={t("system:oplog.filterLimit")} initialValue={50}>
-					<InputNumber min={1} max={200} />
-				</Form.Item>
 				<Form.Item>
 					<Space>
 						<Button type="primary" htmlType="submit">{t("system:common.search")}</Button>
-						<Button onClick={() => { setFilters({}); }}>
+						<Button
+							onClick={() => {
+								setFilters({});
+								setPage(1);
+							}}
+						>
 							{t("system:common.reset")}
 						</Button>
 					</Space>
 				</Form.Item>
 			</Form>
-			{query.data?.truncated ? <Alert type="warning" showIcon message={t("system:oplog.truncated")} /> : null}
 			<Table
 				rowKey="id"
 				loading={query.isLoading}
 				dataSource={query.data?.list ?? []}
 				columns={columns}
-				pagination={{ hideOnSinglePage: true, pageSize: 50 }}
+				pagination={{
+					current: page,
+					pageSize: size,
+					total: query.data?.total ?? 0,
+					showSizeChanger: true,
+					pageSizeOptions: PAGE_SIZE_OPTIONS,
+					showTotal: total => t("system:oplog.total", { total }),
+					onChange: (nextPage, nextSize) => {
+						// 改每页条数后原页码可能越界：统一回第 1 页
+						if (nextSize !== size) {
+							setSize(nextSize);
+							setPage(1);
+							return;
+						}
+						setPage(nextPage);
+					},
+				}}
 			/>
 		</Space>
 	);

package/templates/src/{system/web → app/web/system}/pages/roles/index.tsx

@@ -1,12 +1,13 @@
-import type { SystemPermissionsGetData, SystemRolesGetData } from "../../__client/api";
+import type { SystemPermissionsGetData, SystemRolesGetData } from "../../__client";
 
 import { useQuery } from "@tanstack/react-query";
 import { Alert, Space, Table, Tabs, Tag } from "antd";
 import { useTranslation } from "react-i18next";
 
-import { systemPermissionsGet, systemRolesGet } from "../../__client/api";
+import { systemPermissionsGet, systemRolesGet } from "../../__client";
 import { isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";
+import { visibleRoles } from "./visible-roles";
 
 type RoleRow = SystemRolesGetData[number];
 type PermRow = SystemPermissionsGetData[number];
@@ -19,6 +20,7 @@ export default function RolesPage() {
 	const { t } = useTranslation();
 	const rolesQuery = useQuery({ queryKey: ["system", "roles"], queryFn: systemRolesGet });
 	const permsQuery = useQuery({ queryKey: ["system", "permissions"], queryFn: systemPermissionsGet });
+	const rows = visibleRoles(rolesQuery.data ?? []);
 
 	if ((rolesQuery.error && isForbidden(rolesQuery.error)) || (permsQuery.error && isForbidden(permsQuery.error)))
 		return <ForbiddenPanel t={t} error={rolesQuery.error ?? permsQuery.error} />;
@@ -75,7 +77,7 @@ export default function RolesPage() {
 					children: (
 						<>
 							<Alert style={{ marginBottom: 12 }} type="info" showIcon message={t("system:rolesPage.readonlyHint")} />
-							<Table rowKey="name" loading={rolesQuery.isLoading} dataSource={rolesQuery.data ?? []} columns={roleColumns} pagination={{ hideOnSinglePage: true }} />
+							<Table rowKey="name" loading={rolesQuery.isLoading} dataSource={rows} columns={roleColumns} pagination={{ hideOnSinglePage: true }} />
 						</>
 					),
 				},

package/templates/src/app/web/system/pages/roles/visible-roles.ts

@@ -0,0 +1,14 @@
+/**
+ * 角色展示页的可见范围（纯函数，便于用例直接钉住，不必起 React）。
+ *
+ * superadmin 是平台级角色（跨租户），不属于「站点可分配的角色目录」；列在角色页只会让人
+ * 误以为能改它的绑定，故展示层隐去。
+ *
+ * **只在这一层过滤**：后端 listRoles() 必须原样返回 superadmin——成员资格页
+ * （users/roles.tsx）还要拿它作为可授予项（仅 superadmin 可勾选，见那里的 disabled 逻辑）。
+ */
+export const HIDDEN_ROLE = "superadmin";
+
+export function visibleRoles<T extends { name: string }>(roles: readonly T[]): T[] {
+	return roles.filter(r => r.name !== HIDDEN_ROLE);
+}

package/templates/src/{system/web → app/web/system}/pages/settings/index.tsx

@@ -1,13 +1,13 @@
 import type { TFunction } from "i18next";
 
-import type { SystemSettingsGetData } from "../../__client/api";
+import type { SystemSettingsGetData } from "../../__client";
 
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { App, Button, Card, Input, Space, Switch, Tooltip } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import { systemSettingsGet, systemSettingsPut } from "../../__client/api";
+import { systemSettingsGet, systemSettingsPut } from "../../__client";
 import { explainError, isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";
 

package/templates/src/app/web/system/pages/users/can-manage.ts

@@ -0,0 +1,21 @@
+/**
+ * /system/users 行级操作门禁：只有 superadmin 能改 superadmin 账号。
+ *
+ * 与后端 `domain/users.ts::assertCanManageTarget` 同一条红线（只有 superadmin 能改
+ * superadmin 的口令/状态/资料/角色）。前端这层只为「不给会 403 的按钮」——灰色可点却不
+ * 生效比报错更糟——真正的防线在服务端：admin 直打接口同样会被 403 挡住。
+ *
+ * 单独成文件是为了可测：vitest 跑在 node 环境，没有 jsdom，整页 render 不了。
+ */
+export const PLATFORM_ROLE = "superadmin";
+
+/**
+ * @param myRoles 当前登录者的角色
+ * @param targetRoles 行上用户的角色
+ * @returns 是否允许对目标账号执行管理操作（改密/启停/改资料/成员资格）
+ */
+export function canManageUser(myRoles: readonly string[], targetRoles: readonly string[]): boolean {
+	if (!targetRoles.includes(PLATFORM_ROLE))
+		return true;
+	return myRoles.includes(PLATFORM_ROLE);
+}

package/templates/src/{system/web → app/web/system}/pages/users/index.tsx

@@ -1,4 +1,4 @@
-import type { SystemUsersGetData } from "../../__client/api";
+import type { SystemUsersGetData } from "../../__client";
 
 import { PlusOutlined } from "@ant-design/icons";
 import { useUserStore } from "@oj-module/runtime";
@@ -9,16 +9,19 @@ import { useTranslation } from "react-i18next";
 
 import { useNavigate } from "react-router";
 
-import { systemDepartmentsGet, systemUsersForbiddenPut, systemUsersGet, systemUsersPasswordPut, systemUsersPost } from "../../__client/api";
+import { systemDepartmentsGet, systemUsersForbiddenPut, systemUsersGet, systemUsersPasswordPut, systemUsersPost } from "../../__client";
 import { buildTreeData, subtreeIds } from "../departments/tree";
 import { explainError, isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";
+import { canManageUser } from "./can-manage";
 
 type UserRow = SystemUsersGetData[number];
 
 /**
  * 用户管理（C1）：GET /system/users 列表 + 建号 / 禁用切换 / 重置口令。
  * 本人行禁用一切自操作（后端 assertNotSelf 400 兜底，前端不给会失败的按钮，R3）；
+ * superadmin 行也禁用一切操作，除非当前登录者是 superadmin（红线：只有 superadmin 能改
+ * superadmin——后端 assertCanManageTarget 403 兜底，前端把按钮置灰）；
  * 成员资格入口：superadmin 与 **本租户 admin** 均可见（授予 admin 已下放到租户内，
  * 但授予 superadmin 仍只许 superadmin——见 domain/users.ts::assertMembershipAllowed）。
  * 部门列标出主部门，顶部可按部门筛选（含子部门）——筛选在前端做，名单本来就是一页全量。
@@ -117,8 +120,10 @@ export default function UsersPage() {
 						title={t("system:users.forbidden")}
 						description={`${row.username} → ${forbidden ? "false" : "true"}`}
 						onConfirm={() => forbiddenMut.mutate({ uid: row.id, forbidden: !forbidden })}
+						// 置灰的 Switch 不会触发 Popconfirm，这里只是把「为什么点不了」挡在确认框之前
+						disabled={String(row.id) === me || !canManageUser(myRoles, row.roles)}
 					>
-						<Switch size="small" checked={forbidden} disabled={String(row.id) === me} />
+						<Switch size="small" checked={forbidden} disabled={String(row.id) === me || !canManageUser(myRoles, row.roles)} />
 					</Popconfirm>
 					{row.must_change ? <Tag color="orange">{t("system:users.firstLoginHint")}</Tag> : null}
 				</Space>
@@ -127,20 +132,23 @@ export default function UsersPage() {
 		{
 			title: t("system:users.columns.actions"),
 			key: "actions",
-			render: (_: unknown, row: UserRow) => (
-				<Space>
-					<Button size="small" disabled={String(row.id) === me} onClick={() => setPwdTarget(row)}>
-						{t("system:users.resetPwd")}
-					</Button>
+			render: (_: unknown, row: UserRow) => {
+				const manageable = canManageUser(myRoles, row.roles);
+				return (
+					<Space>
+						<Button size="small" disabled={String(row.id) === me || !manageable} onClick={() => setPwdTarget(row)}>
+							{t("system:users.resetPwd")}
+						</Button>
 						{canManageMembership
 							? (
-								<Button size="small" type="link" onClick={() => navigate(`/system/users/${row.id}/roles`)}>
-								{t("system:users.membership")}
-							</Button>
-						)
-						: null}
-				</Space>
-			),
+								<Button size="small" type="link" disabled={!manageable} onClick={() => navigate(`/system/users/${row.id}/roles`)}>
+									{t("system:users.membership")}
+								</Button>
+							)
+							: null}
+					</Space>
+				);
+			},
 		},
 	];
 

package/templates/src/{system/web → app/web/system}/pages/users/roles.tsx

@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 
 import { useNavigate, useParams } from "react-router";
 
-import { systemRolesGet, systemUsersGet, systemUsersRolesPut } from "../../__client/api";
+import { systemRolesGet, systemUsersGet, systemUsersRolesPut } from "../../__client";
 import { explainError, isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";