@gadmin2n/schematics 0.0.147 → 0.0.149

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/person-directory/PersonModal.tsx

@@ -0,0 +1,112 @@
+import { Form, Input, Modal, Switch, message } from 'antd';
+import { StaffSelect } from 'components';
+import { useEffect, useState } from 'react';
+import {
+  createPerson,
+  type PersonRecord,
+  updatePerson,
+} from './person-directory.api';
+
+interface Props {
+  open: boolean;
+  person?: PersonRecord | null;
+  onCancel(): void;
+  onSaved(): void;
+}
+
+export function PersonModal({ open, person, onCancel, onSaved }: Props) {
+  const [form] = Form.useForm();
+  const [saving, setSaving] = useState(false);
+
+  useEffect(() => {
+    if (!open) return;
+    form.resetFields();
+    form.setFieldsValue(
+      person
+        ? {
+            userid: person.userid,
+            username: person.username ?? '',
+            description: person.description ?? '',
+            isActive: person.isActive,
+          }
+        : {
+            userid: undefined,
+            username: '',
+            description: '',
+            isActive: true,
+          },
+    );
+  }, [form, open, person]);
+
+  async function save() {
+    try {
+      const values = await form.validateFields();
+      setSaving(true);
+      if (person) {
+        await updatePerson(person.id, {
+          username: values.username.trim() || undefined,
+          description: values.description.trim() || null,
+          isActive: values.isActive,
+        });
+      } else {
+        await createPerson({
+          userid: values.userid.trim(),
+          username: values.username.trim() || values.userid.trim(),
+          description: values.description.trim() || undefined,
+          isActive: values.isActive,
+        });
+      }
+      message.success(person ? '人员信息已更新' : '人员已添加');
+      onSaved();
+    } catch (error: any) {
+      if (error?.errorFields) return;
+      message.error(error?.message ?? '保存人员失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  return (
+    <Modal
+      open={open}
+      title={person ? '编辑人员' : '添加人员'}
+      okText="保存"
+      cancelText="取消"
+      confirmLoading={saving}
+      onOk={save}
+      onCancel={onCancel}
+      destroyOnClose
+    >
+      <Form form={form} layout="vertical" preserve={false}>
+        {person ? (
+          <Form.Item name="userid" label="账号">
+            <Input disabled />
+          </Form.Item>
+        ) : (
+          <Form.Item
+            name="userid"
+            label="人员"
+            rules={[{ required: true, message: '请选择人员' }]}
+          >
+            <StaffSelect />
+          </Form.Item>
+        )}
+        {person ? (
+          <Form.Item name="username" label="姓名">
+            <Input maxLength={128} placeholder="未填写时默认使用账号" />
+          </Form.Item>
+        ) : (
+          <Form.Item name="username" hidden>
+            <Input />
+          </Form.Item>
+        )}
+        <Form.Item name="description" label="备注">
+          <Input.TextArea rows={3} maxLength={512} />
+        </Form.Item>
+        <Form.Item name="isActive" label="启用" valuePropName="checked">
+          <Switch />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+}

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

@@ -0,0 +1,214 @@
+import {
+  DeleteOutlined,
+  EditOutlined,
+  PlusOutlined,
+  ReloadOutlined,
+} from '@ant-design/icons';
+import {
+  Button,
+  Card,
+  Input,
+  Popconfirm,
+  Select,
+  Space,
+  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 { PersonModal } from './PersonModal';
+import {
+  deletePerson,
+  fetchPeople,
+  type PersonRecord,
+} from './person-directory.api';
+
+const PAGE_SIZE = 20;
+
+export default function PersonDirectoryPage() {
+  const [people, setPeople] = useState<PersonRecord[]>([]);
+  const [total, setTotal] = useState(0);
+  const [page, setPage] = useState(1);
+  const [query, setQuery] = useState('');
+  const [active, setActive] = useState<boolean>();
+  const [loading, setLoading] = useState(false);
+  const [deletingId, setDeletingId] = useState<number>();
+  const [editing, setEditing] = useState<PersonRecord | null | undefined>();
+
+  const load = useCallback(async () => {
+    setLoading(true);
+    try {
+      const result = await fetchPeople({
+        query,
+        active,
+        page,
+        pageSize: PAGE_SIZE,
+      });
+      setPeople(result.data);
+      setTotal(result.meta.itemCount);
+    } catch (error: any) {
+      message.error(error?.message ?? '加载人员失败');
+    } finally {
+      setLoading(false);
+    }
+  }, [active, page, query]);
+
+  useEffect(() => void load(), [load]);
+
+  async function remove(person: PersonRecord) {
+    setDeletingId(person.id);
+    try {
+      await deletePerson(person.id);
+      message.success('人员已删除');
+      if (people.length === 1 && page > 1) setPage(page - 1);
+      else await load();
+    } catch (error: any) {
+      message.error(error?.message ?? '删除人员失败');
+    } finally {
+      setDeletingId(undefined);
+    }
+  }
+
+  const columns: TableColumnsType<PersonRecord> = [
+    {
+      title: '人员',
+      key: 'person',
+      render: (_, person) => (
+        <div>
+          <Typography.Text strong>
+            {person.username || person.userid}
+          </Typography.Text>
+          <br />
+          <Typography.Text type="secondary">{person.userid}</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: 110,
+      render: (_, person) => (
+        <Space size={4}>
+          <Tooltip title="编辑">
+            <Button
+              size="small"
+              icon={<EditOutlined />}
+              aria-label={`编辑 ${person.username || person.userid}`}
+              onClick={() => setEditing(person)}
+            />
+          </Tooltip>
+          <Popconfirm
+            title="删除该人员？"
+            description="只有未授予角色且未被人员组或 Workflow 引用的人员才能删除。"
+            okText="删除"
+            cancelText="取消"
+            okButtonProps={{ danger: true }}
+            onConfirm={() => remove(person)}
+          >
+            <Tooltip title="删除">
+              <Button
+                danger
+                size="small"
+                icon={<DeleteOutlined />}
+                loading={deletingId === person.id}
+                aria-label={`删除 ${person.username || person.userid}`}
+              />
+            </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}>
+        <Space wrap>
+          <Input.Search
+            allowClear
+            placeholder="搜索姓名或账号"
+            style={{ width: 260 }}
+            onSearch={(value) => {
+              setPage(1);
+              setQuery(value);
+            }}
+          />
+          <Select
+            allowClear
+            placeholder="全部状态"
+            style={{ width: 140 }}
+            options={[
+              { label: '已启用', value: true },
+              { label: '已停用', value: false },
+            ]}
+            onChange={(value) => {
+              setPage(1);
+              setActive(value);
+            }}
+          />
+        </Space>
+      </Card>
+      <Card className="card-table">
+        <Table
+          rowKey="id"
+          loading={loading}
+          dataSource={people}
+          columns={columns}
+          pagination={{
+            current: page,
+            pageSize: PAGE_SIZE,
+            total,
+            showTotal: (count) => `共 ${count} 人`,
+            onChange: setPage,
+          }}
+        />
+      </Card>
+      {editing !== undefined && (
+        <PersonModal
+          open
+          person={editing}
+          onCancel={() => setEditing(undefined)}
+          onSaved={() => {
+            setEditing(undefined);
+            void load();
+          }}
+        />
+      )}
+    </div>
+  );
+}

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

@@ -0,0 +1,79 @@
+import { customRequest } from 'helpers/http';
+
+export interface PersonRecord {
+  id: number;
+  userid: string;
+  username: string | null;
+  description: string | null;
+  isActive: boolean;
+  createdAt: string;
+  updatedAt: string;
+}
+
+interface PersonPage {
+  data: PersonRecord[];
+  meta: { itemCount: number };
+}
+
+const personSelect = {
+  id: true,
+  userid: true,
+  username: true,
+  description: true,
+  isActive: true,
+  createdAt: true,
+  updatedAt: true,
+};
+
+export async function fetchPeople(input: {
+  query: string;
+  active?: boolean;
+  page: number;
+  pageSize: number;
+}) {
+  const query = input.query.trim();
+  return customRequest<PersonPage>('user/findMany', 'POST', {
+    where: {
+      isApiKey: false,
+      ...(input.active !== undefined && { isActive: input.active }),
+      ...(query && {
+        OR: [
+          { userid: { contains: query, mode: 'insensitive' } },
+          { username: { contains: query, mode: 'insensitive' } },
+        ],
+      }),
+    },
+    select: personSelect,
+    orderBy: { userid: 'asc' },
+    skip: (input.page - 1) * input.pageSize,
+    take: input.pageSize,
+  });
+}
+
+export function createPerson(input: {
+  userid: string;
+  username?: string;
+  description?: string;
+  isActive: boolean;
+}) {
+  return customRequest<PersonRecord>('user/createOne', 'POST', {
+    ...input,
+    roles: '[]',
+    isApiKey: false,
+  });
+}
+
+export function updatePerson(
+  id: number,
+  input: {
+    username?: string;
+    description?: string | null;
+    isActive: boolean;
+  },
+) {
+  return customRequest<PersonRecord>(`user/updateUnique/${id}`, 'PATCH', input);
+}
+
+export function deletePerson(id: number) {
+  return customRequest<{ count: number }>(`user/deletePerson/${id}`, 'DELETE');
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/user/components/form-modal.tsx

@@ -98,16 +98,16 @@ export const UserFormModal: React.FC<Props> = ({
         //TODO: modalProps.onCancel expect an event so, I used close. Actually both of them are same.
         close();
       }}
-      title={action === 'create' ? 'Create User' : 'Edit User'}
+      title={action === 'create' ? '新增访问主体' : '编辑访问授权'}
     >
       <Form {...formProps} layout="vertical">
         <Form.Item
           rules={[{ required: true }]}
           name="userid"
-          label="User ID(WecomId 或者 太湖帐号名)"
+          label="账号（企业微信 ID 或太湖账号）"
         >
           <Input
-            placeholder="Please enter user ID"
+            placeholder="请输入账号"
             onChange={(e) => {
               if (action === 'create' && !usernameTouched) {
                 form.setFieldsValue({ username: e.target.value });
@@ -116,23 +116,19 @@ export const UserFormModal: React.FC<Props> = ({
           />
         </Form.Item>
 
-        <Form.Item
-          rules={[{ required: true }]}
-          name="username"
-          label="Username(一般设置为和上面的 User ID 一样)"
-        >
+        <Form.Item rules={[{ required: true }]} name="username" label="名称">
           <Input
-            placeholder="Please enter username"
+            placeholder="请输入名称"
             onChange={() => {
               if (!usernameTouched) setUsernameTouched(true);
             }}
           />
         </Form.Item>
 
-        <Form.Item rules={[{ required: true }]} name="roles" label="Roles">
+        <Form.Item rules={[{ required: true }]} name="roles" label="角色">
           <Select
             mode="multiple"
-            placeholder="Please select roles"
+            placeholder="请选择角色"
             options={roleOptions}
             loading={rolesLoading}
           />

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

@@ -137,7 +137,7 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
               icon={<PlusOutlined />}
               onClick={() => setShowModal({ type: 'create', id: null })}
             >
-              Add User
+              新增访问主体
             </Button>
           );
         }}
@@ -155,7 +155,7 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
           >
             <Table.Column
               dataIndex="userid"
-              title="User ID"
+              title="账号"
               render={(_, record) => {
                 return (
                   <Space>
@@ -173,7 +173,7 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
             />
             <Table.Column
               dataIndex="username"
-              title="User Name"
+              title="名称"
               filterDropdown={(props) => (
                 <FilterDropdown
                   {...props}
@@ -194,7 +194,7 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
             />
             <Table.Column
               dataIndex="roles"
-              title="Roles"
+              title="角色"
               defaultFilteredValue={getDefaultFilter(
                 'roles',
                 filters,
@@ -224,7 +224,7 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
             />
             <Table.Column
               dataIndex="isApiKey"
-              title="API Key"
+              title="API Key 主体"
               defaultFilteredValue={getDefaultFilter('isApiKey', filters, 'eq')}
               filterDropdown={(props) => (
                 <FilterDropdown
@@ -258,7 +258,7 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
             />
             <Table.Column
               dataIndex="isActive"
-              title="Active"
+              title="状态"
               defaultFilteredValue={getDefaultFilter('isActive', filters, 'eq')}
               filterDropdown={(props) => (
                 <FilterDropdown
@@ -292,7 +292,7 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
             />
             <Table.Column
               fixed="right"
-              title="Actions"
+              title="操作"
               dataIndex="actions"
               render={(_, record) => {
                 return (

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/business-events/RegisterBusinessEventModal.test.tsx

@@ -60,9 +60,9 @@ describe('RegisterBusinessEventModal', () => {
     const sourceOptions = await screen.findAllByText('public.t_hardware_asset');
     fireEvent.click(sourceOptions[sourceOptions.length - 1]);
     await waitFor(() =>
-      expect(screen.getByLabelText('监听字段')).not.toBeDisabled(),
+      expect(screen.getByLabelText('修改时监听字段')).not.toBeDisabled(),
     );
-    fireEvent.mouseDown(screen.getByLabelText('监听字段'));
+    fireEvent.mouseDown(screen.getByLabelText('修改时监听字段'));
     const fieldOptions = await screen.findAllByText(/status/);
     fireEvent.click(fieldOptions[fieldOptions.length - 1]);
     fireEvent.click(screen.getByRole('button', { name: '完成登记' }));
@@ -71,7 +71,7 @@ describe('RegisterBusinessEventModal', () => {
       expect(apiMocks.register).toHaveBeenCalledWith({
         schemaName: 'public',
         tableName: 't_hardware_asset',
-        operation: 'UPDATE',
+        operations: ['UPDATE'],
         watchedFields: ['status'],
       }),
     );
@@ -95,7 +95,16 @@ describe('RegisterBusinessEventModal', () => {
     const insertOptions = await screen.findAllByText('INSERT');
     fireEvent.click(insertOptions[insertOptions.length - 1]);
 
-    expect(screen.queryByLabelText('监听字段')).not.toBeInTheDocument();
+    // The operation picker is multi-select: remove UPDATE for an INSERT-only registration.
+    fireEvent.click(
+      screen
+        .getAllByTitle('UPDATE')
+        .find((element) =>
+          element.classList.contains('ant-select-selection-item'),
+        )!
+        .querySelector('.ant-select-selection-item-remove')!,
+    );
+    expect(screen.queryByLabelText('修改时监听字段')).not.toBeInTheDocument();
     expect(screen.getByText(/任意一行插入或删除时触发/)).toBeInTheDocument();
     fireEvent.click(screen.getByRole('button', { name: '完成登记' }));
 
@@ -103,9 +112,41 @@ describe('RegisterBusinessEventModal', () => {
       expect(apiMocks.register).toHaveBeenCalledWith({
         schemaName: 'public',
         tableName: 't_hardware_asset',
-        operation: 'INSERT',
+        operations: ['INSERT'],
         watchedFields: [],
       }),
     );
   });
+
+  it('registers INSERT and UPDATE together and still requires update fields', async () => {
+    await i18n.changeLanguage('zh_CN');
+    render(
+      <RegisterBusinessEventModal
+        open
+        onCancel={vi.fn()}
+        onRegistered={vi.fn()}
+      />,
+    );
+    fireEvent.mouseDown(await screen.findByLabelText('数据库表'));
+    const sourceOptions = await screen.findAllByText('public.t_hardware_asset');
+    fireEvent.click(sourceOptions[sourceOptions.length - 1]);
+    fireEvent.mouseDown(screen.getByLabelText('数据操作'));
+    const insertOptions = await screen.findAllByText('INSERT');
+    fireEvent.click(insertOptions[insertOptions.length - 1]);
+    fireEvent.click(screen.getByRole('button', { name: '完成登记' }));
+    await screen.findByRole('button', { name: '完成登记' });
+    expect(apiMocks.register).not.toHaveBeenCalled();
+    fireEvent.mouseDown(screen.getByLabelText('修改时监听字段'));
+    const options = await screen.findAllByText(/status/);
+    fireEvent.click(options[options.length - 1]);
+    fireEvent.click(await screen.findByRole('button', { name: '完成登记' }));
+    await waitFor(() =>
+      expect(apiMocks.register).toHaveBeenCalledWith({
+        schemaName: 'public',
+        tableName: 't_hardware_asset',
+        operations: ['UPDATE', 'INSERT'],
+        watchedFields: ['status'],
+      }),
+    );
+  });
 });

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/business-events/RegisterBusinessEventModal.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
 import {
   eventCatalogApi,
   type BusinessEventSource,
+  type BusinessEventOperation,
 } from '../node-instances/widgets/event-catalog.api';
 import { useWorkflowFormValidation } from '../useWorkflowFormValidation';
 
@@ -15,7 +16,7 @@ interface RegisterBusinessEventModalProps {
 
 interface RegisterBusinessEventFormValues {
   source: string;
-  operation: 'INSERT' | 'UPDATE' | 'DELETE';
+  operations: BusinessEventOperation[];
   watchedFields: string[];
 }
 
@@ -31,7 +32,7 @@ export function RegisterBusinessEventModal({
   const [loadingSources, setLoadingSources] = useState(false);
   const [submitting, setSubmitting] = useState(false);
   const sourceKey = Form.useWatch('source', form);
-  const operation = Form.useWatch('operation', form);
+  const operations = Form.useWatch('operations', form) ?? [];
   const selectedSource = useMemo(
     () =>
       sources.find(
@@ -65,9 +66,10 @@ export function RegisterBusinessEventModal({
       await eventCatalogApi.register({
         schemaName: source.schemaName,
         tableName: source.tableName,
-        operation: values.operation,
-        watchedFields:
-          values.operation === 'UPDATE' ? values.watchedFields : [],
+        operations: values.operations,
+        watchedFields: values.operations.includes('UPDATE')
+          ? values.watchedFields
+          : [],
       });
       message.success(t('eventCatalog.registration.success'));
       form.resetFields();
@@ -103,7 +105,7 @@ export function RegisterBusinessEventModal({
           form={form}
           layout="vertical"
           requiredMark={false}
-          initialValues={{ operation: 'UPDATE', watchedFields: [] }}
+          initialValues={{ operations: ['UPDATE'], watchedFields: [] }}
           {...formValidation}
         >
           <Form.Item
@@ -123,21 +125,23 @@ export function RegisterBusinessEventModal({
             />
           </Form.Item>
           <Form.Item
-            name="operation"
+            name="operations"
             label={t('eventCatalog.registration.operation')}
-            rules={[{ required: true }]}
+            rules={[{ required: true, type: 'array', min: 1 }]}
           >
             <Select
+              mode="multiple"
               options={['INSERT', 'UPDATE', 'DELETE'].map((operation) => ({
                 value: operation,
                 label: operation,
               }))}
               onChange={(value) => {
-                if (value !== 'UPDATE') form.setFieldValue('watchedFields', []);
+                if (!value.includes('UPDATE'))
+                  form.setFieldValue('watchedFields', []);
               }}
             />
           </Form.Item>
-          {operation === 'UPDATE' ? (
+          {operations.includes('UPDATE') ? (
             <Form.Item
               name="watchedFields"
               label={t('eventCatalog.registration.watchedFields')}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/business-events/detail.test.tsx

@@ -33,7 +33,7 @@ describe('BusinessEventDetailPage', () => {
         label: 'public.t_hardware_asset · UPDATE',
         schemaName: 'public',
         tableName: 't_hardware_asset',
-        operation: 'UPDATE',
+        operations: ['UPDATE'],
         watchedFields: ['status'],
         primaryKeyFields: ['id'],
         isEnabled: true,