@oj-module/cli 0.2.68 → 0.2.71

package/templates/src/app/web/system/pages/solutions/market-entry.ts

@@ -0,0 +1,46 @@
+// 方案安装入口的纯推导（Phase B T3）：页面只做 query + 渲染，状态口径收这里，
+// 与 roles/visible-roles 同范式（展示层逻辑可单测，不入 React 组件）。
+// 数据源：GET /api/oj-market/index 的行（superadmin；R29 第一方编排面，平台内置）。
+
+/** index 行中本入口消费的最小形状（完整行见 oj-market api IndexRow，catchall 契约） */
+export interface SolutionsRow {
+	name: string
+	latest: string | null
+	installed: string | null
+	upgradable: boolean
+}
+
+export type MarketEntry = { kind: "absent" } | { kind: "installable", latest: string } | { kind: "installed", installed: string, latest: string | null, upgradable: boolean };
+
+/** 市场包入口状态：目录无行（出厂未装且未回填）/ 可安装 / 已装（含可升级位） */
+export function marketEntryOf(list: SolutionsRow[]): MarketEntry {
+	const row = list.find(r => r.name === "oj-market");
+	if (row === undefined)
+		return { kind: "absent" };
+	if (row.installed === null)
+		return row.latest === null ? { kind: "absent" } : { kind: "installable", latest: row.latest };
+	return { kind: "installed", installed: row.installed, latest: row.latest, upgradable: row.upgradable };
+}
+
+/** 任务记录的最小消费形状（TaskRecord 真源：api/_platform/_lifecycle/types.ts） */
+export interface TaskLike {
+	status: string
+	progress: number
+	message: string
+}
+
+export type TaskOutcome = { kind: "running", progress: number, message: string } | { kind: "done" } | { kind: "needsTrust" } | { kind: "failed", message: string };
+
+/** 任务终态 → 入口渲染口径：needs_trust 是非成功态（TOFU 确认前不得绿） */
+export function taskOutcomeOf(rec: TaskLike): TaskOutcome {
+	switch (rec.status) {
+		case "running":
+			return { kind: "running", progress: rec.progress, message: rec.message };
+		case "done":
+			return { kind: "done" };
+		case "needs_trust":
+			return { kind: "needsTrust" };
+		default:
+			return { kind: "failed", message: rec.message };
+	}
+}

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

