@oj-module/cli 0.2.64 → 0.2.67

package/templates/src/app/web/login/pages/login.tsx

@@ -6,10 +6,11 @@ import {
 	useAuthStore,
 	useTenantStore,
 } from "@oj-module/runtime";
-import { Alert, Button, Form, Input, Tabs, Typography } from "antd";
+import { Alert, Button, Form, Input, Skeleton, Tabs, Typography } from "antd";
 import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation, useNavigate } from "react-router";
+import { getWecomBootError } from "../routes";
 import { parseWecomLanding, wecomAuthorizePath } from "../wecom";
 
 type LoginMethod = "local" | "ldap" | "sso" | "wecom";
@@ -19,7 +20,7 @@ type LoginMethod = "local" | "ldap" | "sso" | "wecom";
  * 后端 `methods` 是**发现结果**、这里是**渲染能力**：后端多报一种而本页没有对应
  * renderer 时宁可不显示（点了也没实现），新增方式 = 这里加一项 + 渲染分支加一路。
  */
-const KNOWN_METHODS: LoginMethod[] = ["local", "ldap", "sso", "wecom"];
+const KNOWN_METHODS: LoginMethod[] = ["wecom", "local", "ldap", "sso"];
 
 function isKnownMethod(x: string): x is LoginMethod {
 	return (KNOWN_METHODS as string[]).includes(x);
@@ -52,12 +53,14 @@ export default function LoginPage() {
 	const navigate = useNavigate();
 	const { search } = useLocation();
 	const login = useAuthStore(s => s.login);
-	const [error, setError] = useState<string>();
+	// onInit 阶段换票若失败，首帧直接显示表单与错误（不再闪「认证中」）
+	const bootError = getWecomBootError();
+	const [error, setError] = useState<string | undefined>(bootError || undefined);
 	const [loading, setLoading] = useState(false);
 	const [known, setKnown] = useState(false);
 	const inWecom = typeof navigator !== "undefined" && /wxwork/i.test(navigator.userAgent);
 	const [methods, setMethods] = useState<LoginMethod[]>(["local"]);
-	const [active, setActive] = useState<LoginMethod>("local");
+	const [active, setActive] = useState<LoginMethod>("wecom");
 	// 企业代码入口默认收起：单租户部署（绝大多数）保持今天的登录页外观，
 	// 只有服务商/客户带 `?tenant=` 或手工展开时才需要填。
 	// 例外一：持久化租户不是部署默认值时必须展开——租户头是**隐式**跟着请求走的
@@ -68,6 +71,8 @@ export default function LoginPage() {
 	//   判据用「wecom 是否在登录方式里」而不是去数租户：匿名请求没有租户上下文，
 	//   统计租户要动用 db.asSystem（全仓仅 tenant-admin.ts 一处，不为此破例）。
 	const [showTenant, setShowTenant] = useState(() => useTenantStore.getState().tenant !== DEFAULT_TENANT);
+	// 「其他企业」折叠：仅服务商 / 多企业共存部署才需要手填企业代码
+	const [showOtherCorp, setShowOtherCorp] = useState(false);
 	// 表单里的企业代码：带上 persisted 值（URL `?tenant=` 已先落到 store），用户看得见才改得动
 	const [tenant] = useState(() => {
 		const current = useTenantStore.getState().tenant;
@@ -83,29 +88,32 @@ export default function LoginPage() {
 
 	// 企微 302 落地参数：只在首次渲染解析一次（ticket 一次性，解析结果必须稳定）
 	const [landing] = useState(() => parseWecomLanding(search));
-	const exchangedRef = useRef(false);
 	// 仅「认证中 / 已失败」两态：企微内、回跳落地、或 ?corp 深链即进入认证态，
 	// 直接展示「认证中」，不渲染登录表单；只有认证失败（换票失败 / 企微方式不可用）才回落表单。
+	// 换票成功时 onInit 已把 URL 改到首页，路由首帧就落在 /home，本组件根本不会挂载；bootError 非空即换票失败。
 	const [phase, setPhase] = useState<"auth" | "form">(
-		inWecom || landing || urlCorp ? "auth" : "form",
+		bootError ? "form" : inWecom || landing || urlCorp ? "auth" : "form",
 	);
 
 	useEffect(() => {
 		fetchLoginMethods()
 			.then((r) => {
 				setKnown(true);
+				// 站点标题（framework.site_title）经匿名端点回传，登录页即可设置浏览器标签；
+				// 其他已登录页保持随菜单（layout-effects 的路由标题），此处仅在登录页生效。
+				if (r.site_title)
+					document.title = r.site_title;
 				// 先按 string[] 看一眼：runtime 的返回类型把 wecom 排除在外，而这里恰恰要认它
 				const raw: string[] = r.methods;
-				const m = raw.filter(isKnownMethod);
+				// 按 KNOWN_METHODS 排序：企微是主入口，排第一个 tab 并默认选中，
+				// 「使用企业微信一键登录」首帧即可见，点一次就走。
+				const m = raw.filter(isKnownMethod).sort(
+					(a, b) => KNOWN_METHODS.indexOf(a) - KNOWN_METHODS.indexOf(b),
+				);
 				if (!m.length)
 					return;
 				setMethods(m);
-				// 有企微登录 ⇒ 有企业租户（租户键 = corp_id）⇒ 默认展开企业代码，
-				// 否则平台/企业两类管理员没法切换登录目标（用户仍可点「收起」手动折叠）。
-				if (raw.includes("wecom"))
-					setShowTenant(true);
-				if (!m.includes("local"))
-					setActive(m[0]);
+				setActive(m.includes("wecom") ? "wecom" : m[0]);
 			})
 			.catch(() => {
 				setKnown(true);
@@ -113,28 +121,9 @@ export default function LoginPage() {
 			});
 	}, []);
 
-	useEffect(() => {
-		// 换票只做一次：ticket 单次有效，重复 POST 只会拿到 401 并盖掉真正的错误
-		if (!landing || exchangedRef.current)
-			return;
-		exchangedRef.current = true;
-		void (async () => {
-			setLoading(true);
-			setError(undefined);
-			try {
-				// 租户先落 store：provider 每请求读 getState，服务端会比对「头值 == 票据租户」
-				if (landing.tenant)
-					useTenantStore.getState().setTenant(landing.tenant);
-				await login({ username: "", password: "", method: "wecom", ticket: landing.ticket });
-				navigate(getRedirectPath(search), { replace: true });
-			}
-			catch (e) {
-				setError(e instanceof Error ? e.message : String(e));
-				setPhase("form");
-				setLoading(false);
-			}
-		})();
-	}, [landing, login, navigate, search]);
+	// 企微票据换会话已提前到模块 onInit（见 login/routes.ts::exchangeWecomTicketOnBoot）：
+	// 成功时 URL 已在首帧前改到首页，本页不挂载；失败时 bootError 已在上面落成表单 + 错误态。
+	// 这里不再发第二次 POST——票据一次性，重复换只会拿到 401 并盖掉真正的错误。
 
 	// 企微深链自动入口：带 ?corp= 到达（且非回跳落地 / 非出错）且企微方式可用时，
 	// 直接整页发起授权——「点开即登录」，无需手动点「企业微信」tab。
@@ -142,7 +131,8 @@ export default function LoginPage() {
 	useEffect(() => {
 		const c = new URLSearchParams(search).get("corp")?.trim() ?? "";
 		// 企微内（wxwork UA）从「应用主页」点开即自动发起授权；带 ?corp= 的深链同样自动发起。
-		if ((!c && !inWecom) || landing || autoFiredRef.current)
+		// 换票失败后不再自动重发授权：否则废票 → 重新授权 → 再换一次废票会原地打转。
+		if ((!c && !inWecom) || landing || getWecomBootError() || autoFiredRef.current)
 			return;
 		if (new URLSearchParams(search).get("error")) {
 			setPhase("form");
@@ -185,14 +175,22 @@ export default function LoginPage() {
 		window.location.assign(`${resolveApiBase()}/auth/sso`);
 	}
 
-	function wecomLogin() {
+	/**
+	 * 一键扫码登录：默认不传 corp/agent，后端 `corpSelf()` 从部署常量 `wecom_corp_*`
+	 * 自动解析本企业（api.ts::login → resolveWecomProfile），用户不必填企业代码。
+	 * 普通浏览器 UA 下后端 302 到企微 qrConnect 扫码页；企微内 UA 走 oauth2 静默。
+	 * 只有「其他企业」折叠里才带 corp/agent（服务商 / 多企业共存部署）。
+	 */
+	function wecomLogin(withCorp = false) {
 		// 整页跳转（拿不到 302 的 opaque redirect）：授权入口是**后端端点**，
 		// 必须拼 API base（部署期可为 /api 或网关前缀）；拼站点 base 只会落到
 		// SPA 兜底页——点击后页面原地重载、一个 auth 请求都不发。
 		// 企业代码不在这里写 store——只有服务端回跳带的 tenant 才是权威值。
-		window.location.assign(`${resolveApiBase()}${wecomAuthorizePath(corp, agent)}`);
+		window.location.assign(`${resolveApiBase()}${wecomAuthorizePath(withCorp ? corp : "", withCorp ? agent : "")}`);
 	}
 
+	// 所有登录方式收进同一组 Tabs，同一时刻只渲染当前面板；默认选中企微（见上方 effect），
+	// 一键按钮首帧即可见、点一次就走，账号密码收在另一个 tab，不再上下平铺。
 	const showTabs = methods.length > 1;
 
 	const form = (method: LoginMethod) => (
@@ -222,50 +220,40 @@ export default function LoginPage() {
 		</Form>
 	);
 
-	// 企微：只需企业代码（服务商后台生成的专属链接会预填，客户也可手输）
-	// 受控值不走 antd 表单（Form.Item 无 name），故显式给 id/htmlFor：
-	// 少了这层关联，标签只是视觉文本，读屏与 getByLabel 都取不到输入框。
+	// 企微一键扫码：默认可见、不藏在 tab 里，点一次即进入企微授权（浏览器扫码 / 企微内静默）。
+	// 企业代码 / 应用 ID 收进折叠，只服务服务商多企业场景；单企业部署用户什么都不用填。
 	const wecomCorpId = "wecom-corp";
 	const wecomAgentId = "wecom-agent";
-	const wecomPanel = (
-		<Form layout="vertical" onFinish={wecomLogin}>
-			<Form.Item
-				label={t("login:page.tenant.label")}
-				htmlFor={wecomCorpId}
-				extra={t("login:method.wecom.hint")}
-			>
-				<Input
-					id={wecomCorpId}
-					autoComplete="off"
-					placeholder="ww..."
-					value={corp}
-					onChange={e => setCorp(e.target.value)}
-				/>
-			</Form.Item>
-			<Form.Item
-				label={t("login:method.wecom.agent")}
-				htmlFor={wecomAgentId}
-				extra={t("login:method.wecom.agentHint")}
-			>
-				<Input
-					id={wecomAgentId}
-					autoComplete="off"
-					placeholder="1000..."
-					value={agent}
-					onChange={e => setAgent(e.target.value)}
-				/>
-			</Form.Item>
-			<Button type="primary" htmlType="submit" block>
-				{t("login:method.wecom.action")}
+	const wecomQuickPanel = (
+		<>
+			<Typography.Paragraph type="secondary">
+				{t("login:method.wecom.scan.hint")}
+			</Typography.Paragraph>
+			<Button type="primary" block size="large" onClick={() => wecomLogin()}>
+				{t("login:method.wecom.scan.action")}
 			</Button>
-		</Form>
+			<Button type="link" size="small" block onClick={() => setShowOtherCorp(v => !v)}>
+				{t(showOtherCorp ? "login:method.wecom.otherCorpHide" : "login:method.wecom.otherCorp")}
+			</Button>
+			{showOtherCorp && (
+				<Form layout="vertical" onFinish={() => wecomLogin(true)} style={{ marginTop: 8 }}>
+					<Form.Item label={t("login:page.tenant.label")} htmlFor={wecomCorpId} extra={t("login:method.wecom.hint")}>
+						<Input id={wecomCorpId} autoComplete="off" placeholder="ww..." value={corp} onChange={e => setCorp(e.target.value)} />
+					</Form.Item>
+					<Form.Item label={t("login:method.wecom.agent")} htmlFor={wecomAgentId} extra={t("login:method.wecom.agentHint")}>
+						<Input id={wecomAgentId} autoComplete="off" placeholder="1000..." value={agent} onChange={e => setAgent(e.target.value)} />
+					</Form.Item>
+					<Button htmlType="submit" block>{t("login:method.wecom.action")}</Button>
+				</Form>
+			)}
+		</>
 	);
 
 	function panelOf(m: LoginMethod) {
 		if (m === "sso")
 			return <Button type="primary" block onClick={ssoLogin}>{t("login:method.sso.action")}</Button>;
 		if (m === "wecom")
-			return wecomPanel;
+			return wecomQuickPanel;
 		return form(m);
 	}
 
@@ -290,19 +278,24 @@ export default function LoginPage() {
 				{t("login:page.subtitle")}
 			</Typography.Paragraph>
 			{error && <Alert style={{ marginBottom: 16 }} type="error" message={error} showIcon />}
-			{showTabs
-				? (
-					<Tabs
-						activeKey={active}
-						onChange={key => setActive(key as LoginMethod)}
-						items={methods.map(m => ({
-							key: m,
-							label: t(`login:method.${m}`),
-							children: panelOf(m),
-						}))}
-					/>
-				)
-				: panelOf(methods[0] ?? "local")}
+			{/* 登录方式发现完成前不渲染表单区：否则首帧先画账号密码、再切成默认企微 tab，
+			    工作台用户会看到一次无谓的闪动（见 8b06d4e1 的闪屏回归）。 */}
+			{!known
+				? <Skeleton active paragraph={{ rows: 4 }} />
+				: showTabs
+					? (
+						<Tabs
+							destroyInactiveTabPane
+							activeKey={active}
+							onChange={key => setActive(key as LoginMethod)}
+							items={methods.map(m => ({
+								key: m,
+								label: t(`login:method.${m}`),
+								children: panelOf(m),
+							}))}
+						/>
+					)
+					: panelOf(methods[0] ?? "local")}
 		</>
 	);
 }

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

@@ -1,9 +1,59 @@
 import type { AppRouteRecordRaw, ModuleContext } from "@oj-module/runtime";
 
-import { useAuthStore, useTenantStore } from "@oj-module/runtime";
+import { getRedirectPath, resolveSiteBase, useAuthStore, useTenantStore } from "@oj-module/runtime";
 import { lazy } from "react";
 
 import { authProvider } from "./auth-provider";
+import { parseWecomLanding } from "./wecom";
+
+/**
+ * onInit 阶段「企微票据换会话」失败的原因。登录页首帧读一次：非空就直接显示表单与错误，
+ * 不再进「认证中」态，也不再自动重发授权（避免废票 → 重授权 → 再失败的循环）。
+ */
+let wecomBootError = "";
+
+export function getWecomBootError(): string {
+	return wecomBootError;
+}
+
+/**
+ * 企微回跳落地（`/login?wecom_ticket=…`）的换票**提前到首帧 render 之前**。
+ *
+ * 原来放在 LoginPage 的 useEffect 里：路由先把登录页（全屏外壳 + 品牌位 + 「认证中」）
+ * 画出来，等一个 POST 换完票、token 落 store 后才 Navigate 到首页——工作台进入时
+ * 登录页明显闪一下。模块 onInit 在宿主建路由之前被 await，在这里换完票即把 URL 改成
+ * 首页（见下方 shell 无 AuthGuard 的说明），路由首帧就落在 /home，登录页一次都不挂载。
+ *
+ * 失败不阻断启动：保持 /login，错误记下来交给登录页首帧显示表单与错误，用户可改用
+ * 本地登录 / 重新授权；一次性票据在成功改 URL 时一并从地址栏与历史里抹掉。
+ */
+async function exchangeWecomTicketOnBoot(): Promise<void> {
+	const landing = parseWecomLanding(window.location.search);
+	if (!landing)
+		return;
+	try {
+		// 租户由 tenant.ts::bootstrapTenant 在模块作用域从 ?tenant= 落地；这里补一次，
+		// 让换票请求的 X-TENANT-ID 与票据租户严格一致（服务端会比对两者）。
+		if (landing.tenant)
+			useTenantStore.getState().setTenant(landing.tenant);
+		await useAuthStore.getState().login({
+			username: "",
+			password: "",
+			method: "wecom",
+			ticket: landing.ticket,
+		});
+		// 宿主 shell 链**没有 AuthGuard**（免登录演示能力绕开 LayoutRoot），所以「已登录」
+		// 不会自动把 /login 跳走。宿主在 loadAll（即本 onInit）之后才 createBrowserRouter，
+		// 此刻先把 URL 换成首页，路由首帧就落在 /home，登录页一次都不挂载。
+		// runtime 自有链带 AuthGuard，这处 replace 也无害（守卫同样跳首页）。
+		const base = resolveSiteBase().replace(/\/+$/, "");
+		window.history.replaceState(null, "", `${base}${getRedirectPath(window.location.search)}`);
+	}
+	catch (e) {
+		// 失败保持 /login：bootError 交给登录页首帧显示表单与错误，不再闪「认证中」
+		wecomBootError = e instanceof Error ? e.message : String(e);
+	}
+}
 
 /**
  * 登录根 `/login`（+ 强制改密 `/change-password`）。
@@ -68,4 +118,7 @@ export async function onInit(ctx: ModuleContext) {
 		if (prev.token && !state.token)
 			useTenantStore.getState().clear();
 	});
+	// 必须在 provider 注册之后、首帧 render 之前：企微回跳的票据在这里换完，
+	// 登录页就不会先闪一下再跳首页（见 exchangeWecomTicketOnBoot 注释）。
+	await exchangeWecomTicketOnBoot();
 }

package/templates/src/app/web/personal-center/locales/en-US.json

@@ -9,6 +9,7 @@
 		"avatarRequired": "Please upload an avatar!",
 		"username": "Username",
 		"usernameRequired": "Please enter your username!",
+		"displayName": "Display name",
 		"email": "Email",
 		"emailRequired": "Please enter your email!",
 		"phoneNumber": "Phone",

package/templates/src/app/web/personal-center/locales/zh-CN.json

@@ -9,6 +9,7 @@
 		"avatarRequired": "请上传头像!",
 		"username": "用户名",
 		"usernameRequired": "请输入您的用户名!",
+		"displayName": "显示名",
 		"email": "邮箱",
 		"emailRequired": "请输入您的邮箱!",
 		"phoneNumber": "联系电话",

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

@@ -82,6 +82,11 @@ export default function Profile() {
 						},
 					]}
 				/>
+				<ProFormText
+					name="displayName"
+					label={t("personal-center:profile.displayName")}
+					disabled
+				/>
 				<ProFormText
 					name="email"
 					label={t("personal-center:profile.email")}

package/templates/src/app/web/system/__client/api.schemas.ts

@@ -122,7 +122,8 @@ export const schemas = {
 	},
 	"systemLoginMethodsGet": {
 		data: z.object({
-	"methods": z.array(z.string())
+	"methods": z.array(z.string()),
+	"site_title": z.string()
 }),
 	},
 	"systemOplogGet": {

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

@@ -6,7 +6,6 @@
 		"roles": "Roles & Permissions",
 		"oplog": "Audit Log",
 		"settings": "Site Settings",
-		"loginMethods": "Login Methods",
 		"wecom": "WeCom Integration",
 		"departments": "Departments"
 	},
@@ -130,13 +129,6 @@
 		"secretHint": "Secret items cannot be edited online",
 		"saved": "Settings saved"
 	},
-	"loginMethodsPage": {
-		"title": "Enabled login methods",
-		"methodLocal": "Local password",
-		"methodLdap": "LDAP",
-		"methodSso": "SSO",
-		"methodWecom": "WeCom"
-	},
 	"wecom": {
 		"title": "Onboard a corporation",
 		"hint": "Click \"Generate install link\" and send the link or QR code to the corporation's admin to scan/open for approval. On success this system auto-registers the corporation via the create_auth callback (writes wecom_app_profile). The link is generated by WeCom get_customized_auth_url; its validity follows WeCom's response (up to 10 days). The QR code greys out when it expires, so regenerate it.",
@@ -276,6 +268,7 @@
 			"login": "Login Methods",
 			"ldap": "LDAP"
 		},
+		"loginMethods": "Login Methods",
 		"site_title": "Site Title",
 		"market_cdn_url": "Market CDN URL",
 		"ldap_enabled": "Enable LDAP login",

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

@@ -6,7 +6,6 @@
 		"roles": "角色权限",
 		"oplog": "操作日志",
 		"settings": "站点设置",
-		"loginMethods": "登录方式",
 		"wecom": "企微集成",
 		"departments": "组织架构"
 	},
@@ -130,13 +129,6 @@
 		"secretHint": "敏感项不可在线修改",
 		"saved": "设置已保存"
 	},
-	"loginMethodsPage": {
-		"title": "当前启用的登录方式",
-		"methodLocal": "本地口令",
-		"methodLdap": "LDAP",
-		"methodSso": "SSO 单点登录",
-		"methodWecom": "企业微信"
-	},
 	"wecom": {
 		"title": "开通企业",
 		"hint": "点「生成开通链接」把链接或二维码发给企业管理员，由其扫码/打开授权；授权成功后本系统经 create_auth 回调自动登记该企业（落库 wecom_app_profile）。链接由企微 get_customized_auth_url 生成，有效期以企微返回为准（可达 10 天），过期后二维码置灰，可重新生成。",
@@ -276,6 +268,7 @@
 			"login": "登录方式",
 			"ldap": "LDAP"
 		},
+		"loginMethods": "登录方式",
 		"site_title": "站点标题",
 		"market_cdn_url": "市场 CDN 地址",
 		"ldap_enabled": "启用 LDAP 登录",

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

@@ -3,18 +3,21 @@ import type { TFunction } from "i18next";
 import type { SystemSettingsGetData } from "../../__client";
 
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { App, Button, Card, Input, Space, Switch, Tooltip } from "antd";
+import { App, Button, Card, Input, Space, Switch, Tag, Tooltip } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import { systemSettingsGet, systemSettingsPut } from "../../__client";
+import { systemLoginMethodsGet, systemSettingsGet, systemSettingsPut } from "../../__client";
 import { explainError, isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";
 
 type SettingItem = SystemSettingsGetData[number]["items"][number];
 
-/** 只动框架键（规格 §3）：按 module 字段过滤，业务自定义键（如 wiki 的 mw_config）与 market.*（security 组，super-only 写）不进入 */
-const FRAMEWORK_MODULES = new Set(["framework", "ldap", "sso"]);
+/**
+ * 只动框架键（规格 §3）：按 module 字段过滤，业务自定义键（如 wiki 的 mw_config）与 market.*（security 组，super-only 写）不进入。
+ * 登录方式（ldap/sso/wecom）不再作为可编辑设置，收敛为下方只读卡片（与 /login 同源）。
+ */
+const FRAMEWORK_MODULES = new Set(["framework"]);
 
 /** 单项行：bool → Switch（"1"/"0"）；secret → 只读 ***；其余 Input 失焦/回车保存 */
 function SettingRow({ item, t, onSave }: { item: SettingItem, t: TFunction, onSave: (key: string, value: string) => void }) {
@@ -73,6 +76,7 @@ export default function SettingsPage() {
 	const queryClient = useQueryClient();
 
 	const query = useQuery({ queryKey: ["system", "settings"], queryFn: systemSettingsGet });
+	const loginMethodsQuery = useQuery({ queryKey: ["system", "login-methods"], queryFn: systemLoginMethodsGet });
 
 	const putMut = useMutation({
 		mutationFn: (body: { key: string, value: string }) => systemSettingsPut(body),
@@ -90,8 +94,17 @@ export default function SettingsPage() {
 		.map(g => ({ ...g, items: g.items.filter(i => FRAMEWORK_MODULES.has(i.module)) }))
 		.filter(g => g.items.length > 0);
 
+	const loginMethods = loginMethodsQuery.data?.methods ?? ["local"];
+
 	return (
 		<Space direction="vertical" style={{ width: "100%", paddingTop: 16 }}>
+			<Card title={t("system:setting.loginMethods")}>
+				<Space wrap>
+					{loginMethods.map(m => (
+						<Tag key={m}>{t(`login:method.${m}`, { defaultValue: m })}</Tag>
+					))}
+				</Space>
+			</Card>
 			{groups.map(g => (
 				<Card key={g.group} title={t(`system:setting.group.${g.group}`, { defaultValue: g.group })}>
 					<Space direction="vertical" style={{ width: "100%" }}>

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

@@ -12,7 +12,6 @@ const Departments = lazy(() => import("./pages/departments"));
 const Roles = lazy(() => import("./pages/roles"));
 const Oplog = lazy(() => import("./pages/oplog"));
 const Settings = lazy(() => import("./pages/settings"));
-const LoginMethods = lazy(() => import("./pages/login-methods"));
 const WecomAdmin = lazy(() => import("./pages/wecom"));
 
 /**
@@ -76,11 +75,6 @@ export const routes: AppRouteRecordRaw[] = [
 				Component: Settings,
 				handle: { title: "system:menu.settings", roles: ["superadmin"] },
 			},
-			{
-				path: "/system/login-methods",
-				Component: LoginMethods,
-				handle: { title: "system:menu.loginMethods" },
-			},
 			{
 				// 企微代开发后台（服务商运营面）：仅超管可见（路由级 roles + 页面内二次判定）
 				path: "/system/wecom",

package/templates/src/oj-market/web/__tests__/CardGrid.test.tsx

@@ -73,6 +73,39 @@ describe("cardGrid 卡片网格（BDD）", () => {
 		expect(screen.queryByTestId("card-license-alpha")).toBeNull();
 	});
 
+	it("given 索引带 summary/description When 渲染 Then 卡片显示简介与描述（描述全文进 title 供查看）", () => {
+		const description = "详细描述：提供示例 CRUD、菜单路由与安装/升级/回滚全链路。";
+		renderWithProviders(
+			<CardGrid rows={[{ ...installed, summary: "一句话说清方案做什么", description }]} {...handlers} />,
+			new InMemoryMarketClient(),
+		);
+		expect(screen.getByTestId("card-summary-alpha").textContent).toContain("一句话说清方案做什么");
+		const desc = screen.getByTestId("card-description-alpha");
+		expect(desc.textContent).toContain(description);
+		expect(desc.getAttribute("title")).toBe(description);
+	});
+
+	it("given 索引未声明 summary/description When 渲染 Then 卡片不出现简介/描述块（不显示占位符）", () => {
+		renderWithProviders(<CardGrid rows={[installed]} {...handlers} />, new InMemoryMarketClient());
+		expect(screen.queryByTestId("card-summary-alpha")).toBeNull();
+		expect(screen.queryByTestId("card-description-alpha")).toBeNull();
+	});
+
+	it("given 索引带 publisher_key When 渲染 Then 卡片显示发布者（签出的 key_id，全文进 title）", () => {
+		renderWithProviders(
+			<CardGrid rows={[{ ...installed, publisher_key: "demo-solution.wecom-everpan" }]} {...handlers} />,
+			new InMemoryMarketClient(),
+		);
+		const pub = screen.getByTestId("card-publisher-alpha");
+		expect(pub.textContent).toContain("demo-solution.wecom-everpan");
+		expect(pub.getAttribute("title")).toBe("demo-solution.wecom-everpan");
+	});
+
+	it("given 索引未声明 publisher_key When 渲染 Then 卡片不出现发布者行（不显示占位符）", () => {
+		renderWithProviders(<CardGrid rows={[installed]} {...handlers} />, new InMemoryMarketClient());
+		expect(screen.queryByTestId("card-publisher-alpha")).toBeNull();
+	});
+
 	it("given 未安装卡片 When 渲染 Then 安装按钮显示「安装」而非「升级」，且无回滚按钮", () => {
 		renderWithProviders(<CardGrid rows={[notInstalled]} {...handlers} />, new InMemoryMarketClient());
 		expect(screen.getByText("安装")).toBeTruthy();

package/templates/src/oj-market/web/__tests__/DetailDrawer.test.tsx

@@ -0,0 +1,69 @@
+import type { IndexRow } from "../types";
+import { screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { DetailDrawer } from "../components/DetailDrawer";
+import { InMemoryMarketClient } from "./marketClient.fake";
+import { renderWithProviders } from "./render";
+
+const row: IndexRow = {
+	name: "alpha",
+	latest: "1.2.0",
+	installed: "1.1.0",
+	enabled: true,
+	upgradable: true,
+	summary: "一站式客户管理",
+	description: "第一行：客户档案\n第二行：跟进记录与报表",
+};
+
+describe("detailDrawer 方案详情（BDD）", () => {
+	const handlers = {
+		onClose: vi.fn(),
+		onInstall: vi.fn(),
+		onHistory: vi.fn(),
+		onRollback: vi.fn(),
+	};
+
+	it("given 带 summary/description When 打开 Then 展示完整简介与描述（描述保留换行，卡片限行的全文在此）", () => {
+		renderWithProviders(
+			<DetailDrawer row={row} open canManage {...handlers} />,
+			new InMemoryMarketClient(),
+		);
+		expect(screen.getByText("简介")).toBeTruthy();
+		expect(screen.getByText("详细介绍")).toBeTruthy();
+		expect(screen.getByTestId("detail-summary").textContent).toBe(row.summary);
+		const desc = screen.getByTestId("detail-description");
+		expect(desc.textContent).toBe(row.description);
+		expect(desc.style.whiteSpace).toBe("pre-wrap");
+	});
+
+	it("given 未声明 summary/description When 打开 Then 不出现这两行（不显示占位符）", () => {
+		renderWithProviders(
+			<DetailDrawer row={{ ...row, summary: undefined, description: undefined }} open canManage {...handlers} />,
+			new InMemoryMarketClient(),
+		);
+		expect(screen.queryByTestId("detail-summary")).toBeNull();
+		expect(screen.queryByTestId("detail-description")).toBeNull();
+		expect(screen.queryByText("简介")).toBeNull();
+		expect(screen.queryByText("详细介绍")).toBeNull();
+	});
+
+	it("given 带 publisher_key When 打开 Then 详情展示发布者（签出的 key_id，长串可折行）", () => {
+		renderWithProviders(
+			<DetailDrawer row={{ ...row, publisher_key: "demo-solution.wecom-everpan.macbook" }} open canManage {...handlers} />,
+			new InMemoryMarketClient(),
+		);
+		expect(screen.getByText("发布者")).toBeTruthy();
+		const pub = screen.getByTestId("detail-publisher");
+		expect(pub.textContent).toBe("demo-solution.wecom-everpan.macbook");
+		expect(pub.style.wordBreak).toBe("break-all");
+	});
+
+	it("given 未声明 publisher_key When 打开 Then 不出现发布者行（不显示占位符）", () => {
+		renderWithProviders(
+			<DetailDrawer row={{ ...row, publisher_key: undefined }} open canManage {...handlers} />,
+			new InMemoryMarketClient(),
+		);
+		expect(screen.queryByTestId("detail-publisher")).toBeNull();
+		expect(screen.queryByText("发布者")).toBeNull();
+	});
+});

package/templates/src/oj-market/web/__tests__/marketClient.fake.ts

@@ -1,12 +1,13 @@
 import type { MarketClient } from "../api/client";
 // 内存实现 MarketClient（BDD 测试注入用，无需真实后端）。
-import type { EnableInput, IndexRow, InstallInput, MarketHistory, TaskRecord, UninstallImpact } from "../types";
+import type { EnableInput, IndexRow, InstallInput, MarketHistory, ReleasePage, TaskRecord, UninstallImpact } from "../types";
 
 export interface FakeState {
 	indexRows?: IndexRow[]
 	indexError?: Error
 	taskRecord?: TaskRecord
 	historyRows?: MarketHistory[]
+	releasePage?: ReleasePage
 	impact?: UninstallImpact
 	enableResult?: { ok: boolean, message: string }
 	uninstallResult?: { ok: boolean, message: string }
@@ -65,6 +66,11 @@ export class InMemoryMarketClient implements MarketClient {
 		return this.state.historyRows ?? [];
 	}
 
+	async releases(input: { page?: number, limit?: number } = {}) {
+		this.calls.push(`releases:${input.page ?? 1}:${input.limit ?? 20}`);
+		return this.state.releasePage ?? { list: [], total: 0, page: 1, size: 20, syncError: null };
+	}
+
 	async uninstallImpact(name: string) {
 		this.calls.push(`uninstallImpact:${name}`);
 		return this.state.impact ?? { name, affectedRoles: 0, affectedUsers: 0 };