@oj-module/cli 0.2.46 → 0.2.48

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

@@ -7,7 +7,8 @@
 		"oplog": "操作日志",
 		"settings": "站点设置",
 		"loginMethods": "登录方式",
-		"wecom": "企业微信代开发"
+		"wecom": "企微集成",
+		"departments": "组织架构"
 	},
 	"common": {
 		"confirm": "确认",
@@ -16,7 +17,9 @@
 		"saved": "已保存",
 		"search": "查询",
 		"reset": "重置",
-		"create": "新建"
+		"create": "新建",
+		"edit": "编辑",
+		"delete": "删除"
 	},
 	"users": {
 		"create": "建号",
@@ -32,8 +35,12 @@
 			"email": "邮箱",
 			"roles": "角色",
 			"status": "账号状态（禁用/首登改密）",
-			"actions": "操作"
-		}
+			"actions": "操作",
+			"position": "职务",
+			"departments": "所属部门"
+		},
+		"mainDept": "主部门",
+		"filterDept": "按部门筛选（含子部门）"
 	},
 	"userRoles": {
 		"title": "成员资格",
@@ -50,6 +57,46 @@
 		"titleKey": "标题键",
 		"readonlyHint": "只读视图：角色与绑定由解决方案工具链（upsertSolutionPerms）管理"
 	},
+	"departments": {
+		"create": "新建部门",
+		"edit": "编辑部门",
+		"view": "查看",
+		"createHint": "组织架构是各模块共享的基线数据；企微/LDAP 只是写入它的适配器",
+		"members": "成员",
+		"memberCount": "成员",
+		"detach": "转为本地维护",
+		"detachHint": "转为本地维护后，同步不再改写该部门，改名/移动/删除全部开放",
+		"readonlyHint": "该部门由外部源同步维护，结构字段只读",
+		"unnamed": "（未命名）",
+		"hidden": "已失去可见范围",
+		"removed": "源侧已删除",
+		"root": "（顶层）",
+		"selectUser": "选择用户",
+		"addMember": "添加成员",
+		"removeMember": "移出",
+		"noMembers": "暂无成员",
+		"confirmDelete": "删除该部门？其下成员关联会一并清除",
+		"confirmRemoveMember": "把该用户移出本部门？",
+		"yes": "是",
+		"no": "否",
+		"origin": {
+			"local": "本站",
+			"wecom": "企业微信",
+			"ldap": "LDAP",
+			"sso": "SSO"
+		},
+		"columns": {
+			"name": "部门名称",
+			"nameEn": "英文名",
+			"parent": "上级部门"
+		},
+		"memberColumns": {
+			"user": "用户",
+			"main": "主部门",
+			"leader": "负责人",
+			"actions": "操作"
+		}
+	},
 	"oplog": {
 		"filterAction": "操作 (action)",
 		"filterUsername": "用户名（前缀匹配）",
@@ -79,7 +126,7 @@
 	},
 	"wecom": {
 		"title": "开通企业",
-		"hint": "点「生成开通链接」后把链接或二维码发给企业管理员，由其确认授权；确认后企业侧的回调会写入本表。链接 10 分钟内有效且只能用一次，过期后二维码会置灰，需重新生成。",
+		"hint": "点「生成开通链接」把链接或二维码发给企业管理员，由其扫码/打开授权；授权成功后本系统经 create_auth 回调自动登记该企业（落库 wecom_app_profile）。链接由企微 get_customized_auth_url 生成，有效期以企微返回为准（可达 10 天），过期后二维码置灰，可重新生成。",
 		"appsTitle": "已开通企业",
 		"genInstall": "生成开通链接",
 		"installOk": "已生成，请把链接发给企业管理员",
@@ -93,7 +140,8 @@
 			"env": "环境",
 			"status": "状态",
 			"installedAt": "开通时间",
-			"action": "操作"
+			"action": "操作",
+			"authMode": "授权模式"
 		},
 		"statusActive": "启用",
 		"statusDisabled": "停用",
@@ -103,7 +151,61 @@
 		"enable": "启用",
 		"disableConfirm": "停用该应用？企业成员将无法用它登录。",
 		"enableConfirm": "启用该应用？",
