@gadmin2n/schematics 0.0.147 → 0.0.149

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/agenda/index.tsx

@@ -6,6 +6,7 @@ import {
   Button,
   Card,
   Col,
+  DatePicker,
   Input,
   Modal,
   Popconfirm,
@@ -19,6 +20,8 @@ import {
   Typography,
   message,
 } from 'antd';
+import type { Dayjs } from 'dayjs';
+import dayjs from 'dayjs';
 import {
   DatabaseOutlined,
   DeleteOutlined,
@@ -33,6 +36,7 @@ import { PageHeader } from 'components';
 import { PAGE_WRAPPER_STYLE, SEARCH_CARD_PROPS } from 'constants/layout';
 
 const { Text } = Typography;
+const { RangePicker } = DatePicker;
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -180,6 +184,14 @@ export default function AgendaJobsPage() {
   const page = Number(searchParams.get('page')) || 1;
   const PAGE_SIZE = 20;
 
+  // 时间过滤（按 lastRunAt）：默认最近 7 天，URL 无 from/to 时使用默认区间。
+  const [dateRange, setDateRange] = useState<[Dayjs, Dayjs] | null>(() => {
+    const from = searchParams.get('from');
+    const to = searchParams.get('to');
+    if (from && to) return [dayjs(from), dayjs(to)];
+    return [dayjs().subtract(7, 'day').startOf('day'), dayjs().endOf('day')];
+  });
+
   const updateParams = useCallback(
     (updates: Record<string, string | undefined>) => {
       setSearchParams(
@@ -217,6 +229,17 @@ export default function AgendaJobsPage() {
     (p: number) => updateParams({ page: p > 1 ? String(p) : undefined }),
     [updateParams],
   );
+  const setDateRangeAndSync = useCallback(
+    (range: [Dayjs, Dayjs] | null) => {
+      setDateRange(range);
+      updateParams({
+        from: range?.[0]?.toISOString(),
+        to: range?.[1]?.toISOString(),
+        page: undefined,
+      });
+    },
+    [updateParams],
+  );
 
   // Auto-refresh
   const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -232,6 +255,8 @@ export default function AgendaJobsPage() {
       if (filterToggle) params.toggle = filterToggle;
       if (filterName) params.q = filterName;
       if (filterModule) params.module = filterModule;
+      if (dateRange?.[0]) params.dateFrom = dateRange[0].toISOString();
+      if (dateRange?.[1]) params.dateTo = dateRange[1].toISOString();
 
       const [res, metrics] = await Promise.all([
         customRequest<JobsResponse>('agenda/jobs', 'GET', params),
@@ -247,7 +272,7 @@ export default function AgendaJobsPage() {
     } finally {
       setLoading(false);
     }
-  }, [page, filterState, filterToggle, filterName, filterModule]);
+  }, [page, filterState, filterToggle, filterName, filterModule, dateRange]);
 
   useEffect(() => {
     fetchJobs();
@@ -715,6 +740,21 @@ export default function AgendaJobsPage() {
             style={{ width: 160 }}
             options={modules.map((m) => ({ value: m, label: m }))}
           />
+          <RangePicker
+            prefix={
+              <span
+                style={{ color: 'var(--ant-color-text)', whiteSpace: 'nowrap' }}
+              >
+                最近执行
+              </span>
+            }
+            value={dateRange}
+            onChange={(range) =>
+              setDateRangeAndSync(range as [Dayjs, Dayjs] | null)
+            }
+            allowClear
+            style={{ width: 300 }}
+          />
           <Input
             placeholder="按名称过滤"
             allowClear

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/people-groups/PeopleGroupModal.tsx

@@ -0,0 +1,181 @@
+import { Form, Input, Modal, Select, Spin, message } from 'antd';
+import { useEffect, useState } from 'react';
+import {
+  createPeopleGroup,
+  fetchPeopleGroup,
+  fetchPeopleGroups,
+  fetchPersonOptions,
+  replacePeopleGroupMembers,
+  type PeopleGroupDetail,
+  type PeopleGroupSummary,
+  type PersonOption,
+  updatePeopleGroup,
+} from './people-groups.api';
+
+interface Props {
+  open: boolean;
+  group?: PeopleGroupSummary | null;
+  onCancel(): void;
+  onSaved(): void;
+}
+
+export function PeopleGroupModal({ open, group, onCancel, onSaved }: Props) {
+  const [form] = Form.useForm();
+  const [detail, setDetail] = useState<PeopleGroupDetail>();
+  const [people, setPeople] = useState<PersonOption[]>([]);
+  const [groups, setGroups] = useState<PeopleGroupSummary[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [peopleLoading, setPeopleLoading] = useState(false);
+  const [saving, setSaving] = useState(false);
+
+  useEffect(() => {
+    if (!open) return;
+    setLoading(true);
+    Promise.all([
+      fetchPeopleGroups('', false),
+      group ? fetchPeopleGroup(group.code) : Promise.resolve(undefined),
+    ])
+      .then(async ([groupOptions, nextDetail]) => {
+        const personOptions = await fetchPersonOptions(
+          '',
+          nextDetail?.directUserIds ?? [],
+        );
+        setPeople(personOptions);
+        setGroups(groupOptions.filter((item) => item.code !== group?.code));
+        setDetail(nextDetail);
+        form.setFieldsValue(
+          nextDetail
+            ? {
+                code: nextDetail.code,
+                name: nextDetail.name,
+                description: nextDetail.description ?? '',
+                userIds: nextDetail.directUserIds,
+                childGroupCodes: nextDetail.childGroupCodes,
+              }
+            : {
+                code: '',
+                name: '',
+                description: '',
+                userIds: [],
+                childGroupCodes: [],
+              },
+        );
+      })
+      .catch((error: any) => {
+        message.error(error?.message ?? '加载人员组失败');
+        onCancel();
+      })
+      .finally(() => setLoading(false));
+  }, [form, group, onCancel, open]);
+
+  async function searchPeople(query: string) {
+    setPeopleLoading(true);
+    try {
+      setPeople(
+        await fetchPersonOptions(query, form.getFieldValue('userIds') ?? []),
+      );
+    } catch (error: any) {
+      message.error(error?.message ?? '搜索人员失败');
+    } finally {
+      setPeopleLoading(false);
+    }
+  }
+
+  async function save() {
+    try {
+      const values = await form.validateFields();
+      setSaving(true);
+      if (!group) {
+        await createPeopleGroup({
+          ...(values.code.trim() && { code: values.code.trim() }),
+          name: values.name.trim(),
+          description: values.description.trim() || undefined,
+          userIds: values.userIds ?? [],
+          childGroupCodes: values.childGroupCodes ?? [],
+        });
+      } else if (detail) {
+        const metadata = await updatePeopleGroup(group.code, {
+          expectedRevision: detail.revision,
+          name: values.name.trim(),
+          description: values.description.trim() || null,
+        });
+        await replacePeopleGroupMembers(group.code, {
+          expectedRevision: metadata.revision,
+          userIds: values.userIds ?? [],
+          childGroupCodes: values.childGroupCodes ?? [],
+        });
+      }
+      message.success(group ? '人员组已更新' : '人员组已创建');
+      onSaved();
+    } catch (error: any) {
+      if (error?.errorFields) return;
+      message.error(error?.message ?? '保存人员组失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  return (
+    <Modal
+      open={open}
+      width={620}
+      title={group ? '编辑人员组' : '新建人员组'}
+      okText="保存"
+      cancelText="取消"
+      confirmLoading={saving}
+      onOk={save}
+      onCancel={onCancel}
+      destroyOnClose
+    >
+      <Spin spinning={loading}>
+        <Form form={form} layout="vertical" preserve={false}>
+          <Form.Item name="code" label="组标识">
+            <Input
+              disabled={!!group}
+              maxLength={21}
+              placeholder="可不填，由系统自动生成"
+            />
+          </Form.Item>
+          <Form.Item
+            name="name"
+            label="名称"
+            rules={[{ required: true, message: '请输入人员组名称' }]}
+          >
+            <Input maxLength={128} />
+          </Form.Item>
+          <Form.Item name="description" label="说明">
+            <Input.TextArea rows={3} maxLength={512} />
+          </Form.Item>
+          <Form.Item name="userIds" label="直接成员">
+            <Select
+              mode="multiple"
+              showSearch
+              filterOption={false}
+              loading={peopleLoading}
+              onSearch={searchPeople}
+              placeholder="选择人员"
+              options={people.map((person) => ({
+                value: person.userid,
+                label: person.username
+                  ? `${person.username} (${person.userid})`
+                  : person.userid,
+              }))}
+            />
+          </Form.Item>
+          <Form.Item name="childGroupCodes" label="包含人员组">
+            <Select
+              mode="multiple"
+              showSearch
+              optionFilterProp="label"
+              placeholder="可组合已有人员组"
+              options={groups.map((item) => ({
+                value: item.code,
+                label: `${item.name} (${item.code})`,
+              }))}
+            />
+          </Form.Item>
+        </Form>
+      </Spin>
+    </Modal>
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/people-groups/index.tsx

@@ -0,0 +1,203 @@
+import {
+  DeleteOutlined,
+  EditOutlined,
+  PlusOutlined,
+  ReloadOutlined,
+} from '@ant-design/icons';
+import {
+  Button,
+  Card,
+  Input,
+  Popconfirm,
+  Space,
+  Switch,
+  Table,
+  Tag,
+  Tooltip,
+  Typography,
+  message,
+  type TableColumnsType,
+} from 'antd';
+import { PageHeader } from 'components';
+import { PAGE_WRAPPER_STYLE, SEARCH_CARD_PROPS } from 'constants/layout';
+import { useCallback, useEffect, useState } from 'react';
+import { PeopleGroupModal } from './PeopleGroupModal';
+import {
+  deletePeopleGroup,
+  fetchPeopleGroup,
+  fetchPeopleGroups,
+  type PeopleGroupSummary,
+  setPeopleGroupActive,
+} from './people-groups.api';
+
+export default function PeopleGroupsPage() {
+  const [groups, setGroups] = useState<PeopleGroupSummary[]>([]);
+  const [query, setQuery] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [deletingCode, setDeletingCode] = useState<string>();
+  const [editing, setEditing] = useState<
+    PeopleGroupSummary | null | undefined
+  >();
+
+  const load = useCallback(async () => {
+    setLoading(true);
+    try {
+      setGroups(await fetchPeopleGroups(query, true));
+    } catch (error: any) {
+      message.error(error?.message ?? '加载人员组失败');
+    } finally {
+      setLoading(false);
+    }
+  }, [query]);
+
+  useEffect(() => void load(), [load]);
+
+  async function toggle(group: PeopleGroupSummary, isActive: boolean) {
+    try {
+      const latest = await fetchPeopleGroup(group.code);
+      await setPeopleGroupActive(group.code, {
+        expectedRevision: latest.revision,
+        isActive,
+      });
+      message.success(isActive ? '人员组已启用' : '人员组已停用');
+      await load();
+    } catch (error: any) {
+      message.error(error?.message ?? '更新人员组状态失败');
+    }
+  }
+
+  async function remove(group: PeopleGroupSummary) {
+    setDeletingCode(group.code);
+    try {
+      await deletePeopleGroup(group.code, group.revision);
+      message.success('人员组已删除');
+      await load();
+    } catch (error: any) {
+      message.error(error?.message ?? '删除人员组失败');
+    } finally {
+      setDeletingCode(undefined);
+    }
+  }
+
+  const columns: TableColumnsType<PeopleGroupSummary> = [
+    {
+      title: '人员组',
+      key: 'group',
+      render: (_, group) => (
+        <div>
+          <Typography.Text strong>{group.name}</Typography.Text>
+          <br />
+          <Typography.Text type="secondary">{group.code}</Typography.Text>
+        </div>
+      ),
+    },
+    {
+      title: '说明',
+      dataIndex: 'description',
+      render: (value?: string | null) => value || '—',
+    },
+    {
+      title: '状态',
+      dataIndex: 'isActive',
+      width: 100,
+      render: (value: boolean) => (
+        <Tag color={value ? 'green' : 'default'}>
+          {value ? '已启用' : '已停用'}
+        </Tag>
+      ),
+    },
+    {
+      title: '操作',
+      width: 150,
+      render: (_, group) => (
+        <Space>
+          <Tooltip title="编辑">
+            <Button
+              size="small"
+              icon={<EditOutlined />}
+              aria-label={`编辑 ${group.name}`}
+              onClick={() => setEditing(group)}
+            />
+          </Tooltip>
+          <Popconfirm
+            title={group.isActive ? '停用这个人员组？' : '启用这个人员组？'}
+            onConfirm={() => toggle(group, !group.isActive)}
+          >
+            <Switch
+              size="small"
+              checked={group.isActive}
+              aria-label={`${group.isActive ? '停用' : '启用'} ${group.name}`}
+            />
+          </Popconfirm>
+          <Popconfirm
+            title="删除该人员组？"
+            description="被其他人员组、Workflow 或进行中审批引用时不能删除。"
+            okText="删除"
+            cancelText="取消"
+            okButtonProps={{ danger: true }}
+            onConfirm={() => remove(group)}
+          >
+            <Tooltip title="删除">
+              <Button
+                danger
+                size="small"
+                icon={<DeleteOutlined />}
+                loading={deletingCode === group.code}
+                aria-label={`删除 ${group.name}`}
+              />
+            </Tooltip>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <div style={PAGE_WRAPPER_STYLE}>
+      <PageHeader
+        title="人员组"
+        subtitle="将人员或已有人员组组合为可复用的审批对象。"
+        extra={
+          <Space>
+            <Button icon={<ReloadOutlined />} onClick={load} />
+            <Button
+              type="primary"
+              icon={<PlusOutlined />}
+              onClick={() => setEditing(null)}
+            >
+              新建人员组
+            </Button>
+          </Space>
+        }
+      />
+      <Card {...SEARCH_CARD_PROPS}>
+        <Input.Search
+          allowClear
+          placeholder="搜索名称或组标识"
+          style={{ width: 280 }}
+          onSearch={setQuery}
+        />
+      </Card>
+      <Card className="card-table">
+        <Table
+          rowKey="code"
+          loading={loading}
+          dataSource={groups}
+          columns={columns}
+          pagination={{ pageSize: 20, showSizeChanger: false }}
+        />
+      </Card>
+      {editing !== undefined && (
+        <PeopleGroupModal
+          open
+          group={editing}
+          onCancel={() => setEditing(undefined)}
+          onSaved={() => {
+            setEditing(undefined);
+            void load();
+          }}
+        />
+      )}
+    </div>
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/people-groups/people-groups.api.ts

@@ -0,0 +1,145 @@
+import { customRequest } from 'helpers/http';
+
+export interface PeopleGroupSummary {
+  code: string;
+  name: string;
+  description: string | null;
+  revision: number;
+  isActive: boolean;
+  updatedAt: string;
+}
+
+export interface PeopleGroupDetail {
+  code: string;
+  name: string;
+  description: string | null;
+  revision: number;
+  isActive: boolean;
+  directUserIds: string[];
+  childGroupCodes: string[];
+  resolvedUserCount: number;
+}
+
+export interface PersonOption {
+  userid: string;
+  username: string | null;
+}
+
+export function fetchPeopleGroups(query = '', includeInactive = true) {
+  return customRequest<PeopleGroupSummary[]>('user-groups', 'GET', {
+    q: query,
+    includeInactive,
+  });
+}
+
+export async function fetchPersonOptions(
+  query = '',
+  selectedIds: string[] = [],
+) {
+  const text = query.trim();
+  const requests = [
+    customRequest<{ data: PersonOption[] }>('user/findMany', 'POST', {
+      where: {
+        isActive: true,
+        isApiKey: false,
+        ...(text && {
+          OR: [
+            { userid: { contains: text, mode: 'insensitive' } },
+            { username: { contains: text, mode: 'insensitive' } },
+          ],
+        }),
+      },
+      select: { userid: true, username: true },
+      orderBy: { userid: 'asc' },
+      take: 50,
+    }),
+  ];
+  if (selectedIds.length > 0) {
+    requests.push(
+      customRequest<{ data: PersonOption[] }>('user/findMany', 'POST', {
+        where: {
+          userid: { in: selectedIds },
+          isActive: true,
+          isApiKey: false,
+        },
+        select: { userid: true, username: true },
+        take: selectedIds.length,
+      }),
+    );
+  }
+  const results = await Promise.all(requests);
+  return [
+    ...new Map(
+      results
+        .flatMap((result) => result.data)
+        .map((person) => [person.userid, person]),
+    ).values(),
+  ];
+}
+
+export function fetchPeopleGroup(code: string) {
+  return customRequest<PeopleGroupDetail>(
+    `user-groups/${encodeURIComponent(code)}/preview`,
+    'GET',
+  );
+}
+
+export function createPeopleGroup(input: {
+  code?: string;
+  name: string;
+  description?: string;
+  userIds: string[];
+  childGroupCodes: string[];
+}) {
+  return customRequest<PeopleGroupSummary>('user-groups', 'POST', input);
+}
+
+export function updatePeopleGroup(
+  code: string,
+  input: {
+    expectedRevision: number;
+    name: string;
+    description: string | null;
+  },
+) {
+  return customRequest<PeopleGroupSummary>(
+    `user-groups/${encodeURIComponent(code)}`,
+    'PATCH',
+    input,
+  );
+}
+
+export function replacePeopleGroupMembers(
+  code: string,
+  input: {
+    expectedRevision: number;
+    userIds: string[];
+    childGroupCodes: string[];
+  },
+) {
+  return customRequest<PeopleGroupSummary>(
+    `user-groups/${encodeURIComponent(code)}/members`,
+    'PUT',
+    input,
+  );
+}
+
+export function setPeopleGroupActive(
+  code: string,
+  input: { expectedRevision: number; isActive: boolean },
+) {
+  return customRequest<PeopleGroupSummary>(
+    `user-groups/${encodeURIComponent(code)}/active`,
+    'PATCH',
+    input,
+  );
+}
+
+export function deletePeopleGroup(code: string, expectedRevision: number) {
+  return customRequest<{ count: number }>(
+    `user-groups/${encodeURIComponent(
+      code,
+    )}?expectedRevision=${expectedRevision}`,
+    'DELETE',
+  );
+}