@gadmin2n/schematics 0.0.139 → 0.0.140

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/human-approval/DecisionModal.tsx

@@ -0,0 +1,71 @@
+import React, { useEffect, useState } from 'react';
+import { Alert, Form, Input, Modal, Radio } from 'antd';
+
+interface Props {
+  open: boolean;
+  requestLabel?: string;
+  submitting?: boolean;
+  onCancel(): void;
+  onSubmit(input: { decision: 'APPROVE' | 'REJECT'; comment?: string }): void;
+}
+
+export function DecisionModal({
+  open,
+  requestLabel,
+  submitting,
+  onCancel,
+  onSubmit,
+}: Props) {
+  const [decision, setDecision] = useState<'APPROVE' | 'REJECT'>('APPROVE');
+  const [comment, setComment] = useState('');
+  useEffect(() => {
+    if (open) {
+      setDecision('APPROVE');
+      setComment('');
+    }
+  }, [open]);
+
+  return (
+    <Modal
+      open={open}
+      title="Confirm approval decision"
+      okText={decision === 'APPROVE' ? 'Confirm approval' : 'Confirm rejection'}
+      okButtonProps={{ danger: decision === 'REJECT', disabled: submitting }}
+      confirmLoading={submitting}
+      cancelButtonProps={{ disabled: submitting }}
+      onCancel={onCancel}
+      onOk={() =>
+        onSubmit({
+          decision,
+          ...(comment.trim() && { comment: comment.trim() }),
+        })
+      }
+    >
+      <Alert
+        type={decision === 'APPROVE' ? 'info' : 'warning'}
+        showIcon
+        message={`This decision is final for ${requestLabel ?? 'this request'}.`}
+        style={{ marginBottom: 16 }}
+      />
+      <Form layout="vertical">
+        <Form.Item label="Decision">
+          <Radio.Group
+            value={decision}
+            onChange={(event) => setDecision(event.target.value)}
+          >
+            <Radio.Button value="APPROVE">Approve</Radio.Button>
+            <Radio.Button value="REJECT">Reject</Radio.Button>
+          </Radio.Group>
+        </Form.Item>
+        <Form.Item label="Comment">
+          <Input.TextArea
+            rows={3}
+            value={comment}
+            onChange={(event) => setComment(event.target.value)}
+            placeholder="Optional context for this decision"
+          />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/human-approval/inbox.tsx

@@ -0,0 +1,216 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import {
+  Button,
+  Card,
+  Empty,
+  Space,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import {
+  CheckCircleOutlined,
+  ReloadOutlined,
+  SyncOutlined,
+} from '@ant-design/icons';
+import { customRequest } from 'helpers/http';
+import { DecisionModal } from './DecisionModal';
+
+interface InboxItem {
+  id: string;
+  eligibilityRevision: number;
+  request: {
+    id: string;
+    workflowInstanceId: string;
+    nodeId: string;
+    status: string;
+    startedAt: string;
+    expiresAt: string | null;
+    approvalRule: Record<string, unknown>;
+    rejectionRule: Record<string, unknown>;
+    dispatch?: {
+      state: 'DISPATCHING' | 'WAITING_APPROVAL' | 'DISPATCH_FAILED';
+      canRetry: boolean;
+      error?: string;
+    };
+  };
+}
+
+export default function ApprovalInboxPage() {
+  const [items, setItems] = useState<InboxItem[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [submitting, setSubmitting] = useState(false);
+  const [retryingId, setRetryingId] = useState<string>();
+  const [selected, setSelected] = useState<InboxItem>();
+
+  const load = useCallback(async () => {
+    setLoading(true);
+    try {
+      setItems(await customRequest<InboxItem[]>('human-approval/inbox', 'GET'));
+    } catch (error: any) {
+      message.error(error?.message ?? 'Failed to load approval tasks');
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    void load();
+  }, [load]);
+
+  async function decide(input: {
+    decision: 'APPROVE' | 'REJECT';
+    comment?: string;
+  }) {
+    if (!selected || submitting) return;
+    setSubmitting(true);
+    try {
+      await customRequest(
+        `human-approval/${selected.request.id}/decisions`,
+        'POST',
+        input,
+      );
+      message.success(
+        input.decision === 'APPROVE' ? 'Request approved' : 'Request rejected',
+      );
+      setSelected(undefined);
+      await load();
+    } catch (error: any) {
+      message.error(error?.message ?? 'Decision failed');
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  async function retryDispatch(item: InboxItem) {
+    if (retryingId) return;
+    setRetryingId(item.request.id);
+    try {
+      await customRequest(
+        `human-approval/${item.request.id}/retry-dispatch`,
+        'POST',
+      );
+      message.success('Approval request is being sent again');
+      await load();
+    } catch (error: any) {
+      message.error(error?.message ?? 'Unable to retry approval dispatch');
+    } finally {
+      setRetryingId(undefined);
+    }
+  }
+
+  return (
+    <div style={{ padding: 24, minHeight: '100%', background: '#f5f7fa' }}>
+      <Card>
+        <div
+          style={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            marginBottom: 20,
+          }}
+        >
+          <div>
+            <Typography.Title level={3} style={{ margin: 0 }}>
+              Approval tasks
+            </Typography.Title>
+            <Typography.Text type="secondary">
+              Requests waiting for your decision
+            </Typography.Text>
+          </div>
+          <Button icon={<ReloadOutlined />} loading={loading} onClick={load}>
+            Refresh
+          </Button>
+        </div>
+        <Table
+          rowKey={(item) => String(item.id)}
+          loading={loading}
+          dataSource={items}
+          locale={{
+            emptyText: <Empty description="No approval tasks waiting" />,
+          }}
+          columns={[
+            {
+              title: 'Request',
+              render: (_, item) => (
+                <Space direction="vertical" size={0}>
+                  <Typography.Text strong>
+                    {item.request.nodeId}
+                  </Typography.Text>
+                  <Typography.Text type="secondary">
+                    Workflow run #{item.request.workflowInstanceId}
+                  </Typography.Text>
+                </Space>
+              ),
+            },
+            {
+              title: 'Status',
+              render: (_, item) => {
+                if (item.request.dispatch?.state === 'DISPATCH_FAILED')
+                  return (
+                    <Space direction="vertical" size={0}>
+                      <Tag color="error">Send failed</Tag>
+                      {item.request.dispatch.error && (
+                        <Typography.Text type="danger">
+                          {item.request.dispatch.error}
+                        </Typography.Text>
+                      )}
+                    </Space>
+                  );
+                if (item.request.dispatch?.state === 'DISPATCHING')
+                  return <Tag color="processing">Sending</Tag>;
+                return <Tag color="gold">{item.request.status}</Tag>;
+              },
+            },
+            {
+              title: 'Started',
+              render: (_, item) =>
+                new Date(item.request.startedAt).toLocaleString(),
+            },
+            {
+              title: 'Deadline',
+              render: (_, item) =>
+                item.request.expiresAt
+                  ? new Date(item.request.expiresAt).toLocaleString()
+                  : 'No timeout',
+            },
+            {
+              title: 'Action',
+              width: 140,
+              render: (_, item) =>
+                item.request.dispatch?.state === 'DISPATCH_FAILED' ? (
+                  <Button
+                    icon={<SyncOutlined />}
+                    loading={retryingId === item.request.id}
+                    disabled={
+                      Boolean(retryingId) || !item.request.dispatch.canRetry
+                    }
+                    onClick={() => void retryDispatch(item)}
+                  >
+                    Retry sending
+                  </Button>
+                ) : (
+                  <Button
+                    type="primary"
+                    icon={<CheckCircleOutlined />}
+                    disabled={submitting}
+                    onClick={() => setSelected(item)}
+                  >
+                    Decide
+                  </Button>
+                ),
+            },
+          ]}
+        />
+      </Card>
+      <DecisionModal
+        open={Boolean(selected)}
+        requestLabel={selected?.request.nodeId}
+        submitting={submitting}
+        onCancel={() => !submitting && setSelected(undefined)}
+        onSubmit={decide}
+      />
+    </div>
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/page/Components/AssignRolesModal.tsx

@@ -135,7 +135,12 @@ export const AssignRolesModal: React.FC<AssignRolesModalProps> = ({
     >
       <Spin spinning={loading}>
         {existingRoleIds.length > 0 && (
-          <div style={{ marginBottom: 12, color: '#666' }}>
+          <div
+            style={{
+              marginBottom: 12,
+              color: 'var(--ant-color-text-secondary)',
+            }}
+          >
             Currently <strong>{existingRoleIds.length}</strong> role(s) can
             access this page
           </div>

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

@@ -450,7 +450,7 @@ export const PermissionReadmePage = () => {
                   <Title level={5}>routeRegistry 示例</Title>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -557,7 +557,7 @@ office: {
                   </ul>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -611,7 +611,7 @@ overview: {
                   <Title level={5}>CRUD 模块完整示例</Title>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -697,7 +697,7 @@ staff: {
                   <Title level={5}>工作流程</Title>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -791,7 +791,7 @@ staff: {
                   </Paragraph>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -880,7 +880,7 @@ interface DynamicMenuGroup {
         <Title level={5}>实体关系总览</Title>
         <pre
           style={{
-            background: '#f5f5f5',
+            background: 'var(--ant-color-fill-quaternary)',
             padding: 16,
             borderRadius: 6,
             overflow: 'auto',
@@ -953,7 +953,7 @@ Role (t_role)
         <Title level={5}>权限检查完整流程</Title>
         <pre
           style={{
-            background: '#f5f5f5',
+            background: 'var(--ant-color-fill-quaternary)',
             padding: 16,
             borderRadius: 6,
             overflow: 'auto',
@@ -991,7 +991,7 @@ Role (t_role)
         </Paragraph>
         <pre
           style={{
-            background: '#f5f5f5',
+            background: 'var(--ant-color-fill-quaternary)',
             padding: 16,
             borderRadius: 6,
             overflow: 'auto',

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/resource/Components/modal.tsx

@@ -42,7 +42,7 @@ export const ResourceFormModal: React.FC<Props> = ({
   });
 
   // Fetch all resources for code duplication check
-  const { data: resourcesData } = useList<Resource>({
+  const { result: resourcesData } = useList<Resource>({
     resource: 'resource',
     pagination: {
       mode: 'off',

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

@@ -31,11 +31,11 @@ export const PROTECTED_RESOURCES = [
 
 export const ResourceManagementListPage: React.FC = () => {
   const { data: identity } = useGetIdentity<any>();
-  const { tableProps, filters, tableQueryResult } = useTable<
-    Resource,
-    HttpError,
-    Partial<Resource>
-  >({
+  const {
+    tableProps,
+    filters,
+    tableQuery: tableQueryResult,
+  } = useTable<Resource, HttpError, Partial<Resource>>({
     resource: 'resource',
     syncWithLocation: false, // Disable URL sync to keep URL clean
     pagination: {

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/role/Components/modal.tsx

@@ -98,7 +98,7 @@ export const RoleFormModal: React.FC<Props> = ({
   });
 
   // Fetch all roles for name duplication check
-  const { data: rolesData } = useList<Role>({
+  const { result: rolesData } = useList<Role>({
     resource: 'role',
     pagination: {
       mode: 'off',

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

@@ -56,7 +56,7 @@ export const ShowDrawer: React.FC<ShowDrawerProps> = ({ id, onClose }) => {
       loading={isLoading}
       width={756}
       styles={{
-        body: { background: '#f5f5f5', padding: 0 },
+        body: { background: 'var(--ant-color-bg-layout)', padding: 0 },
         header: { display: 'none' },
       }}
     >

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;
+}