@gadmin2n/schematics 0.0.141 → 0.0.143

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/utils/resolveOutputs.test.ts

@@ -15,24 +15,17 @@ describe('resolveOutputs', () => {
     expect(resolveOutputs(node, { outputs: [] })).toEqual(['true', 'false']);
   });
 
-  it('uses configured external outcomes and the timeout branch', () => {
+  it('exposes received and timeout branches for an external wait', () => {
     const node = {
       id: 'wait-1',
       type: 'external_wait',
       label: '等待签署',
       position: { x: 0, y: 0 },
-      config: {
-        outcomes: [
-          { code: 'SIGNED', label: '已签署' },
-          { code: 'REJECTED', label: '已拒绝' },
-        ],
-        timeout: { durationSeconds: 3600, outcome: 'TIMEOUT' },
-      },
+      config: {},
     } as WorkflowNode;
 
     expect(resolveOutputs(node, { outputs: [] })).toEqual([
-      'SIGNED',
-      'REJECTED',
+      'RECEIVED',
       'TIMEOUT',
     ]);
   });

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/utils/resolveOutputs.ts

@@ -27,22 +27,7 @@ export function resolveOutputs(
       .filter((v): v is string => typeof v === 'string' && v.length > 0);
   }
   if (node.type === 'external_wait') {
-    const outcomes = Array.isArray((node.config as any)?.outcomes)
-      ? ((node.config as any).outcomes as Array<{ code?: unknown }>)
-      : [];
-    const codes = outcomes
-      .map((item) => item?.code)
-      .filter(
-        (code): code is string =>
-          typeof code === 'string' && code.trim().length > 0,
-      );
-    const timeoutOutcome = (node.config as any)?.timeout?.outcome;
-    return [
-      ...codes,
-      ...(typeof timeoutOutcome === 'string' && timeoutOutcome.trim()
-        ? [timeoutOutcome]
-        : []),
-    ];
+    return ['RECEIVED', 'TIMEOUT'];
   }
   return nodeTypeMeta?.outputs ?? [];
 }
@@ -51,25 +36,5 @@ export function resolveOutputLabels(
   node: WorkflowNode,
 ): Record<string, string> {
   if (node.type !== 'external_wait') return {};
-  const outcomes = Array.isArray((node.config as any)?.outcomes)
-    ? ((node.config as any).outcomes as Array<{
-        code?: unknown;
-        label?: unknown;
-      }>)
-    : [];
-  const labels = Object.fromEntries(
-    outcomes.flatMap((item) =>
-      typeof item.code === 'string' &&
-      item.code.trim() &&
-      typeof item.label === 'string' &&
-      item.label.trim()
-        ? [[item.code, item.label]]
-        : [],
-    ),
-  );
-  const timeoutOutcome = (node.config as any)?.timeout?.outcome;
-  if (typeof timeoutOutcome === 'string' && timeoutOutcome.trim()) {
-    labels[timeoutOutcome] = '已超时';
-  }
-  return labels;
+  return { RECEIVED: '已收到', TIMEOUT: '已超时' };
 }

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

@@ -26,6 +26,7 @@ import { useLocation, useNavigate } from 'react-router-dom';
 import {
   getColumns,
   ModelType,
+  pick,
   produceModel,
   tableSearchBar,
 } from '@gadmin2n/react-common';
@@ -135,20 +136,43 @@ export const WorkflowEventOutboxList: React.FC<
     t,
   });
 
-  // Export all
+  // Export all (fields 来自 config/ui 的 toolbar.actions EXPORT 配置，缺省导出全部字段)
+  const exportAllAction = tableConfig.toolbar.actions.find(
+    (a) => a.action === 'EXPORT',
+  );
+  const exportAllFields =
+    exportAllAction?.action === 'EXPORT' ? exportAllAction.fields : undefined;
   const { triggerExport, isLoading: exportLoading } =
     useExport<WorkflowEventOutbox>({
       maxItemCount: 200,
       pageSize: 100,
+      ...(exportAllFields?.length
+        ? {
+            mapData: (item: WorkflowEventOutbox) => pick(item, exportAllFields),
+          }
+        : {}),
     });
 