-		"empty": "暂无已开通企业"
+		"empty": "暂无已开通企业",
+		"authModeAdmin": "管理员授权",
+		"authModeMember": "成员授权",
+		"authModeHint": "「成员授权」模式下应用没有通讯录权限，该企业的组织架构无法同步——需企业管理员在企微后台改为「管理员授权」后重新授权。",
+		"sync": {
+			"updatedAt": "企微组织架构更新于 {{time}}",
+			"neverSynced": "尚未同步过企微组织架构",
+			"auto": "自动同步",
+			"syncNow": "立即同步",
+			"retry": "重试",
+			"resume": "继续同步",
+			"cancel": "取消同步",
+			"syncing": "正在读取企微组织架构…",
+			"syncingProgress": "正在同步：已处理 {{done}}/{{total}} 个部门",
+			"done": "同步完成：{{depts}} 个部门 / {{members}} 名成员",
+			"paused": "同步已暂停（已处理 {{depts}} 个部门），点「继续同步」接着往下",
+			"skipped": "{{count}} 个部门因权限被跳过（可见范围外的部门属正常）",
+			"cancelled": "已取消同步",
+			"ago": {
+				"justNow": "刚刚",
+				"minutes": "{{count}} 分钟前",
+				"hours": "{{count}} 小时前",
+				"days": "{{count}} 天前"
+			},
+			"memberAuth": {
+				"title": "该企业为「成员授权」模式，应用没有通讯录权限",
+				"hint": "请企业管理员在企微后台把授权模式改为「管理员授权」后重新授权，才能同步组织架构。"
+			},
+			"frozen": {
+				"title": "该企业已取消授权或应用已停用，同步已冻结",
+				"hint": "下方为最后一次同步的数据快照；请联系服务商重新开通后再同步。"
+			},
+			"err": {
+				"permission": {
+					"title": "应用缺少通讯录权限（错误码 {{code}}）",
+					"hint": "企业管理员：企微后台 → 应用管理 → 本应用 → 权限，勾选「通讯录」相关权限并提交。"
+				},
+				"rateLimited": {
+					"title": "企微接口限流（错误码 {{code}}）",
+					"hint": "已自动退避，稍后点「继续同步」即可。"
+				},
+				"ipWhitelist": {
+					"title": "服务器出口 IP 不在企微白名单（错误码 {{code}}）",
+					"hint": "由服务商运维在企微后台补充可信 IP。"
+				},
+				"network": {
+					"title": "无法连接企业微信（{{code}}）",
+					"hint": "请检查服务器网络与企微接口可达性后重试。"
+				},
+				"unknown": {
+					"title": "同步失败（错误码 {{code}}）",
+					"hint": "请联系服务商排查后重试。"
+				}
+			}
+		}
 	},
 	"err": {
 		"forbidden": "无权限",
@@ -125,5 +227,9 @@
 		"ldap_base_dn": "LDAP Base DN",
 		"ldap_uid_attr": "LDAP UID 属性",
 		"ldap_email_attr": "LDAP 邮箱属性"
+	},
+	"perm": {
+		"platform_org_read_all": "组织架构全量读权限",
+		"auth_wecom_sync": "企业微信组织架构同步"
 	}
 }

package/templates/src/system/web/pages/departments/index.tsx