@@ -14,6 +14,7 @@ import { buildTreeData, subtreeIds } from "../departments/tree";
 import { explainError, isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";
 import { canManageUser } from "./can-manage";
+import { matchUserKeyword } from "./match-keyword";
 
 type UserRow = SystemUsersGetData[number];
 
@@ -42,6 +43,7 @@ export default function UsersPage() {
 	const [pwdTarget, setPwdTarget] = useState<UserRow | null>(null);
 	const [pwdForm] = Form.useForm<{ password: string }>();
 	const [deptId, setDeptId] = useState<number | null>(null);
+	const [keyword, setKeyword] = useState("");
 
 	const usersQuery = useQuery({ queryKey: ["system", "users"], queryFn: systemUsersGet });
 	// 与部门页共用同一份缓存键：那边改完部门，这边的筛选树也跟着新
@@ -83,8 +85,9 @@ export default function UsersPage() {
 	const scope = useMemo(() => (deptId == null ? null : subtreeIds(deptRows, [deptId])), [deptRows, deptId]);
 	const visibleUsers = useMemo(() => {
 		const all = usersQuery.data ?? [];
-		return scope ? all.filter(u => u.departments.some(d => scope.has(d.id))) : all;
-	}, [usersQuery.data, scope]);
+		const scoped = scope ? all.filter(u => u.departments.some(d => scope.has(d.id))) : all;
+		return scoped.filter(u => matchUserKeyword(u, keyword));
+	}, [usersQuery.data, scope, keyword]);
 
 	if (usersQuery.error && isForbidden(usersQuery.error))
 		return <ForbiddenPanel t={t} error={usersQuery.error} />;
@@ -158,6 +161,13 @@ export default function UsersPage() {
 				<Button type="primary" icon={<PlusOutlined />} onClick={() => setCreateOpen(true)}>
 					{t("system:users.create")}
 				</Button>
+				<Input
+					allowClear
+					style={{ width: 220 }}
+					placeholder={t("system:users.searchPlaceholder")}
+					value={keyword}
+					onChange={e => setKeyword(e.target.value)}
+				/>
 				<TreeSelect
 					allowClear
 					showSearch

package/templates/src/app/web/system/pages/users/match-keyword.ts

@@ -0,0 +1,19 @@
+/**
+ * 用户列表关键词搜索（纯函数，BDD 用例见 cli __tests__/users-roles-display.test.ts）。
+ *
+ * 口径（20261106-1811 计划文档）：users 表无 nickname 列，「昵称与 display」按
+ * username（账号）+ display_name（显示名/昵称）匹配，大小写不敏感；空白关键字 = 全可见。
+ * 名单一页全量，过滤在前端做（与部门筛选同口径）。
+ */
+export interface UserKeywordRow {
+	username: string
+	display_name: string | null
+}
+
+export function matchUserKeyword(row: UserKeywordRow, keyword: string): boolean {
+	const kw = keyword.trim().toLowerCase();
+	if (!kw)
+		return true;
+	const tail = row.display_name ?? "";
+	return row.username.toLowerCase().includes(kw) || tail.toLowerCase().includes(kw);
+}

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

@@ -1,14 +1,16 @@
+import type { SystemRolesGetData } from "../../__client";
 import { useUserStore } from "@oj-module/runtime";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { App, Button, Card, Checkbox, Space } from "antd";
-import { useState } from "react";
+import { App, Button, Card, Checkbox, Divider, Space, Typography } from "antd";
+import { useMemo, useState } from "react";
+
 import { useTranslation } from "react-i18next";
 
 import { useNavigate, useParams } from "react-router";
-
 import { systemRolesGet, systemUsersGet, systemUsersRolesPut } from "../../__client";
 import { explainError, isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";
+import { roleLabel } from "../roles/role-label";
 
 /**
  * 成员资格（AC1-7）：整集替换某用户角色。后端无 GET 单用户端点，
@@ -18,6 +20,9 @@ import { ForbiddenPanel } from "../forbidden";
  * 授予 admin 已下放到租户内，否则企业租户永远配不出管理员（平台 superadmin 因租户
  * 隔离查不到企业租户的用户）。但 **superadmin 仍只许 superadmin 授**——它握着跨租户
  * 权限，故这里对非 superadmin 直接把该选项置灰，比让他提交后吃 403 清楚。
+ *
+ * 展示（20261106-1811）：角色名按语言名称（key）解析（与角色页共用 roleLabel），
+ * 并按模块分组——角色行自带 module 字段，组标题显示模块名原文。
  */
 export default function UserRolesPage() {
 	const { t } = useTranslation();
@@ -35,6 +40,18 @@ export default function UserRolesPage() {
 	const usersQuery = useQuery({ queryKey: ["system", "users"], queryFn: systemUsersGet });
 	const rolesQuery = useQuery({ queryKey: ["system", "roles"], queryFn: systemRolesGet });
 
+	// 按模块分组（组内保持 listRoles 的 name 排序）；模块名原文作组标题。
+	// 位置在提前 return 之前——hooks 不得落在条件分支里
+	const groups = useMemo(() => {
+		const byModule = new Map<string, SystemRolesGetData>();
+		for (const r of rolesQuery.data ?? []) {
+			const list = byModule.get(r.module) ?? [];
+			list.push(r);
+			byModule.set(r.module, list);
+		}
+		return [...byModule.entries()].sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
+	}, [rolesQuery.data]);
+
 	const saveMut = useMutation({
 		mutationFn: (roles: string[]) => systemUsersRolesPut({ query: { uid: Number(uid) }, body: { roles } }),
 		onSuccess: () => {
@@ -55,18 +72,30 @@ export default function UserRolesPage() {
 
 	return (
 		<Card title={`${t("system:userRoles.title")}: ${user?.username ?? `#${uid}`}`}>
-			<Space direction="vertical">
-				<Checkbox.Group
-					options={(rolesQuery.data ?? []).map(r => ({
-						label: `${r.name}${r.deprecated ? t("system:userRoles.deprecated") : ""}`,
-						value: r.name,
-						// 非 superadmin 授不了平台级角色：置灰，提交后 403 太晚也太含糊
-						disabled: r.name === "superadmin" && !isSuper,
-					}))}
-					value={value}
-					onChange={v => setSelected(v)}
-				/>
+			<Space direction="vertical" style={{ width: "100%" }}>
+				{groups.map(([mod, rows]) => {
+					const names = new Set(rows.map(r => r.name));
+					return (
+						<div key={mod}>
+							<Typography.Text strong>{mod}</Typography.Text>
+							<div style={{ paddingLeft: 12, paddingTop: 4 }}>
+								<Checkbox.Group
+									options={rows.map(r => ({
+										label: `${roleLabel(r, t)}${r.deprecated ? t("system:userRoles.deprecated") : ""}`,
+										value: r.name,
+										// 非 superadmin 授不了平台级角色：置灰，提交后 403 太晚也太含糊
+										disabled: r.name === "superadmin" && !isSuper,
+									}))}
+									// 整集替换语义不变：每组只回显/改动本组名下的选中项
+									value={value.filter(v => names.has(v))}
+									onChange={vals => setSelected([...value.filter(v => !names.has(v)), ...vals])}
+								/>
+							</div>
+						</div>
+					);
+				})}
 				{value.length === 0 ? <span>{t("system:userRoles.none")}</span> : null}
+				<Divider style={{ margin: "8px 0" }} />
 				<Button
 					type="primary"
 					disabled={isSelf || selected === null}

package/templates/src/app/web/system/routes.ts

@@ -4,6 +4,10 @@ import { SettingOutlined } from "@ant-design/icons";
 
 import { createElement, lazy } from "react";
 
+// 方案安装入口（Phase B T3）：平台内置编排面 /api/oj-market/*（api 随脚手架内置，R29
+// 第一方专用）由 system 域代管。用生成物明示的 bindRequest 逃生门而非
+// createOjMarketClient 工厂——后者 DEV 有跨模块认领告警（该 client 名义属 oj-market）。
+import { bindRequest as bindMarketRequest } from "../../../oj-market/web/__client";
 import { createSystemClient } from "./__client";
 
 const Users = lazy(() => import("./pages/users"));
@@ -13,6 +17,7 @@ const Roles = lazy(() => import("./pages/roles"));
 const Oplog = lazy(() => import("./pages/oplog"));
 const Settings = lazy(() => import("./pages/settings"));
 const WecomAdmin = lazy(() => import("./pages/wecom"));
+const Solutions = lazy(() => import("./pages/solutions"));
 
 /**
  * `/system` 根的角色门禁（对齐后端 assertSystemAdmin，access.ts:87）——
@@ -75,6 +80,12 @@ export const routes: AppRouteRecordRaw[] = [
 				Component: Settings,
 				handle: { title: "system:menu.settings", roles: ["superadmin"] },
 			},
+			{
+				// 方案安装（Phase B T3，出厂未装态的首装入口）：仅超管可见可访问
+				path: "/system/solutions",
+				Component: Solutions,
+				handle: { title: "system:menu.solutions", roles: ["superadmin"] },
+			},
 			{
 				// 企微代开发后台（服务商运营面）：仅超管可见（路由级 roles + 页面内二次判定）
 				path: "/system/wecom",
@@ -85,7 +96,13 @@ export const routes: AppRouteRecordRaw[] = [
 	},
 ];
 
-/** 构造即接线：登记 /system 前缀 + 绑定 scoped request（D11 前缀收敛）。 */
+/**
+ * 构造即接线：登记 /system 前缀 + 绑定 scoped request（D11 前缀收敛）；
+ *  另登记 /oj-market（平台内置市场编排面，R29 第一方）并绑定其生成 client——
+ *  方案安装页（/system/solutions）出厂未装态即经此调用安装端点。
+ */
 export async function onInit(ctx: ModuleContext) {
 	createSystemClient(ctx);
+	ctx.register.apiPrefix("/oj-market");
+	bindMarketRequest(ctx.utils.request);
 }