@gadmin2n/schematics 0.0.147 → 0.0.148

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/components/NodeOutputSummary.test.tsx

@@ -83,6 +83,13 @@ describe('NodeOutputSummary', () => {
         type: 'object',
         properties: {
           operation: { type: 'string' },
+          table: {
+            type: 'object',
+            properties: {
+              schema: { type: 'string' },
+              name: { type: 'string' },
+            },
+          },
           primaryKey: { type: 'object' },
           before: { type: ['object', 'null'] },
           after: { type: ['object', 'null'] },
@@ -90,6 +97,7 @@ describe('NodeOutputSummary', () => {
         },
         required: [
           'operation',
+          'table',
           'primaryKey',
           'before',
           'after',
@@ -102,8 +110,20 @@ describe('NodeOutputSummary', () => {
     render(<NodeOutputSummary node={event} nodeType={nodeType} />);
 
     expect(screen.getByText('input.operation')).toBeInTheDocument();
+    expect(screen.getByText('操作类型')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        '数据库操作类型：INSERT（新增）、UPDATE（更新）或 DELETE（删除）',
+      ),
+    ).toBeInTheDocument();
+    expect(screen.getByText('input.table')).toBeInTheDocument();
+    expect(screen.getByText('数据表')).toBeInTheDocument();
     expect(screen.getByText('input.primaryKey')).toBeInTheDocument();
+    expect(screen.getByText('主键')).toBeInTheDocument();
+    expect(screen.getByText('变更前的数据')).toBeInTheDocument();
+    expect(screen.getByText('变更后的数据')).toBeInTheDocument();
     expect(screen.getByText('input.changedFields')).toBeInTheDocument();
+    expect(screen.getByText('发生变化的字段')).toBeInTheDocument();
     expect(
       screen.queryByText('触发本次运行的事件数据'),
     ).not.toBeInTheDocument();

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/NodePropertyPanel.test.tsx

@@ -188,11 +188,10 @@ describe('NodePropertyPanel instance references', () => {
     expect(
       screen.queryByText('Connection is required'),
     ).not.toBeInTheDocument();
-    await user.click(screen.getByRole('button', { name: 'Save changes' }));
-    expect(onSave).toHaveBeenCalledWith(
-      'http-1',
-      expect.objectContaining({ config: expect.any(Object) }),
-    );
+    expect(
+      screen.queryByRole('button', { name: 'Save changes' }),
+    ).not.toBeInTheDocument();
+    expect(onSave).not.toHaveBeenCalled();
     expect(
       screen.queryByText('Connection is required'),
     ).not.toBeInTheDocument();
@@ -307,7 +306,6 @@ describe('NodePropertyPanel instance references', () => {
       />,
     );
 
-    await waitFor(() => expect(customRequest).toHaveBeenCalled());
     await act(async () => {
       await Promise.resolve();
       await Promise.resolve();
@@ -346,8 +344,8 @@ describe('NodePropertyPanel instance references', () => {
       screen.getByText('Includes the approver and completion time'),
     ).toBeInTheDocument();
     expect(
-      screen.getByRole('button', { name: 'Save changes' }),
-    ).toBeInTheDocument();
+      screen.queryByRole('button', { name: 'Save changes' }),
+    ).not.toBeInTheDocument();
     expect(customRequest).not.toHaveBeenCalledWith(
       'workflowNodeInstance/findMany',
       expect.anything(),
@@ -386,13 +384,14 @@ describe('NodePropertyPanel instance references', () => {
       />,
     );
 
-    expect(screen.getByRole('button', { name: 'Save changes' })).toBeEnabled();
     expect(
       screen.getByText('Use a template or configure this node directly'),
     ).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /New template/ })).toHaveClass(
-      'workflow-panel-action',
-    );
+    expect(
+      screen.getByRole('button', {
+        name: /Save current configuration as template/,
+      }),
+    ).toHaveClass('workflow-panel-action');
     expect(screen.getByText('Who can approve')).toBeInTheDocument();
     expect(screen.queryByText('Parameters')).not.toBeInTheDocument();
     expect(
@@ -419,7 +418,83 @@ describe('NodePropertyPanel instance references', () => {
     );
   });
 
-  it('keeps an inline approval configuration after saving it', async () => {
+  it('saves the current configuration as a template and uses it immediately', async () => {
+    const user = userEvent.setup();
+    const onSave = vi.fn();
+    const inlineNode = {
+      ...node,
+      instanceRef: undefined,
+      config: { subjects: [{ refs: ['alice'] }] },
+    };
+    vi.mocked(customRequest).mockImplementation((path) => {
+      if (path === 'workflowNodeInstance/findMany') {
+        return Promise.resolve({ data: [] }) as never;
+      }
+      if (path === 'workflowNodeInstance/createOne') {
+        return Promise.resolve({
+          id: '21',
+          code: 'FINANCE_APPROVAL_V2',
+          name: 'Finance approval',
+          nodeTypeId: '7',
+          isEnabled: true,
+          config: inlineNode.config,
+        }) as never;
+      }
+      return Promise.resolve([]) as never;
+    });
+
+    render(
+      <NodePropertyPanel
+        node={inlineNode}
+        nodeTypes={[nodeType]}
+        onSave={onSave}
+        onLabelChange={vi.fn()}
+        onAiEdit={vi.fn()}
+        aiLoading={false}
+      />,
+    );
+
+    await user.click(
+      screen.getByRole('button', {
+        name: /Save current configuration as template/,
+      }),
+    );
+    expect(
+      screen.getByText(/Create a template from the current node configuration/),
+    ).toBeInTheDocument();
+    const templateName = screen.getByRole('textbox', {
+      name: 'Template name',
+    });
+    await user.clear(templateName);
+    await user.type(templateName, 'Reusable finance approval');
+    await user.click(
+      screen.getByRole('button', { name: 'Save and use template' }),
+    );
+
+    await waitFor(() =>
+      expect(customRequest).toHaveBeenCalledWith(
+        'workflowNodeInstance/createOne',
+        'POST',
+        expect.objectContaining({
+          name: 'Reusable finance approval',
+          config: inlineNode.config,
+        }),
+      ),
+    );
+    expect(onSave).toHaveBeenCalledWith(
+      'node-1',
+      expect.objectContaining({
+        config: inlineNode.config,
+        configOverride: null,
+        instanceRef: {
+          instanceId: '21',
+          instanceCode: 'FINANCE_APPROVAL_V2',
+        },
+      }),
+    );
+  });
+
+  it('keeps an inline approval configuration in the Workflow draft', async () => {
     const user = userEvent.setup();
     const onSave = vi.fn();
     const onConfigDraftChange = vi.fn();
@@ -531,10 +606,8 @@ describe('NodePropertyPanel instance references', () => {
       },
     });
 
-    await user.click(screen.getByRole('button', { name: 'Save changes' }));
-
-    const savedConfig = onSave.mock.lastCall?.[1].config;
-    expect(savedConfig).toMatchObject({
+    const pendingConfig = panelRef.current?.getPendingUpdate()?.updates.config;
+    expect(pendingConfig).toMatchObject({
       external: {
         request: {
           connectionRef: 'ticketing',
@@ -549,6 +622,7 @@ describe('NodePropertyPanel instance references', () => {
       rejectionRule: { mode: 'ANY' },
       timeout: { durationSeconds: 0, action: 'REJECTED' },
     });
+    expect(onSave).not.toHaveBeenCalled();
 
     await waitFor(() =>
       expect(screen.getByLabelText('Task title field path')).toHaveValue(
@@ -616,7 +690,7 @@ describe('NodePropertyPanel instance references', () => {
 
   it('uses nested UI Schema widgets for Callable Trigger parameters', async () => {
     const user = userEvent.setup();
-    const onSave = vi.fn();
+    const onConfigDraftChange = vi.fn();
     const callableNodeType = {
       id: '9',
       type: 'callable_trigger',
@@ -655,7 +729,8 @@ describe('NodePropertyPanel instance references', () => {
       <NodePropertyPanel
         node={callableNode}
         nodeTypes={[callableNodeType]}
-        onSave={onSave}
+        onSave={vi.fn()}
+        onConfigDraftChange={onConfigDraftChange}
         onLabelChange={vi.fn()}
         onAiEdit={vi.fn()}
         aiLoading={false}
@@ -672,16 +747,10 @@ describe('NodePropertyPanel instance references', () => {
       screen.getByRole('textbox', { name: 'Parameter name' }),
       'departmentId',
     );
-    await user.click(screen.getByRole('button', { name: 'Save changes' }));
 
-    expect(onSave).toHaveBeenCalledWith(
-      'callable-1',
-      expect.objectContaining({
-        config: {
-          inputParameters: [{ key: 'departmentId', label: '', required: true }],
-        },
-      }),
-    );
+    expect(onConfigDraftChange).toHaveBeenCalledWith('callable-1', {
+      inputParameters: [{ key: 'departmentId', label: '', required: true }],
+    });
   });
 
   it('filters the node palette by translated name and technical type', async () => {