-  // Export selected
+  // Export selected (fields 来自 config/ui 的 rowSelection.actions EXPORT 配置)
+  const exportSelectedAction = tableConfig.rowSelection.actions.find(
+    (a) => a.action === 'EXPORT',
+  );
+  const exportSelectedFields =
+    exportSelectedAction?.action === 'EXPORT'
+      ? exportSelectedAction.fields
+      : undefined;
   const {
     triggerExport: triggerExportSelected,
     isLoading: exportSelectedLoading,
   } = useExport<WorkflowEventOutbox>({
     pageSize: 100,
     meta: { where: { id: { in: batchOps.selectedRowKeys.map(Number) } } },
+    ...(exportSelectedFields?.length
+      ? {
+          mapData: (item: WorkflowEventOutbox) =>
+            pick(item, exportSelectedFields),
+        }
+      : {}),
   });
 
   // Import

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/schematics",
-  "version": "0.0.141",
+  "version": "0.0.143",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@schematics)",
   "main": "dist/index.js",
   "files": [

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/approvalChannel/approval-channel.controller.ts

@@ -1,89 +0,0 @@
-import { ACGuard } from '@gadmin2n/nest-common';
-import {
-  Body,
-  Controller,
-  Get,
-  Param,
-  Patch,
-  Post,
-  Query,
-  Req,
-  UseGuards,
-} from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
-import { UseRoles } from 'nest-access-control';
-import {
-  actorContextFromRequest,
-  AuthenticatedActorRequest,
-} from '../subjectProvider/actor-context.util';
-import {
-  CreateApprovalChannelDto,
-  UpdateApprovalChannelDto,
-} from './approval-channel.dto';
-import { ApprovalChannelService } from './approval-channel.service';
-
-@ApiTags('approval-channels')
-@UseGuards(ACGuard)
-@Controller('approval-channels')
-export class ApprovalChannelController {
-  constructor(private readonly service: ApprovalChannelService) {}
-
-  @Get()
-  @UseRoles({
-    resource: 'approvalChannel',
-    action: 'read',
-    possession: 'any',
-  })
-  list(@Query('q') query?: string) {
-    return this.service.list(query?.trim() ?? '');
-  }
-
-  @Get('dispatch-workflows')
-  @UseRoles({
-    resource: 'approvalChannel',
-    action: 'read',
-    possession: 'any',
-  })
-  listDispatchWorkflows(
-    @Query('includeWorkflowId') includeWorkflowId?: string,
-  ) {
-    return this.service.listDispatchWorkflows(includeWorkflowId?.trim());
-  }
-
-  @Get(':code')
-  @UseRoles({
-    resource: 'approvalChannel',
-    action: 'read',
-    possession: 'any',
-  })
-  get(@Param('code') code: string) {
-    return this.service.get(code);
-  }
-
-  @Post()
-  @UseRoles({
-    resource: 'approvalChannel',
-    action: 'create',
-    possession: 'any',
-  })
-  create(
-    @Body() input: CreateApprovalChannelDto,
-    @Req() request: AuthenticatedActorRequest,
-  ) {
-    return this.service.create(input, actorContextFromRequest(request));
-  }
-
-  @Patch(':code')
-  @UseRoles({
-    resource: 'approvalChannel',
-    action: 'update',
-    possession: 'any',
-  })
-  update(
-    @Param('code') code: string,
-    @Body() input: UpdateApprovalChannelDto,
-    @Req() request: AuthenticatedActorRequest,
-  ) {
-    return this.service.update(code, input, actorContextFromRequest(request));
-  }
-}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/approvalChannel/approval-channel.dto.ts

@@ -1,68 +0,0 @@
-import { Type } from 'class-transformer';
-import {
-  IsBoolean,
-  IsInt,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-  Matches,
-  MaxLength,
-  Min,
-} from 'class-validator';
-
-const CHANNEL_CODE_PATTERN = /^[a-z0-9]+(?:[-_][a-z0-9]+)*$/;
-const POSITIVE_BIGINT_PATTERN = /^[1-9]\d*$/;
-
-export class CreateApprovalChannelDto {
-  @IsOptional()
-  @IsString()
-  @IsNotEmpty()
-  @MaxLength(64)
-  @Matches(CHANNEL_CODE_PATTERN)
-  code?: string;
-
-  @IsString()
-  @IsNotEmpty()
-  @MaxLength(128)
-  name!: string;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(512)
-  description?: string;
-
-  @IsString()
-  @Matches(POSITIVE_BIGINT_PATTERN)
-  dispatchWorkflowId!: string;
-
-  @IsOptional()
-  @IsBoolean()
-  isEnabled?: boolean;
-}
-
-export class UpdateApprovalChannelDto {
-  @Type(() => Number)
-  @IsInt()
-  @Min(1)
-  expectedRevision!: number;
-
-  @IsOptional()
-  @IsString()
-  @IsNotEmpty()
-  @MaxLength(128)
-  name?: string;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(512)
-  description?: string | null;
-
-  @IsOptional()
-  @IsString()
-  @Matches(POSITIVE_BIGINT_PATTERN)
-  dispatchWorkflowId?: string;
-
-  @IsOptional()
-  @IsBoolean()
-  isEnabled?: boolean;
-}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/approvalChannel/approval-channel.service.spec.ts

@@ -1,177 +0,0 @@
-import { BadRequestException } from '@nestjs/common';
-import { ApprovalChannelService } from './approval-channel.service';
-
-const dispatchWorkflow = {
-  id: BigInt(11),
-  name: 'Dispatch approvals',
-  status: 'PUBLISHED',
-  isEnabled: true,
-  versions: [
-    {
-      dsl: {
-        nodes: [
-          {
-            type: 'callable_trigger',
-            config: {
-              inputParameters: [
-                { key: 'title', label: '单据标题', required: true },
-                { key: 'content', label: '审批内容', required: true },
-                { key: 'callbackToken', label: '回调凭证', required: true },
-              ],
-            },
-          },
-        ],
-      },
-    },
-  ],
-};
-
-describe('ApprovalChannelService', () => {
-  const prisma = {
-    workflow: {
-      findUnique: jest.fn(),
-      findMany: jest.fn(),
-    },
-    approvalChannel: {
-      create: jest.fn(),
-    },
-  };
-  const service = new ApprovalChannelService(prisma as any);
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    prisma.workflow.findUnique.mockResolvedValue(dispatchWorkflow);
-    prisma.approvalChannel.create.mockImplementation(({ data }) =>
-      Promise.resolve({
-        id: BigInt(1),
-        ...data,
-        description: data.description ?? null,
-        revision: 1,
-        creator: 'admin',
-        createdAt: new Date('2026-07-24T00:00:00Z'),
-        updatedAt: new Date('2026-07-24T00:00:00Z'),
-        dispatchWorkflow,
-      }),
-    );
-  });
-
-  it('creates a channel with an internal code generated by the server', async () => {
-    const result = await service.create(
-      {
-        name: 'External approval',
-        dispatchWorkflowId: '11',
-        isEnabled: true,
-      },
-      { userId: 'admin' },
-    );
-
-    expect(result).toMatchObject({
-      id: '1',
-      dispatchWorkflowId: '11',
-      dispatchWorkflowName: 'Dispatch approvals',
-      inputParameters: [
-        { key: 'title', label: '单据标题', required: true },
-        { key: 'content', label: '审批内容', required: true },
-        { key: 'callbackToken', label: '回调凭证', required: true },
-      ],
-    });
-    expect(result.code).toMatch(/^approval-[0-9a-f-]{36}$/);
-    expect(prisma.approvalChannel.create).toHaveBeenCalledWith(
-      expect.objectContaining({
-        data: expect.objectContaining({ code: result.code }),
-      }),
-    );
-  });
-
-  it('keeps accepting a legacy channel whose event name matches its explicit code', async () => {
-    prisma.workflow.findUnique.mockResolvedValueOnce({
-      ...dispatchWorkflow,
-      versions: [
-        {
-          dsl: {
-            nodes: [
-              {
-                type: 'event_trigger',
-                config: { eventName: 'approval.requested.external-main' },
-              },
-            ],
-          },
-        },
-      ],
-    });
-
-    await expect(
-      service.create(
-        {
-          code: 'external-main',
-          name: 'Legacy external approval',
-          dispatchWorkflowId: '11',
-          isEnabled: true,
-        },
-        { userId: 'admin' },
-      ),
-    ).resolves.toMatchObject({ code: 'external-main' });
-  });
-
-  it('rejects a workflow that cannot receive a one-way call', async () => {
-    prisma.workflow.findUnique.mockResolvedValueOnce({
-      ...dispatchWorkflow,
-      versions: [
-        {
-          dsl: {
-            nodes: [{ type: 'manual_trigger', config: {} }],
-          },
-        },
-      ],
-    });
-
-    await expect(
-      service.create(
-        {
-          name: 'External approval',
-          dispatchWorkflowId: '11',
-          isEnabled: true,
-        },
-        { userId: 'admin' },
-      ),
-    ).rejects.toBeInstanceOf(BadRequestException);
-  });
-
-  it('lists only published workflows that can receive approval requests', async () => {
-    prisma.workflow.findMany.mockResolvedValueOnce([
-      dispatchWorkflow,
-      {
-        ...dispatchWorkflow,
-        id: BigInt(12),
-        name: 'Legacy dispatcher',
-        versions: [
-          {
-            dsl: {
-              nodes: [
-                {
-                  type: 'event_trigger',
-                  config: { eventName: 'approval.requested.legacy' },
-                },
-              ],
-            },
-          },
-        ],
-      },
-      {
-        ...dispatchWorkflow,
-        id: BigInt(13),
-        name: 'Ordinary workflow',
-        versions: [
-          {
-            dsl: { nodes: [{ type: 'manual_trigger', config: {} }] },
-          },
-        ],
-      },
-    ]);
-
-    await expect(service.listDispatchWorkflows('12')).resolves.toEqual([
-      { id: '11', name: 'Dispatch approvals' },
-      { id: '12', name: 'Legacy dispatcher' },
-    ]);
-  });
-});