@oj-module/cli 0.2.63 → 0.2.66

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

@@ -2,5 +2,20 @@
 	"menu": {
 		"personalCenter": "个人中心",
 		"profile": "我的资料"
+	},
+	"profile": {
+		"title": "我的资料",
+		"avatar": "头像",
+		"avatarRequired": "请上传头像!",
+		"username": "用户名",
+		"usernameRequired": "请输入您的用户名!",
+		"email": "邮箱",
+		"emailRequired": "请输入您的邮箱!",
+		"phoneNumber": "联系电话",
+		"phoneNumberRequired": "请输入您的联系电话!",
+		"description": "个人简介",
+		"descriptionPlaceholder": "个人简介",
+		"updated": "更新基本信息成功",
+		"updateFailed": "更新基本信息失败：{{message}}"
 	}
 }

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

@@ -6,10 +6,12 @@ import {
 } from "@ant-design/pro-components";
 import { BasicContent, FormAvatarItem, useUserStore } from "@oj-module/runtime";
 import { App, Form, Input } from "antd";
+import { useTranslation } from "react-i18next";
 
 import { personalCenterProfilePost } from "../../__client";
 
 export default function Profile() {
+	const { t } = useTranslation();
 	const currentUser = useUserStore();
 	const { message } = App.useApp();
 	const getAvatarURL = () => {
@@ -39,16 +41,16 @@ export default function Profile() {
 				description: values.description,
 			});
 			await useUserStore.getState().getUserInfo();
-			message.success("更新基本信息成功");
+			message.success(t("personal-center:profile.updated"));
 		}
 		catch (e) {
-			message.error(`更新基本信息失败：${e instanceof Error ? e.message : String(e)}`);
+			message.error(t("personal-center:profile.updateFailed", { message: e instanceof Error ? e.message : String(e) }));
 		}
 	};
 
 	return (
 		<BasicContent className="max-w-md ml-10">
-			<h3>我的资料</h3>
+			<h3>{t("personal-center:profile.title")}</h3>
 			<ProForm
 				layout="vertical"
 				onFinish={handleFinish}
@@ -60,11 +62,11 @@ export default function Profile() {
 			>
 				<Form.Item
 					name="avatar"
-					label="头像"
+					label={t("personal-center:profile.avatar")}
 					rules={[
 						{
 							required: true,
-							message: "请输入您的昵称!",
+							message: t("personal-center:profile.avatarRequired"),
 						},
 					]}
 				>
@@ -72,31 +74,31 @@ export default function Profile() {
 				</Form.Item>
 				<ProFormText
 					name="username"
-					label="用户名"
+					label={t("personal-center:profile.username")}
 					rules={[
 						{
 							required: true,
-							message: "请输入您的用户名!",
+							message: t("personal-center:profile.usernameRequired"),
 						},
 					]}
 				/>
 				<ProFormText
 					name="email"
-					label="邮箱"
+					label={t("personal-center:profile.email")}
 					rules={[
 						{
 							required: true,
-							message: "请输入您的邮箱!",
+							message: t("personal-center:profile.emailRequired"),
 						},
 					]}
 				/>
 				<ProFormDigit
 					name="phoneNumber"
-					label="联系电话"
+					label={t("personal-center:profile.phoneNumber")}
 					rules={[
 						{
 							required: true,
-							message: "请输入您的联系电话!",
+							message: t("personal-center:profile.phoneNumberRequired"),
 						},
 					]}
 				>
@@ -105,8 +107,8 @@ export default function Profile() {
 				<ProFormTextArea
 					allowClear
 					name="description"
-					label="个人简介"
-					placeholder="个人简介"
+					label={t("personal-center:profile.description")}
+					placeholder={t("personal-center:profile.descriptionPlaceholder")}
 				/>
 			</ProForm>
 		</BasicContent>

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

@@ -40,12 +40,15 @@
 			"departments": "Departments"
 		},
 		"mainDept": "Main dept",
-		"filterDept": "Filter by department (incl. sub-depts)"
+		"filterDept": "Filter by department (incl. sub-depts)",
+		"password": "Password",
+		"usernameHint": "ldap:/ sso:/ wecom: prefixes are reserved for external identity sources"
 	},
 	"userRoles": {
 		"title": "Membership",
 		"saved": "Roles updated",
-		"none": "(no roles)"
+		"none": "(no roles)",
+		"deprecated": " (deprecated)"
 	},
 	"rolesPage": {
 		"tabRoles": "Roles",
@@ -55,7 +58,18 @@
 		"holders": "Holders",
 		"permissions": "Bound Permissions",
 		"titleKey": "Title Key",
-		"readonlyHint": "Read-only view: roles and bindings are managed by solution tooling (upsertSolutionPerms)"
+		"readonlyHint": "Read-only view: roles and bindings are managed by solution tooling (upsertSolutionPerms)",
+		"columns": {
+			"module": "Module",
+			"title": "Title",
+			"code": "Code"
+		},
+		"roleTitle": {
+			"superadmin": "Super Admin",
+			"admin": "Administrator",
+			"editor": "Editor",
+			"viewer": "Viewer"
+		}
 	},
 	"departments": {
 		"create": "New Department",
@@ -256,7 +270,14 @@
 		}
 	},
 	"setting": {
+		"group": {
+			"general": "General",
+			"security": "Security",
+			"login": "Login Methods",
+			"ldap": "LDAP"
+		},
 		"site_title": "Site Title",
+		"market_cdn_url": "Market CDN URL",
 		"ldap_enabled": "Enable LDAP login",
 		"sso_enabled": "Enable SSO login",
 		"wecom_enabled": "Enable WeCom login",

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

@@ -40,12 +40,15 @@
 			"departments": "所属部门"
 		},
 		"mainDept": "主部门",
-		"filterDept": "按部门筛选（含子部门）"
+		"filterDept": "按部门筛选（含子部门）",
+		"password": "口令",
+		"usernameHint": "ldap:/ sso:/ wecom: 为外部身份源保留"
 	},
 	"userRoles": {
 		"title": "成员资格",
 		"saved": "角色已更新",
-		"none": "（无角色）"
+		"none": "（无角色）",
+		"deprecated": "（已废弃）"
 	},
 	"rolesPage": {
 		"tabRoles": "角色",
@@ -55,7 +58,18 @@
 		"holders": "持有者",
 		"permissions": "已绑定权限点",
 		"titleKey": "标题键",
-		"readonlyHint": "只读视图：角色与绑定由解决方案工具链（upsertSolutionPerms）管理"
+		"readonlyHint": "只读视图：角色与绑定由解决方案工具链（upsertSolutionPerms）管理",
+		"columns": {
+			"module": "模块",
+			"title": "标题",
+			"code": "编码"
+		},
+		"roleTitle": {
+			"superadmin": "超级管理员",
+			"admin": "系统管理员",
+			"editor": "编辑",
+			"viewer": "访客"
+		}
 	},
 	"departments": {
 		"create": "新建部门",
@@ -256,7 +270,14 @@
 		}
 	},
 	"setting": {
+		"group": {
+			"general": "常规",
+			"security": "安全",
+			"login": "登录方式",
+			"ldap": "LDAP"
+		},
 		"site_title": "站点标题",
+		"market_cdn_url": "市场 CDN 地址",
 		"ldap_enabled": "启用 LDAP 登录",
 		"sso_enabled": "启用 SSO 登录",
 		"wecom_enabled": "启用企业微信登录",

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

@@ -37,13 +37,20 @@ export default function RolesPage() {
 				</Space>
 			),
 		},
