feat: DingTalk attendance import + integration config + expense types + UI polish
Server: - Add DingTalk attendance import service with SSE progress streaming - Add IntegrationConfig entity & module for multi-tenant DingTalk setup - Add ExpenseType entity & ExpenseTypesModule - Add SeedModule for DB initialization - Add UserDingMapping entity for DingTalk user linkage - Attendance service: import flow with dedup & student auto-mapping - Rooms service: time-range overlap queries - Sync controller/service: DingTalk integration wiring - Permission guard: refactor to pure re-export - Campus scope middleware: tenant-aware filtering Admin UI: - Attendance page: import UI with progress & result summary - All pages: tableStyle/tablePagination standardization - Login page: responsive styling - Sensitive data: useViewSensitive hook for masked viewing - Vite config: path aliases, build optimization - Test infra: vitest config, test utilities Docs: PRD DingTalk batch 1 & 2 design docs
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import React, { useEffect, useState, useMemo, useCallback } from 'react';
|
||||
import {
|
||||
Table,
|
||||
Modal,
|
||||
@@ -11,7 +11,7 @@ import {
|
||||
Popconfirm,
|
||||
message,
|
||||
} from 'antd';
|
||||
import { PlusOutlined, EditOutlined, DeleteOutlined, KeyOutlined, IdcardOutlined } from '@ant-design/icons';
|
||||
import { PlusOutlined, EditOutlined, DeleteOutlined, KeyOutlined, IdcardOutlined, CloudDownloadOutlined } from '@ant-design/icons';
|
||||
import dayjs from 'dayjs';
|
||||
import api from '../../api';
|
||||
import PermissionButton from '../../components/PermissionButton';
|
||||
@@ -29,6 +29,8 @@ const UsersPage: React.FC = () => {
|
||||
const [profileForm] = Form.useForm();
|
||||
const [form] = Form.useForm();
|
||||
const [pwdForm] = Form.useForm();
|
||||
const [syncing, setSyncing] = useState(false);
|
||||
const [saving, setSaving] = useState(false);
|
||||
|
||||
const handleOpenProfile = async (record: any) => {
|
||||
setProfileUser(record);
|
||||
@@ -42,14 +44,21 @@ const UsersPage: React.FC = () => {
|
||||
};
|
||||
|
||||
const handleProfileSubmit = async () => {
|
||||
setSaving(true);
|
||||
const values = await profileForm.validateFields();
|
||||
await api.put(`/rbac/users/${profileUser.id}/profile`, values);
|
||||
message.success('档案更新成功');
|
||||
setProfileModalOpen(false);
|
||||
fetchData();
|
||||
try {
|
||||
await api.put(`/rbac/users/${profileUser.id}/profile`, values);
|
||||
message.success('档案更新成功');
|
||||
setProfileModalOpen(false);
|
||||
fetchData();
|
||||
} catch (e: any) {
|
||||
message.error(e.message || '操作失败');
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchData = async () => {
|
||||
const fetchData = useCallback(async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const [users, rolesRes] = await Promise.all([
|
||||
@@ -62,11 +71,25 @@ const UsersPage: React.FC = () => {
|
||||
console.error(e);
|
||||
}
|
||||
setLoading(false);
|
||||
}, []);
|
||||
|
||||
const handleSyncDingTalk = async () => {
|
||||
setSyncing(true);
|
||||
try {
|
||||
const res: any = await api.post('/sync/trigger?platform=dingtalk');
|
||||
const log = res.logs?.[0];
|
||||
message.success(`同步完成:${log?.recordsCount || 0} 条记录`);
|
||||
fetchData();
|
||||
} catch (e: any) {
|
||||
message.error(e?.message || '同步失败');
|
||||
} finally {
|
||||
setSyncing(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
fetchData();
|
||||
}, []);
|
||||
}, [fetchData]);
|
||||
|
||||
const handleAdd = () => {
|
||||
setEditing(null);
|
||||
@@ -86,6 +109,7 @@ const UsersPage: React.FC = () => {
|
||||
};
|
||||
|
||||
const handleSubmit = async () => {
|
||||
setSaving(true);
|
||||
const values = await form.validateFields();
|
||||
try {
|
||||
if (editing) {
|
||||
@@ -109,6 +133,8 @@ const UsersPage: React.FC = () => {
|
||||
fetchData();
|
||||
} catch (e: any) {
|
||||
message.error(e.message || '操作失败');
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -129,6 +155,7 @@ const UsersPage: React.FC = () => {
|
||||
};
|
||||
|
||||
const handlePwdSubmit = async () => {
|
||||
setSaving(true);
|
||||
const values = await pwdForm.validateFields();
|
||||
try {
|
||||
await api.put(`/rbac/users/${resetTarget.id}/password`, { password: values.password });
|
||||
@@ -136,10 +163,12 @@ const UsersPage: React.FC = () => {
|
||||
setPwdModalOpen(false);
|
||||
} catch (e: any) {
|
||||
message.error(e.message || '操作失败');
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
const columns = [
|
||||
const columns = useMemo(() => [
|
||||
{ title: 'ID', dataIndex: 'id', width: 60 },
|
||||
{ title: '用户名', dataIndex: 'username', width: 120 },
|
||||
{ title: '姓名', dataIndex: 'name', width: 120 },
|
||||
@@ -219,7 +248,7 @@ const UsersPage: React.FC = () => {
|
||||
</Space>
|
||||
),
|
||||
},
|
||||
];
|
||||
], []);
|
||||
|
||||
return (
|
||||
<div>
|
||||
@@ -242,6 +271,14 @@ const UsersPage: React.FC = () => {
|
||||
>
|
||||
新增账号
|
||||
</PermissionButton>
|
||||
<PermissionButton
|
||||
permission="sync:trigger"
|
||||
icon={<CloudDownloadOutlined />}
|
||||
loading={syncing}
|
||||
onClick={handleSyncDingTalk}
|
||||
>
|
||||
同步钉钉用户
|
||||
</PermissionButton>
|
||||
</div>
|
||||
<Table
|
||||
columns={columns}
|
||||
@@ -258,6 +295,7 @@ const UsersPage: React.FC = () => {
|
||||
onOk={handleSubmit}
|
||||
onCancel={() => setModalOpen(false)}
|
||||
destroyOnHidden
|
||||
confirmLoading={saving}
|
||||
>
|
||||
<Form form={form} layout="vertical">
|
||||
<Form.Item
|
||||
@@ -309,6 +347,7 @@ const UsersPage: React.FC = () => {
|
||||
onOk={handlePwdSubmit}
|
||||
onCancel={() => setPwdModalOpen(false)}
|
||||
destroyOnHidden
|
||||
confirmLoading={saving}
|
||||
>
|
||||
<Form form={pwdForm} layout="vertical">
|
||||
<Form.Item
|
||||
@@ -327,6 +366,7 @@ const UsersPage: React.FC = () => {
|
||||
onOk={handleProfileSubmit}
|
||||
onCancel={() => setProfileModalOpen(false)}
|
||||
destroyOnHidden
|
||||
confirmLoading={saving}
|
||||
>
|
||||
<Form form={profileForm} layout="vertical">
|
||||
<Form.Item name="joinedAt" label="入职日期">
|
||||
|
||||
Reference in New Issue
Block a user