@@ -0,0 +1,346 @@
+import type { SystemDepartmentsGetData, SystemDepartmentsMembersGetData } from "../../__client/api";
+
+import { PlusOutlined } from "@ant-design/icons";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+	App,
+	Button,
+	Form,
+	Input,
+	Modal,
+	Popconfirm,
+	Select,
+	Space,
+	Table,
+	Tag,
+	Tree,
+	TreeSelect,
+	Typography,
+} from "antd";
+import { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import {
+	systemDepartmentsDelete,
+	systemDepartmentsDetachPost,
+	systemDepartmentsGet,
+	systemDepartmentsMembersDelete,
+	systemDepartmentsMembersGet,
+	systemDepartmentsMembersPost,
+	systemDepartmentsMembersPut,
+	systemDepartmentsMovePut,
+	systemDepartmentsPost,
+	systemDepartmentsPut,
+	systemUsersGet,
+} from "../../__client/api";
+import { explainError, isForbidden } from "../errors";
+import { ForbiddenPanel } from "../forbidden";
+import { WecomSyncBar } from "./sync-bar";
+import { buildTreeData, subtreeIds } from "./tree";
+
+type DeptRow = SystemDepartmentsGetData[number];
+type MemberRow = SystemDepartmentsMembersGetData[number];
+
+/** 归属权 → 人话标签（local = 本站可改；其余 = 适配器管辖，改前须「转为本地维护」） */
+function originTag(origin: string, t: (k: string, opts?: { defaultValue?: string }) => string): React.ReactNode {
+	if (origin === "local")
+		return <Tag>{t("system:departments.origin.local")}</Tag>;
+	return <Tag color="blue">{t(`system:departments.origin.${origin}`, { defaultValue: origin })}</Tag>;
+}
+
+/** 部门管理页：树形增删改 + 成员维护 + 转为本地维护（D14 保底出口）。 */
+export default function DepartmentsPage() {
+	const { t } = useTranslation();
+	const { message } = App.useApp();
+	const queryClient = useQueryClient();
+
+	const [editOpen, setEditOpen] = useState(false);
+	const [editing, setEditing] = useState<DeptRow | null>(null);
+	const [form] = Form.useForm<{ name: string, nameEn?: string, parentId?: number | null, orderNo?: number }>();
+	const [memberDept, setMemberDept] = useState<DeptRow | null>(null);
+	const [addUid, setAddUid] = useState<number | null>(null);
+
+	const deptsQuery = useQuery({ queryKey: ["system", "departments"], queryFn: systemDepartmentsGet });
+	const usersQuery = useQuery({ queryKey: ["system", "users"], queryFn: systemUsersGet });
+	const membersQuery = useQuery({
+		queryKey: ["system", "departments", "members", memberDept?.id],
+		queryFn: () => systemDepartmentsMembersGet({ id: memberDept!.id }),
+		enabled: memberDept !== null,
+	});
+
+	const rows = useMemo(() => deptsQuery.data ?? [], [deptsQuery.data]);
+	const invalidateAll = () => {
+		queryClient.invalidateQueries({ queryKey: ["system", "departments"] });
+		queryClient.invalidateQueries({ queryKey: ["system", "departments", "members"] });
+	};
+	const onError = (e: unknown) => message.error(explainError(e, t));
+
+	const createMut = useMutation({
+		mutationFn: (input: { name: string, nameEn?: string | null, parentId?: number | null, orderNo?: number }) => systemDepartmentsPost(input),
+		onSuccess: () => {
+			message.success(t("system:common.saved"));
+			setEditOpen(false);
+			form.resetFields();
+			invalidateAll();
+		},
+		onError,
+	});
+
+	const updateMut = useMutation({
+		mutationFn: (input: { id: number, body: { name?: string, nameEn?: string | null, orderNo?: number } }) => systemDepartmentsPut({ query: { id: input.id }, body: input.body }),
+		onSuccess: () => {
+			message.success(t("system:common.saved"));
+			setEditOpen(false);
+			invalidateAll();
+		},
+		onError,
+	});
+
+	const moveMut = useMutation({
+		mutationFn: (input: { id: number, parentId: number | null }) => systemDepartmentsMovePut({ query: { id: input.id }, body: { parentId: input.parentId } }),
+		onSuccess: invalidateAll,
+		onError,
+	});
+
+	const deleteMut = useMutation({
+		mutationFn: (id: number) => systemDepartmentsDelete({ id }),
+		onSuccess: invalidateAll,
+		onError,
+	});
+
+	const detachMut = useMutation({
+		mutationFn: (id: number) => systemDepartmentsDetachPost({ id }),
+		onSuccess: () => {
+			message.success(t("system:common.saved"));
+			invalidateAll();
+		},
+		onError,
+	});
+
+	const addMemberMut = useMutation({
+		mutationFn: (input: { id: number, userId: number }) => systemDepartmentsMembersPost({ query: { id: input.id }, body: { userId: input.userId } }),
+		onSuccess: () => {
+			setAddUid(null);
+			invalidateAll();
+		},
+		onError,
+	});
+
+	const updateMemberMut = useMutation({
+		mutationFn: (input: { id: number, userId: number, body: { isLeader?: boolean, isMain?: boolean } }) => systemDepartmentsMembersPut({ query: { id: input.id, userId: input.userId }, body: input.body }),
+		onSuccess: invalidateAll,
+		onError,
+	});
+
+	const removeMemberMut = useMutation({
+		mutationFn: (input: { id: number, userId: number }) => systemDepartmentsMembersDelete({ id: input.id, userId: input.userId }),
+		onSuccess: invalidateAll,
+		onError,
+	});
+
+	// 父级选择器：排除自己及其子孙（选了会被后端判环 400，不如不给）
+	const parentOptions = useMemo(() => {
+		if (!editing)
+			return rows.map(d => ({ title: d.name ?? `#${d.id}`, value: d.id }));
+		const banned = subtreeIds(rows, [editing.id]);
+		return rows.filter(d => !banned.has(d.id)).map(d => ({ title: d.name ?? `#${d.id}`, value: d.id }));
+	}, [rows, editing]);
+
+	const treeData = useMemo(() => buildTreeData(rows, (d) => {
+		const editable = d.origin === "local";
+		return (
+			<Space size={4} wrap>
+				<Typography.Text strong>{d.name ?? t("system:departments.unnamed")}</Typography.Text>
+				{originTag(d.origin, t)}
+				<Typography.Text type="secondary">{`${t("system:departments.memberCount")} ${d.memberCount}`}</Typography.Text>
+				{!d.syncVisible ? <Tag color="orange">{t("system:departments.hidden")}</Tag> : null}
+				{!d.deleted ? null : <Tag color="red">{t("system:departments.removed")}</Tag>}
+				<Button
+					size="small"
+					type="link"
+					onClick={() => {
+						setEditing(d);
+						form.setFieldsValue({ name: d.name ?? "", nameEn: d.nameEn ?? undefined, parentId: d.parentId, orderNo: d.orderNo });
+						setEditOpen(true);
+					}}
+				>
+					{editable ? t("system:common.edit") : t("system:departments.view")}
+				</Button>
+				<Button
+					size="small"
+					type="link"
+					onClick={() => {
+						setMemberDept(d);
+						setAddUid(null);
+					}}
+				>
+					{t("system:departments.members")}
+				</Button>
+				{editable
+					? (
+						<Popconfirm title={t("system:departments.confirmDelete")} onConfirm={() => deleteMut.mutate(d.id)}>
+							<Button size="small" type="link" danger>{t("system:common.delete")}</Button>
+						</Popconfirm>
+					)
+					: (
+						<Popconfirm
+							title={t("system:departments.detach")}
+							description={t("system:departments.detachHint")}
+							onConfirm={() => detachMut.mutate(d.id)}
+						>
+							<Button size="small" type="link">{t("system:departments.detach")}</Button>
+						</Popconfirm>
+					)}
+			</Space>
+		);
+	}), [rows, t, form, deleteMut, detachMut]);
+
+	if (deptsQuery.error && isForbidden(deptsQuery.error))
+		return <ForbiddenPanel t={t} error={deptsQuery.error} />;
+
+	const memberColumns = [
+		{
+			title: t("system:departments.memberColumns.user"),
+			dataIndex: "username",
+			render: (_: unknown, row: MemberRow) => (row.displayName ? `${row.displayName}（${row.username}）` : row.username),
+		},
+		{
+			title: t("system:departments.memberColumns.main"),
+			dataIndex: "isMain",
+			render: (isMain: boolean, row: MemberRow) => (
+				<Popconfirm
+					title={t("system:departments.memberColumns.main")}
+					onConfirm={() => updateMemberMut.mutate({ id: row.deptId, userId: row.userId, body: { isMain: !isMain } })}
+				>
+					<Tag color={isMain ? "green" : undefined}>{isMain ? t("system:departments.yes") : t("system:departments.no")}</Tag>
+				</Popconfirm>
+			),
+		},
+		{
+			title: t("system:departments.memberColumns.leader"),
+			dataIndex: "isLeader",
+			render: (isLeader: boolean, row: MemberRow) => (
+				<Popconfirm
+					title={t("system:departments.memberColumns.leader")}
+					onConfirm={() => updateMemberMut.mutate({ id: row.deptId, userId: row.userId, body: { isLeader: !isLeader } })}
+				>
+					<Tag color={isLeader ? "blue" : undefined}>{isLeader ? t("system:departments.yes") : t("system:departments.no")}</Tag>
+				</Popconfirm>
+			),
+		},
+		{
+			title: t("system:departments.memberColumns.actions"),
+			key: "actions",
+			render: (_: unknown, row: MemberRow) => (
+				<Popconfirm
+					title={t("system:departments.confirmRemoveMember")}
+					onConfirm={() => removeMemberMut.mutate({ id: row.deptId, userId: row.userId })}
+				>
+					<Button size="small" type="link" danger>{t("system:departments.removeMember")}</Button>
+				</Popconfirm>
+			),
+		},
+	];
+
+	return (
+		<Space direction="vertical" style={{ width: "100%", paddingTop: 16 }}>
+			{/* 企微来源的组织架构：顶部常驻状态条 + 立即同步（没装企微的站点这里什么都不渲染） */}
+			<WecomSyncBar onFinished={() => queryClient.invalidateQueries({ queryKey: ["system"] })} />
+			<Space>
+				<Button
+					type="primary"
+					icon={<PlusOutlined />}
+					onClick={() => {
+						setEditing(null);
+						form.resetFields();
+						setEditOpen(true);
+					}}
+				>
+					{t("system:departments.create")}
+				</Button>
+				<Typography.Text type="secondary">{t("system:departments.createHint")}</Typography.Text>
+			</Space>
+
+			<Tree blockNode defaultExpandAll treeData={treeData} />
+
+			<Modal
+				title={editing ? t("system:departments.edit") : t("system:departments.create")}
+				open={editOpen}
+				onCancel={() => setEditOpen(false)}
+				confirmLoading={createMut.isPending || updateMut.isPending}
+				onOk={() => form.submit()}
+			>
+				<Form
+					form={form}
+					layout="vertical"
+					onFinish={(values) => {
+						const parentId = values.parentId ?? null;
+						if (!editing) {
+							createMut.mutate({ name: values.name, nameEn: values.nameEn ?? null, parentId, orderNo: values.orderNo });
+							return;
+						}
+						if (editing.origin === "local")
+							updateMut.mutate({ id: editing.id, body: { name: values.name, nameEn: values.nameEn ?? null, orderNo: values.orderNo } });
+						if (parentId !== editing.parentId)
+							moveMut.mutate({ id: editing.id, parentId });
+					}}
+				>
+					<Form.Item name="name" label={t("system:departments.columns.name")} rules={[{ required: true }]}>
+						<Input disabled={editing !== null && editing.origin !== "local"} />
+					</Form.Item>
+					<Form.Item name="nameEn" label={t("system:departments.columns.nameEn")}>
+						<Input disabled={editing !== null && editing.origin !== "local"} />
+					</Form.Item>
+					<Form.Item name="parentId" label={t("system:departments.columns.parent")}>
+						<TreeSelect allowClear treeData={parentOptions} placeholder={t("system:departments.root")} />
+					</Form.Item>
+				</Form>
+				{editing && editing.origin !== "local"
+					? (
+						<Space>
+							<Typography.Text type="secondary">{t("system:departments.readonlyHint")}</Typography.Text>
+							<Button size="small" type="link" onClick={() => detachMut.mutate(editing.id)}>
+								{t("system:departments.detach")}
+							</Button>
+						</Space>
+					)
+					: null}
+			</Modal>
+
+			<Modal
+				width={720}
+				title={`${t("system:departments.members")}：${memberDept?.name ?? ""}`}
+				open={memberDept !== null}
+				onCancel={() => setMemberDept(null)}
+				footer={null}
+			>
+				<Space style={{ marginBottom: 12 }}>
+					<Select
+						style={{ minWidth: 240 }}
+						placeholder={t("system:departments.selectUser")}
+						value={addUid ?? undefined}
+						onChange={v => setAddUid(v)}
+						options={(usersQuery.data ?? []).map(u => ({ label: u.display_name ? `${u.display_name}（${u.username}）` : u.username, value: u.id }))}
+					/>
+					<Button
+						type="primary"
+						disabled={addUid === null || !memberDept}
+						loading={addMemberMut.isPending}
+						onClick={() => memberDept && addUid !== null && addMemberMut.mutate({ id: memberDept.id, userId: addUid })}
+					>
+						{t("system:departments.addMember")}
+					</Button>
+				</Space>
+				<Table
+					rowKey="userId"
+					size="small"
+					loading={membersQuery.isLoading}
+					dataSource={membersQuery.data ?? []}
+					columns={memberColumns}
+					pagination={{ hideOnSinglePage: true }}
+					locale={{ emptyText: t("system:departments.noMembers") }}
+				/>
+			</Modal>
+		</Space>
+	);
+}