@gadmin2n/schematics 0.0.139 → 0.0.141

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

@@ -15,8 +15,7 @@ import {
 } from '@refinedev/core';
 
 import { PlusOutlined, CodeOutlined } from '@ant-design/icons';
-import { Button, Form, Input, Select, Space, Table, Tag, Tooltip } from 'antd';
-import debounce from 'lodash/debounce';
+import { Button, Card, Input, Select, Space, Table, Tag, Tooltip } from 'antd';
 
 import {
   CustomAvatar,
@@ -34,7 +33,6 @@ import { LIST_CONTENT_PROPS } from '@/constants/layout';
 import { SqlModal, generateUserSql } from '../../components/SqlModal';
 
 export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
-  const [form] = Form.useForm();
   const { data: identity } = useGetIdentity<any>();
 
   // Fetch roles from backend using custom hook
@@ -61,13 +59,7 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
     });
   };
 
-  const {
-    tableProps,
-    searchFormProps,
-    filters,
-    sorters,
-    tableQuery: tableQueryResult,
-  } = useTable<User, HttpError, Partial<User>>({
+  const { tableProps, filters } = useTable<User, HttpError, Partial<User>>({
     resource: 'user',
     pagination: {
       pageSize: 20,
@@ -97,15 +89,6 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
     },
   });
 
-  const onSearch = () => {
-    const values = form.getFieldsValue();
-    searchFormProps?.onFinish?.({
-      ...values,
-    });
-  };
-
-  const debouncedOnChange = debounce(onSearch, 500);
-
   // fix for ant design filter dropdown contains operator
   filters.map((filter) => {
     if (filter.operator === 'contains' && Array.isArray(filter.value)) {
@@ -159,193 +142,197 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
           );
         }}
       >
-        <Table
-          {...tableProps}
-          pagination={{
-            ...tableProps.pagination,
-            showTotal: (total) => (
-              <PaginationTotal total={total} entityName="user" />
-            ),
-          }}
-          rowKey="id"
-        >
-          <Table.Column
-            dataIndex="userid"
-            title="User ID"
-            render={(_, record) => {
-              return (
-                <Space>
-                  <CustomAvatar
-                    shape="square"
-                    name={record.userid || ''}
-                    src={`https://rhrc.woa.com/photo/150/${record.userid}.png`}
-                  />
-                  <Text style={{ whiteSpace: 'nowrap' }}>{record.userid}</Text>
-                </Space>
-              );
-            }}
-          />
-          <Table.Column
-            dataIndex="username"
-            title="User Name"
-            filterDropdown={(props) => (
-              <FilterDropdown
-                {...props}
-                clearFilters={() => {
-                  props.setSelectedKeys([]);
-                  props.confirm?.();
-                }}
-              >
-                <Input />
-              </FilterDropdown>
-            )}
-            defaultFilteredValue={getDefaultFilter(
-              'username',
-              filters,
-              'contains',
-            )}
-            /*filterIcon={<SearchOutlined />}*/
-          />
-          <Table.Column
-            dataIndex="roles"
-            title="Roles"
-            defaultFilteredValue={getDefaultFilter(
-              'roles',
-              filters,
-              'contains',
-            )}
-            filterDropdown={(props) => (
-              <FilterDropdown
-                {...props}
-                clearFilters={() => {
-                  props.setSelectedKeys([]);
-                  props.confirm?.();
-                }}
-              >
-                <Select
-                  options={roleOptions}
-                  style={{ width: '150px' }}
-                  placeholder="Select Role"
-                  loading={rolesLoading}
-                />
-              </FilterDropdown>
-            )}
-            render={(value) => {
-              return JSON.parse(value || '[]').map((role: string) => (
-                <RoleStatusTag key={role} role={role} />
-              ));
+        <Card className="card-table">
+          <Table
+            {...tableProps}
+            pagination={{
+              ...tableProps.pagination,
+              showTotal: (total) => (
+                <PaginationTotal total={total} entityName="user" />
+              ),
             }}
-          />
-          <Table.Column
-            dataIndex="isApiKey"
-            title="API Key"
-            defaultFilteredValue={getDefaultFilter('isApiKey', filters, 'eq')}
-            filterDropdown={(props) => (
-              <FilterDropdown
-                {...props}
-                mapValue={(selectedKeys) => {
-                  if (selectedKeys?.[0] === 'Yes') return true;
-                  if (selectedKeys?.[0] === 'No') return false;
-                  return selectedKeys;
-                }}
-                clearFilters={() => {
-                  props.setSelectedKeys([]);
-                  props.confirm?.();
-                }}
-              >
-                <Select
-                  style={{ width: '120px' }}
-                  placeholder="Select"
-                  allowClear
-                  options={[
-                    { label: 'Yes', value: 'Yes' },
-                    { label: 'No', value: 'No' },
-                  ]}
-                />
-              </FilterDropdown>
-            )}
-            render={(value) => (
-              <Tag color={value ? 'blue' : 'default'}>
-                {value ? 'Yes' : 'No'}
-              </Tag>
-            )}
-          />
-          <Table.Column
-            dataIndex="isActive"
-            title="Active"
-            defaultFilteredValue={getDefaultFilter('isActive', filters, 'eq')}
-            filterDropdown={(props) => (
-              <FilterDropdown
-                {...props}
-                mapValue={(selectedKeys) => {
-                  if (selectedKeys?.[0] === 'Active') return true;
-                  if (selectedKeys?.[0] === 'Inactive') return false;
-                  return selectedKeys;
-                }}
-                clearFilters={() => {
-                  props.setSelectedKeys([]);
-                  props.confirm?.();
-                }}
-              >
-                <Select
-                  style={{ width: '120px' }}
-                  placeholder="Select"
-                  allowClear
-                  options={[
-                    { label: 'Active', value: 'Active' },
-                    { label: 'Inactive', value: 'Inactive' },
-                  ]}
-                />
-              </FilterDropdown>
-            )}
-            render={(value) => (
-              <Tag color={value ? 'green' : 'red'}>
-                {value ? 'Active' : 'Inactive'}
-              </Tag>
-            )}
-          />
-          <Table.Column
-            fixed="right"
-            title="Actions"
-            dataIndex="actions"
-            render={(_, record) => {
-              return (
-                <Space>
-                  <ShowButton
-                    hideText
-                    size="small"
-                    style={{ backgroundColor: 'transparent' }}
-                    onClick={() =>
-                      setShowModal({ type: 'show', id: record.id })
-                    }
+            rowKey="id"
+          >
+            <Table.Column
+              dataIndex="userid"
+              title="User ID"
+              render={(_, record) => {
+                return (
+                  <Space>
+                    <CustomAvatar
+                      shape="square"
+                      name={record.userid || ''}
+                      src={`https://rhrc.woa.com/photo/150/${record.userid}.png`}
+                    />
+                    <Text style={{ whiteSpace: 'nowrap' }}>
+                      {record.userid}
+                    </Text>
+                  </Space>
+                );
+              }}
+            />
+            <Table.Column
+              dataIndex="username"
+              title="User Name"
+              filterDropdown={(props) => (
+                <FilterDropdown
+                  {...props}
+                  clearFilters={() => {
+                    props.setSelectedKeys([]);
+                    props.confirm?.();
+                  }}
+                >
+                  <Input />
+                </FilterDropdown>
+              )}
+              defaultFilteredValue={getDefaultFilter(
+                'username',
+                filters,
+                'contains',
+              )}
+              /*filterIcon={<SearchOutlined />}*/
+            />
+            <Table.Column
+              dataIndex="roles"
+              title="Roles"
+              defaultFilteredValue={getDefaultFilter(
+                'roles',
+                filters,
+                'contains',
+              )}
+              filterDropdown={(props) => (
+                <FilterDropdown
+                  {...props}
+                  clearFilters={() => {
+                    props.setSelectedKeys([]);
+                    props.confirm?.();
+                  }}
+                >
+                  <Select
+                    options={roleOptions}
+                    style={{ width: '150px' }}
+                    placeholder="Select Role"
+                    loading={rolesLoading}
+                  />
+                </FilterDropdown>
+              )}
+              render={(value) => {
+                return JSON.parse(value || '[]').map((role: string) => (
+                  <RoleStatusTag key={role} role={role} />
+                ));
+              }}
+            />
+            <Table.Column
+              dataIndex="isApiKey"
+              title="API Key"
+              defaultFilteredValue={getDefaultFilter('isApiKey', filters, 'eq')}
+              filterDropdown={(props) => (
+                <FilterDropdown
+                  {...props}
+                  mapValue={(selectedKeys) => {
+                    if (selectedKeys?.[0] === 'Yes') return true;
+                    if (selectedKeys?.[0] === 'No') return false;
+                    return selectedKeys;
+                  }}
+                  clearFilters={() => {
+                    props.setSelectedKeys([]);
+                    props.confirm?.();
+                  }}
+                >
+                  <Select
+                    style={{ width: '120px' }}
+                    placeholder="Select"
+                    allowClear
+                    options={[
+                      { label: 'Yes', value: 'Yes' },
+                      { label: 'No', value: 'No' },
+                    ]}
                   />
-                  <EditButton
-                    hideText
-                    size="small"
-                    style={{ backgroundColor: 'transparent' }}
-                    onClick={() =>
-                      setShowModal({ type: 'edit', id: record.id })
-                    }
+                </FilterDropdown>
+              )}
+              render={(value) => (
+                <Tag color={value ? 'blue' : 'default'}>
+                  {value ? 'Yes' : 'No'}
+                </Tag>
+              )}
+            />
+            <Table.Column
+              dataIndex="isActive"
+              title="Active"
+              defaultFilteredValue={getDefaultFilter('isActive', filters, 'eq')}
+              filterDropdown={(props) => (
+                <FilterDropdown
+                  {...props}
+                  mapValue={(selectedKeys) => {
+                    if (selectedKeys?.[0] === 'Active') return true;
+                    if (selectedKeys?.[0] === 'Inactive') return false;
+                    return selectedKeys;
+                  }}
+                  clearFilters={() => {
+                    props.setSelectedKeys([]);
+                    props.confirm?.();
+                  }}
+                >
+                  <Select
+                    style={{ width: '120px' }}
+                    placeholder="Select"
+                    allowClear
+                    options={[
+                      { label: 'Active', value: 'Active' },
+                      { label: 'Inactive', value: 'Inactive' },
+                    ]}
                   />
-                  <Tooltip title="Generate SQL">
-                    <Button
+                </FilterDropdown>
+              )}
+              render={(value) => (
+                <Tag color={value ? 'green' : 'red'}>
+                  {value ? 'Active' : 'Inactive'}
+                </Tag>
+              )}
+            />
+            <Table.Column
+              fixed="right"
+              title="Actions"
+              dataIndex="actions"
+              render={(_, record) => {
+                return (
+                  <Space>
+                    <ShowButton
+                      hideText
                       size="small"
-                      icon={<CodeOutlined />}
                       style={{ backgroundColor: 'transparent' }}
-                      onClick={() => handleShowSql(record)}
+                      onClick={() =>
+                        setShowModal({ type: 'show', id: record.id })
+                      }
                     />
-                  </Tooltip>
-                  <DeleteButton
-                    hideText
-                    size="small"
-                    recordItemId={record.id}
-                    style={{ backgroundColor: 'transparent' }}
-                  />
-                </Space>
-              );
-            }}
-          />
-        </Table>
+                    <EditButton
+                      hideText
+                      size="small"
+                      style={{ backgroundColor: 'transparent' }}
+                      onClick={() =>
+                        setShowModal({ type: 'edit', id: record.id })
+                      }
+                    />
+                    <Tooltip title="Generate SQL">
+                      <Button
+                        size="small"
+                        icon={<CodeOutlined />}
+                        style={{ backgroundColor: 'transparent' }}
+                        onClick={() => handleShowSql(record)}
+                      />
+                    </Tooltip>
+                    <DeleteButton
+                      hideText
+                      size="small"
+                      recordItemId={record.id}
+                      style={{ backgroundColor: 'transparent' }}
+                    />
+                  </Space>
+                );
+              }}
+            />
+          </Table>
+        </Card>
       </List>
 
       {/* Show Drawer */}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/approval-channels/ApprovalChannelModal.test.tsx

@@ -0,0 +1,84 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { customRequest } from 'helpers/http';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import i18n from '../../../i18n';
+import { ApprovalChannelModal } from './ApprovalChannelModal';
+
+vi.mock('helpers/http', () => ({ customRequest: vi.fn() }));
+
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: () => ({
+    matches: false,
+    addListener: () => undefined,
+    removeListener: () => undefined,
+    addEventListener: () => undefined,
+    removeEventListener: () => undefined,
+    dispatchEvent: () => false,
+  }),
+});
+
+describe('ApprovalChannelModal', () => {
+  beforeEach(async () => {
+    await i18n.changeLanguage('zh_CN');
+    const getComputedStyle = window.getComputedStyle.bind(window);
+    vi.spyOn(window, 'getComputedStyle').mockImplementation((element) =>
+      getComputedStyle(element),
+    );
+    vi.mocked(customRequest).mockImplementation(
+      async (resource: string, method: string) => {
+        if (
+          resource === 'approval-channels/dispatch-workflows' &&
+          method === 'GET'
+        ) {
+          return [
+            {
+              id: '11',
+              name: '发送企业微信审批',
+            },
+          ] as never;
+        }
+        return {
+          id: '1',
+          code: 'approval-generated',
+          name: '企业微信审批',
+          dispatchWorkflowId: '11',
+          dispatchWorkflowName: '发送企业微信审批',
+          isEnabled: true,
+          revision: 1,
+          updatedAt: '2026-07-24T00:00:00Z',
+        } as never;
+      },
+    );
+  });
+
+  afterEach(() => vi.restoreAllMocks());
+
+  it('creates a channel without asking for or submitting an internal code', async () => {
+    const user = userEvent.setup();
+    render(<ApprovalChannelModal open onCancel={vi.fn()} onSaved={vi.fn()} />);
+
+    expect(screen.queryByLabelText('通道编码')).not.toBeInTheDocument();
+
+    await user.type(screen.getByLabelText('名称'), '企业微信审批');
+    await user.click(screen.getByLabelText('发送审批请求的 Workflow'));
+    await user.click(await screen.findByText('发送企业微信审批'));
+    await user.click(screen.getByRole('button', { name: /保\s*存/ }));
+
+    await waitFor(() => {
+      const createCall = vi
+        .mocked(customRequest)
+        .mock.calls.find(
+          ([resource, method]) =>
+            resource === 'approval-channels' && method === 'POST',
+        );
+      expect(createCall?.[2]).toEqual({
+        name: '企业微信审批',
+        description: null,
+        dispatchWorkflowId: '11',
+        isEnabled: true,
+      });
+    });
+  });
+});

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/approval-channels/ApprovalChannelModal.tsx

@@ -0,0 +1,141 @@
+import { Alert, Form, Input, Modal, Select, Switch, message } from 'antd';
+import { customRequest } from 'helpers/http';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import type { ApprovalChannel, WorkflowOption } from './approval-channel.types';
+
+interface Props {
+  open: boolean;
+  channel?: ApprovalChannel | null;
+  onCancel(): void;
+  onSaved(channel: ApprovalChannel): void;
+}
+
+export function ApprovalChannelModal({
+  open,
+  channel,
+  onCancel,
+  onSaved,
+}: Props) {
+  const { t } = useTranslation('workflow');
+  const [form] = Form.useForm();
+  const [saving, setSaving] = useState(false);
+  const [workflows, setWorkflows] = useState<WorkflowOption[]>([]);
+
+  useEffect(() => {
+    if (!open) return;
+    form.resetFields();
+    form.setFieldsValue(
+      channel
+        ? channel
+        : {
+            isEnabled: true,
+          },
+    );
+    const includeCurrent = channel
+      ? `?includeWorkflowId=${encodeURIComponent(channel.dispatchWorkflowId)}`
+      : '';
+    customRequest<WorkflowOption[]>(
+      `approval-channels/dispatch-workflows${includeCurrent}`,
+      'GET',
+    )
+      .then((result) => setWorkflows(result))
+      .catch((error: any) =>
+        message.error(
+          error?.message ?? t('approvalChannel.workflowLoadFailed'),
+        ),
+      );
+  }, [channel, form, open, t]);
+
+  async function save() {
+    try {
+      const values = await form.validateFields();
+      const payload = {
+        name: values.name,
+        description: values.description || null,
+        dispatchWorkflowId: values.dispatchWorkflowId,
+        isEnabled: values.isEnabled,
+        ...(channel && { expectedRevision: channel.revision }),
+      };
+      setSaving(true);
+      const saved = await customRequest<ApprovalChannel>(
+        channel
+          ? `approval-channels/${encodeURIComponent(channel.code)}`
+          : 'approval-channels',
+        channel ? 'PATCH' : 'POST',
+        payload,
+      );
+      message.success(
+        channel
+          ? t('approvalChannel.updateSuccess')
+          : t('approvalChannel.createSuccess'),
+      );
+      onSaved(saved);
+    } catch (error: any) {
+      if (error?.errorFields) return;
+      message.error(error?.message ?? t('approvalChannel.saveFailed'));
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  const workflowOptions = workflows.map((workflow) => ({
+    value: workflow.id,
+    label: workflow.name,
+  }));
+
+  return (
+    <Modal
+      open={open}
+      title={
+        channel ? t('approvalChannel.edit') : t('approvalChannel.newChannel')
+      }
+      okText={t('common.save')}
+      confirmLoading={saving}
+      onOk={save}
+      onCancel={onCancel}
+      destroyOnHidden
+      width={680}
+    >
+      <Alert
+        type="info"
+        showIcon
+        message={t('approvalChannel.modalHint')}
+        description={t('approvalChannel.availableData')}
+        style={{ marginBottom: 18 }}
+      />
+      <Form form={form} layout="vertical">
+        <Form.Item
+          name="name"
+          label={t('common.name')}
+          rules={[{ required: true }]}
+        >
+          <Input placeholder={t('approvalChannel.namePlaceholder')} />
+        </Form.Item>
+        <Form.Item
+          name="dispatchWorkflowId"
+          label={t('approvalChannel.dispatchWorkflow')}
+          extra={t('approvalChannel.dispatchHint')}
+          rules={[{ required: true }]}
+        >
+          <Select
+            showSearch
+            optionFilterProp="label"
+            options={workflowOptions}
+            placeholder={t('approvalChannel.selectWorkflow')}
+          />
+        </Form.Item>
+        <Form.Item name="description" label={t('common.description')}>
+          <Input.TextArea rows={2} />
+        </Form.Item>
+        <Form.Item
+          name="isEnabled"
+          label={t('common.enabled')}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/approval-channels/approval-channel.types.ts

@@ -0,0 +1,16 @@
+export interface ApprovalChannel {
+  id: string;
+  code: string;
+  name: string;
+  description?: string | null;
+  dispatchWorkflowId: string;
+  dispatchWorkflowName: string;
+  isEnabled: boolean;
+  revision: number;
+  updatedAt: string;
+}
+
+export interface WorkflowOption {
+  id: string;
+  name: string;
+}