-		{ title: "module", dataIndex: "module" },
+		{ title: t("system:rolesPage.columns.module"), dataIndex: "module" },
 		{
 			// R2：solution 角色带 title_key → 按当前语言实时翻译，title（安装期解析文本）兜底；
-			// custom/builtin 无 key 原样显示 title（对齐下方权限点 title_key 的渲染先例）
-			title: "title",
+			// 内置角色（builtin）的 title 是种子里的站点默认语言文本，按角色名再兜一层 locale；
+			// custom 角色无 key 原样显示 title（对齐下方权限点 title_key 的渲染先例）
+			title: t("system:rolesPage.columns.title"),
 			dataIndex: "title",
-			render: (_: string, row: RoleRow) => (row.title_key ? t(row.title_key, { defaultValue: row.title ?? "" }) : row.title),
+			render: (_: string, row: RoleRow) => {
+				if (row.title_key)
+					return t(row.title_key, { defaultValue: row.title ?? "" });
+				return row.builtin
+					? t(`system:rolesPage.roleTitle.${row.name}`, { defaultValue: row.title ?? row.name })
+					: row.title;
+			},
 		},
 		{ title: t("system:rolesPage.holders"), dataIndex: "holders" },
 		{
@@ -55,11 +62,11 @@ export default function RolesPage() {
 
 	const permColumns = [
 		{
-			title: "code",
+			title: t("system:rolesPage.columns.code"),
 			dataIndex: "code",
 			render: (code: string, row: PermRow) => (row.deprecated ? <Tag color="default">{code}</Tag> : <span>{code}</span>),
 		},
-		{ title: "module", dataIndex: "module" },
+		{ title: t("system:rolesPage.columns.module"), dataIndex: "module" },
 		{
 			// title_key 是跨模块 namespace（如 wiki:perm.*），本模块 locale 不命中回退 code（R6）
 			title: t("system:rolesPage.titleKey"),

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

@@ -93,7 +93,7 @@ export default function SettingsPage() {
 	return (
 		<Space direction="vertical" style={{ width: "100%", paddingTop: 16 }}>
 			{groups.map(g => (
-				<Card key={g.group} title={g.group}>
+				<Card key={g.group} title={t(`system:setting.group.${g.group}`, { defaultValue: g.group })}>
 					<Space direction="vertical" style={{ width: "100%" }}>
 						{g.items.map(item => (
 							<SettingRow key={item.key} item={item} t={t} onSave={(key, value) => putMut.mutate({ key, value })} />

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

@@ -188,10 +188,10 @@ export default function UsersPage() {
 				onOk={() => createForm.submit()}
 			>
 				<Form form={createForm} layout="vertical" onFinish={values => createMut.mutate(values)}>
-					<Form.Item name="username" label={t("system:users.columns.username")} rules={[{ required: true }]} extra="ldap:/ sso:/ wecom: 为外部身份源保留">
+					<Form.Item name="username" label={t("system:users.columns.username")} rules={[{ required: true }]} extra={t("system:users.usernameHint")}>
 						<Input />
 					</Form.Item>
-					<Form.Item name="password" label="Password" rules={[{ required: true }, { min: 6 }]} extra={t("system:users.pwdPlaceholder")}>
+					<Form.Item name="password" label={t("system:users.password")} rules={[{ required: true }, { min: 6 }]} extra={t("system:users.pwdPlaceholder")}>
 						<Input.Password />
 					</Form.Item>
 					<Form.Item name="displayName" label={t("system:users.columns.displayName")}>
@@ -211,7 +211,7 @@ export default function UsersPage() {
 				onOk={() => pwdForm.submit()}
 			>
 				<Form form={pwdForm} layout="vertical" onFinish={values => pwdTarget && pwdMut.mutate({ uid: pwdTarget.id, password: values.password })}>
-					<Form.Item name="password" label="Password" rules={[{ required: true }, { min: 6 }]} extra={t("system:users.pwdPlaceholder")}>
+					<Form.Item name="password" label={t("system:users.password")} rules={[{ required: true }, { min: 6 }]} extra={t("system:users.pwdPlaceholder")}>
 						<Input.Password />
 					</Form.Item>
 				</Form>

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

@@ -58,7 +58,7 @@ export default function UserRolesPage() {
 			<Space direction="vertical">
 				<Checkbox.Group
 					options={(rolesQuery.data ?? []).map(r => ({
-						label: `${r.name}${r.deprecated ? "（已废弃）" : ""}`,
+						label: `${r.name}${r.deprecated ? t("system:userRoles.deprecated") : ""}`,
 						value: r.name,
 						// 非 superadmin 授不了平台级角色：置灰，提交后 403 太晚也太含糊
 						disabled: r.name === "superadmin" && !isSuper,

package/templates/src/oj-market/web/locales/en-US.json

@@ -45,7 +45,20 @@
 		"installing": "Installing",
 		"uninstalling": "Uninstalling",
 		"progress": "Progress",
-		"stage": "Stage",
+		"stage": {
+			"preflight": "Preflight",
+			"downloading": "Downloading",
+			"verifying": "Verifying",
+			"extracting": "Extracting",
+			"migrating": "Migrating data",
+			"lock_commit": "Committing version lock",
+			"registering": "Registering module",
+			"deploying_web": "Deploying web assets",
+			"reloading": "Reloading config",
+			"smoke": "Smoke check",
+			"audit": "Final audit",
+			"done": "Done"
+		},
 		"status": {
 			"running": "Running",
 			"done": "Done",

package/templates/src/oj-market/web/locales/zh-CN.json

@@ -45,7 +45,20 @@
 		"installing": "安装中",
 		"uninstalling": "卸载中",
 		"progress": "进度",
-		"stage": "阶段",
+		"stage": {
+			"preflight": "预检",
+			"downloading": "下载中",
+			"verifying": "校验中",
+			"extracting": "解包中",
+			"migrating": "数据迁移",
+			"lock_commit": "提交版本锁",
+			"registering": "注册模块",
+			"deploying_web": "部署前端",
+			"reloading": "重载配置",
+			"smoke": "冒烟探活",
+			"audit": "终态审计",
+			"done": "完成"
+		},
 		"status": {
 			"running": "进行中",
 			"done": "完成",

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.63",
-		"@oj-module/runtime/contract": "0.2.63",
-		"@oj-module/runtime/contract/errors": "0.2.63",
+		"@oj-module/runtime": "0.2.66",
+		"@oj-module/runtime/contract": "0.2.66",
+		"@oj-module/runtime/contract/errors": "0.2.66",
 		"@plane/kit": "0.1.20",
 		"@plane/editor": "0.1.20",
 		"antd": "6.6.1",