@gadmin2n/schematics 0.0.144 → 0.0.145

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/workflow-outbox.ts

@@ -0,0 +1,57 @@
+import { PrismaClient } from '@prisma/client';
+
+/**
+ * Workflow Outbox 初始化与旧数据表事件清理。
+ *
+ * 业务代码在自身事务中显式写入 t_workflow_event_outbox。Workflow 不再通过
+ * PostgreSQL Trigger 把任意数据表变化转换成事件。
+ */
+export async function seedWorkflowOutbox(prisma: PrismaClient) {
+  console.log('Removing legacy workflow table-event triggers...');
+
+  await prisma.$executeRawUnsafe(`
+    DO $$
+    DECLARE
+      legacy_trigger record;
+    BEGIN
+      FOR legacy_trigger IN
+        SELECT
+          event_trigger.tgname AS trigger_name,
+          table_schema.nspname AS schema_name,
+          table_class.relname AS table_name
+        FROM pg_trigger event_trigger
+        JOIN pg_class table_class ON table_class.oid = event_trigger.tgrelid
+        JOIN pg_namespace table_schema ON table_schema.oid = table_class.relnamespace
+        JOIN pg_proc trigger_function ON trigger_function.oid = event_trigger.tgfoid
+        JOIN pg_namespace function_schema ON function_schema.oid = trigger_function.pronamespace
+        WHERE NOT event_trigger.tgisinternal
+          AND table_schema.nspname = current_schema()
+          AND function_schema.nspname = current_schema()
+          AND trigger_function.proname = 'notify_workflow_event'
+      LOOP
+        EXECUTE format(
+          'DROP TRIGGER %I ON %I.%I',
+          legacy_trigger.trigger_name,
+          legacy_trigger.schema_name,
+          legacy_trigger.table_name
+        );
+      END LOOP;
+
+      EXECUTE format(
+        'DROP FUNCTION IF EXISTS %I.notify_workflow_event()',
+        current_schema()
+      );
+    END
+    $$;
+  `);
+
+  console.log('Seeding workflow outbox partial index...');
+
+  await prisma.$executeRawUnsafe(`
+    CREATE INDEX IF NOT EXISTS idx_outbox_unprocessed
+      ON t_workflow_event_outbox (created_at)
+      WHERE processed = FALSE;
+  `);
+
+  console.log('Workflow outbox initialized.');
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/workflow.seed.ts

@@ -5,8 +5,8 @@ import {
   grantRoleAccess,
   upsertPage,
 } from '../scripts/lib/page-helpers';
-import { seedWorkflowEventTrigger } from './workflow-event-trigger';
 import { seedNodeTypes } from './workflow-node-types';
+import { seedWorkflowOutbox } from './workflow-outbox';
 
 /**
  * Workflow 模块 seed
@@ -15,9 +15,9 @@ import { seedNodeTypes } from './workflow-node-types';
  *   1. 菜单结构：workflow 父分组及其管理、审批任务页面
  *   2. resource: workflow / workflowNodeInstance
  *   3. PageResource 绑定与 SYSTEM_ADMIN 授权
- *   4. 业务数据：node-types / workflows / event-trigger function & index
+ *   4. 业务数据：node-types / workflows / Outbox index
  *
- * 业务数据 seed 函数仍来自 ./workflow-{node-types,workflows,event-trigger}.ts
+ * 业务数据 seed 函数仍来自 ./workflow-{node-types,workflows,outbox}.ts
  * （文件较大，保持独立但只被本入口 import，不再由 seed/index.ts 直接调用）。
  *
  * 前置：seedBootstrap 已建好 SYSTEM_ADMIN。
@@ -83,11 +83,19 @@ export async function seedWorkflowModule(prisma: PrismaClient): Promise<void> {
       resourceCode: 'temporalTenantConfig',
       resourceDescription: 'Temporal tenant config management',
     },
+    {
+      code: 'workflow_event_catalog',
+      zhName: '业务事件',
+      enName: 'Business Events',
+      sortOrder: 5,
+      resourceCode: 'workflow',
+      resourceDescription: 'Read registered Workflow business events',
+    },
     {
       code: 'approval_tasks',
       zhName: '审批任务',
       enName: 'Approval Tasks',
-      sortOrder: 5,
+      sortOrder: 6,
       resourceCode: 'humanApproval',
       resourceDescription: 'Read and decide assigned Human Approval tasks',
     },
@@ -121,6 +129,28 @@ export async function seedWorkflowModule(prisma: PrismaClient): Promise<void> {
     );
     console.log(`[workflow] PageResource: ${def.code} ↔ ${def.resourceCode}`);
 
+    if (def.code === 'workflow_event_catalog') {
+      await bindResourceToPage(
+        prisma,
+        p.id,
+        'workflowEventRegistration',
+        'Register database-backed Workflow business events',
+      );
+      console.log(
+        '[workflow] PageResource: workflow_event_catalog ↔ workflowEventRegistration',
+      );
+    }
+
+    if (def.code === 'workflow_list') {
+      await bindResourceToPage(
+        prisma,
+        p.id,
+        'workflowExecution',
+        'Execute published manual Workflows',
+      );
+      console.log('[workflow] PageResource: workflow_list ↔ workflowExecution');
+    }
+
     // Provider actions live inside the existing Node Instance page. Resolve is
     // seeded now for the later publish/runtime call path; it has no HTTP route yet.
     if (def.code === 'workflow_node_instance') {
@@ -201,5 +231,5 @@ export async function seedWorkflowModule(prisma: PrismaClient): Promise<void> {
 
   // ── 业务数据 ───────────────────────────────────────────────────────────────
   await seedNodeTypes(prisma);
-  await seedWorkflowEventTrigger(prisma);
+  await seedWorkflowOutbox(prisma);
 }

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/workflows.ts

@@ -75,7 +75,21 @@ const WORKFLOWS = [
           type: 'if_else',
           label: '审批结果判断',
           position: { x: 850, y: 200 },
-          config: {},
+          config: {
+            conditions: [
+              {
+                id: 'approval-approved',
+                left: { source: 'INPUT', path: 'response.approved' },
+                operator: 'EQ',
+                right: {
+                  source: 'FIXED',
+                  valueType: 'BOOLEAN',
+                  value: 'true',
+                },
+              },
+            ],
+            combineOperation: 'AND',
+          },
         },
         {
           id: 'action_2',
@@ -119,21 +133,43 @@ const WORKFLOWS = [
           type: 'event_trigger',
           label: '监听错误事件',
           position: { x: 100, y: 200 },
-          config: {},
+          config: {
+            registrationCode: 'admin-audit-log-insert',
+            processingMode: 'PARALLEL',
+          },
         },
         {
           id: 'action_1',
-          type: 'db_query',
+          type: 'db_execute',
           label: '查询近5分钟错误数',
           position: { x: 350, y: 200 },
-          config: {},
+          config: {
+            allowWrite: false,
+            sql: "SELECT COUNT(*) AS error_count FROM t_admin_audit_log WHERE created_at >= NOW() - INTERVAL '5 minutes'",
+            parameters: [],
+            timeoutSeconds: 30,
+          },
         },
         {
           id: 'condition_1',
           type: 'if_else',
           label: '错误率 > 5%?',
           position: { x: 600, y: 200 },
-          config: {},
+          config: {
+            conditions: [
+              {
+                id: 'error-count-high',
+                left: { source: 'INPUT', path: 'rows.0.error_count' },
+                operator: 'GT',
+                right: {
+                  source: 'FIXED',
+                  valueType: 'NUMBER',
+                  value: '5',
+                },
+              },
+            ],
+            combineOperation: 'AND',
+          },
         },
         {
           id: 'action_3',
@@ -176,17 +212,26 @@ const WORKFLOWS = [
         },
         {
           id: 'action_1',
-          type: 'db_query',
+          type: 'db_execute',
           label: '查询数据',
           position: { x: 350, y: 200 },
-          config: {},
+          config: {
+            allowWrite: false,
+            sql: 'SELECT * FROM t_admin_audit_log',
+            parameters: [],
+            timeoutSeconds: 30,
+          },
         },
         {
           id: 'loop_1',
           type: 'for_each',
           label: '遍历分页',
           position: { x: 600, y: 200 },
-          config: {},
+          config: {
+            itemsBinding: { source: 'INPUT', path: 'rows' },
+            execution: { mode: 'SEQUENTIAL' },
+            errorPolicy: 'STOP',
+          },
         },
         {
           id: 'action_2',
@@ -199,7 +244,25 @@ const WORKFLOWS = [
       edges: [
         { id: 'e-trigger_1-action_1', source: 'trigger_1', target: 'action_1' },
         { id: 'e-action_1-loop_1', source: 'action_1', target: 'loop_1' },
-        { id: 'e-loop_1-action_2', source: 'loop_1', target: 'action_2' },
+        {
+          id: 'e-loop_1-action_2',
+          kind: 'CALL',
+          pairId: 'pair-loop_1-action_2',
+          source: 'loop_1',
+          target: 'action_2',
+          sourceHandle: 'start',
+          targetHandle: 'data-in',
+        },
+        {
+          id: 'e-action_2-loop_1',
+          kind: 'RETURN',
+          pairId: 'pair-loop_1-action_2',
+          source: 'action_2',
+          target: 'loop_1',
+          sourceHandle: 'result-out',
+          targetHandle: 'end',
+          valueType: 'JSON',
+        },
       ],
     },
   },
@@ -223,7 +286,12 @@ const WORKFLOWS = [
           type: 'parallel',
           label: '并行部署',
           position: { x: 350, y: 200 },
-          config: {},
+          config: {
+            branches: [
+              { id: 'staging', label: '部署 Staging' },
+              { id: 'production', label: '部署 Production' },
+            ],
+          },
         },
         {
           id: 'action_1',
@@ -232,13 +300,6 @@ const WORKFLOWS = [
           position: { x: 600, y: 100 },
           config: {},
         },
-        {
-          id: 'approval_1',
-          type: 'approval',
-          label: 'Production 审批',
-          position: { x: 600, y: 300 },
-          config: {},
-        },
         {
           id: 'action_2',
           type: 'http_request',
@@ -255,18 +316,41 @@ const WORKFLOWS = [
         },
         {
           id: 'e-parallel_1-action_1',
+          kind: 'CALL',
+          pairId: 'pair-staging',
           source: 'parallel_1',
           target: 'action_1',
+          sourceHandle: 'staging-start',
+          targetHandle: 'request-in',
         },
         {
-          id: 'e-parallel_1-approval_1',
-          source: 'parallel_1',
-          target: 'approval_1',
+          id: 'e-action_1-parallel_1',
+          kind: 'RETURN',
+          pairId: 'pair-staging',
+          source: 'action_1',
+          target: 'parallel_1',
+          sourceHandle: 'response-out',
+          targetHandle: 'staging-end',
+          valueType: 'JSON',
         },
         {
-          id: 'e-approval_1-action_2',
-          source: 'approval_1',
+          id: 'e-parallel_1-action_2',
+          kind: 'CALL',
+          pairId: 'pair-production',
+          source: 'parallel_1',
           target: 'action_2',
+          sourceHandle: 'production-start',
+          targetHandle: 'request-in',
+        },
+        {
+          id: 'e-action_2-parallel_1',
+          kind: 'RETURN',
+          pairId: 'pair-production',
+          source: 'action_2',
+          target: 'parallel_1',
+          sourceHandle: 'response-out',
+          targetHandle: 'production-end',
+          valueType: 'JSON',
         },
       ],
     },
@@ -285,16 +369,21 @@ const WORKFLOWS = [
           type: 'event_trigger',
           label: '监听角色变更事件',
           position: { x: 100, y: 200 },
-          config: { eventName: 'user_role.updated' },
+          config: {
+            registrationCode: 'admin-user-role-update',
+            processingMode: 'PARALLEL',
+          },
         },
         {
           id: 'action_1',
-          type: 'db_query',
+          type: 'db_execute',
           label: '查询用户详情',
           position: { x: 350, y: 200 },
           config: {
-            query:
-              'SELECT userid, username, roles FROM t_admin_user_role WHERE userid = $1',
+            allowWrite: false,
+            sql: 'SELECT userid, username, roles FROM t_admin_user_role WHERE userid = $1',
+            parameters: [{ source: 'INPUT', path: 'userid' }],
+            timeoutSeconds: 30,
           },
         },
         {
@@ -314,8 +403,18 @@ const WORKFLOWS = [
           position: { x: 850, y: 200 },
           config: {
             conditions: [
-              { field: 'added', operator: 'contains', value: 'SYSTEM_ADMIN' },
+              {
+                id: 'contains-system-admin',
+                left: { source: 'INPUT', path: 'added' },
+                operator: 'CONTAINS',
+                right: {
+                  source: 'FIXED',
+                  valueType: 'STRING',
+                  value: 'SYSTEM_ADMIN',
+                },
+              },
             ],
+            combineOperation: 'AND',
           },
         },
         {
@@ -363,16 +462,18 @@ const WORKFLOWS = [
           type: 'cron_trigger',
           label: '每日9点检查',
           position: { x: 100, y: 200 },
-          config: { cron: '0 9 * * *', timezone: 'Asia/Shanghai' },
+          config: { cronExpressions: ['0 9 * * *'], timezone: 'Asia/Shanghai' },
         },
         {
           id: 'action_1',
-          type: 'db_query',
+          type: 'db_execute',
           label: '查询3天内活动',
           position: { x: 350, y: 200 },
           config: {
-            query:
-              "SELECT * FROM t_event WHERE start_date BETWEEN NOW() AND NOW() + INTERVAL '3 days'",
+            allowWrite: false,
+            sql: "SELECT * FROM t_event WHERE start_date BETWEEN NOW() AND NOW() + INTERVAL '3 days'",
+            parameters: [],
+            timeoutSeconds: 30,
           },
         },
         {
@@ -381,7 +482,19 @@ const WORKFLOWS = [
           label: '有即将开始的活动?',
           position: { x: 600, y: 200 },
           config: {
-            conditions: [{ field: 'rowCount', operator: 'gt', value: '0' }],
+            conditions: [
+              {
+                id: 'has-upcoming-events',
+                left: { source: 'INPUT', path: 'rowCount' },
+                operator: 'GT',
+                right: {
+                  source: 'FIXED',
+                  valueType: 'NUMBER',
+                  value: '0',
+                },
+              },
+            ],
+            combineOperation: 'AND',
           },
         },
         {
@@ -389,21 +502,10 @@ const WORKFLOWS = [
           type: 'for_each',
           label: '遍历活动列表',
           position: { x: 850, y: 150 },
-          config: { iteratorField: 'rows', concurrency: 3 },
-        },
-        {
-          id: 'condition_2',
-          type: 'if_else',
-          label: '已同步ServiceNow?',
-          position: { x: 1100, y: 150 },
           config: {
-            conditions: [
-              {
-                field: 'currentItem.sn_sys_id',
-                operator: 'isNotEmpty',
-                value: '',
-              },
-            ],
+            itemsBinding: { source: 'INPUT', path: 'rows' },
+            execution: { mode: 'PARALLEL', concurrency: 3 },
+            errorPolicy: 'STOP',
           },
         },
         {
@@ -452,14 +554,32 @@ const WORKFLOWS = [
           target: 'action_5',
           label: 'false',
         },
-        { id: 'e-loop_1-condition_2', source: 'loop_1', target: 'condition_2' },
         {
-          id: 'e-condition_2-action_2',
-          source: 'condition_2',
+          id: 'e-loop_1-action_2',
+          kind: 'CALL',
+          pairId: 'pair-loop_1-action_2',
+          source: 'loop_1',
           target: 'action_2',
-          label: 'false',
+          sourceHandle: 'start',
+          targetHandle: 'data-in',
+        },
+        {
+          id: 'e-action_2-action_3',
+          kind: 'FLOW',
+          pairId: 'pair-loop_1-action_2',
+          source: 'action_2',
+          target: 'action_3',
+        },
+        {
+          id: 'e-action_3-loop_1',
+          kind: 'RETURN',
+          pairId: 'pair-loop_1-action_2',
+          source: 'action_3',
+          target: 'loop_1',
+          sourceHandle: 'result-out',
+          targetHandle: 'end',
+          valueType: 'JSON',
         },
-        { id: 'e-action_2-action_3', source: 'action_2', target: 'action_3' },
       ],
     },
   },
@@ -478,16 +598,21 @@ const WORKFLOWS = [
           type: 'event_trigger',
           label: '监听用户创建事件',
           position: { x: 100, y: 200 },
-          config: { eventName: 'user.created' },
+          config: {
+            registrationCode: 'admin-user-role-insert',
+            processingMode: 'PARALLEL',
+          },
         },
         {
           id: 'action_1',
-          type: 'db_query',
+          type: 'db_execute',
           label: '查询新用户信息',
           position: { x: 350, y: 200 },
           config: {
-            query:
-              'SELECT userid, username, roles, is_active FROM t_admin_user_role WHERE userid = $1',
+            allowWrite: false,
+            sql: 'SELECT userid, username, roles, is_active FROM t_admin_user_role WHERE userid = $1',
+            parameters: [{ source: 'INPUT', path: 'userid' }],
+            timeoutSeconds: 30,
           },
         },
         {
@@ -507,8 +632,18 @@ const WORKFLOWS = [
           position: { x: 850, y: 200 },
           config: {
             conditions: [
-              { field: 'needsUpdate', operator: 'eq', value: 'true' },
+              {
+                id: 'needs-default-role',
+                left: { source: 'INPUT', path: 'needsUpdate' },
+                operator: 'EQ',
+                right: {
+                  source: 'FIXED',
+                  valueType: 'BOOLEAN',
+                  value: 'true',
+                },
+              },
             ],
+            combineOperation: 'AND',
           },
         },
         {
@@ -519,8 +654,19 @@ const WORKFLOWS = [
           config: {
             operation: 'update',
             table: 't_admin_user_role',
-            data: { roles: '["GUEST"]' },
-            where: 'userid = $1',
+            values: [
+              {
+                column: 'roles',
+                binding: {
+                  source: 'FIXED',
+                  valueType: 'STRING',
+                  value: '["GUEST"]',
+                },
+              },
+            ],
+            where: 'userid = $2',
+            parameters: [{ source: 'INPUT', path: 'userid' }],
+            timeoutSeconds: 30,
           },
         },
         {
@@ -541,7 +687,26 @@ const WORKFLOWS = [
           config: {
             operation: 'insert',
             table: 't_admin_audit_log',
-            data: { action: 'user.onboarded', resource: 'user' },
+            values: [
+              {
+                column: 'action',
+                binding: {
+                  source: 'FIXED',
+                  valueType: 'STRING',
+                  value: 'user.onboarded',
+                },
+              },
+              {
+                column: 'resource',
+                binding: {
+                  source: 'FIXED',
+                  valueType: 'STRING',
+                  value: 'user',
+                },
+              },
+            ],
+            parameters: [],
+            timeoutSeconds: 30,
           },
         },
       ],

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/codeRuntime/code-executor.spec.ts

@@ -39,4 +39,27 @@ describe('executeCode', () => {
       applicant: 'alice',
     });
   });
+
+  it('exposes node-local scopes without replacing input', async () => {
+    await expect(
+      executeCode(
+        {
+          script:
+            'return { title: input.title, requestId: approval.requestId, status: response.status, eventId: callback.eventId };',
+        },
+        { title: '服务器权限申请' },
+        {},
+        {
+          approval: { requestId: '41' },
+          response: { status: 201 },
+          callback: { eventId: 'external:W-1' },
+        },
+      ),
+    ).resolves.toEqual({
+      title: '服务器权限申请',
+      requestId: '41',
+      status: 201,
+      eventId: 'external:W-1',
+    });
+  });
 });

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/codeRuntime/code-executor.ts

@@ -6,14 +6,23 @@ export interface CodeNodeConfig {
   timeout?: number;
 }
 
+export interface CodeNodeScopes {
+  approval?: unknown;
+  response?: unknown;
+  callback?: unknown;
+}
+
 const WORKER_SOURCE = String.raw`
 const { parentPort, workerData } = require('node:worker_threads');
 const vm = require('node:vm');
 
-function run(script, input, workflow, timeout) {
+function run(script, input, workflow, scopes, timeout) {
   const sandbox = Object.create(null);
   sandbox.input = input;
   sandbox.workflow = workflow;
+  sandbox.approval = scopes.approval;
+  sandbox.response = scopes.response;
+  sandbox.callback = scopes.callback;
   sandbox.data = input && typeof input === 'object' && 'data' in input
     ? input.data
     : input;
@@ -32,17 +41,17 @@ function run(script, input, workflow, timeout) {
 }
 
 try {
-  const { config, input, workflow } = workerData;
+  const { config, input, workflow, scopes } = workerData;
   let result;
   if (config.mode === 'runOnceForEach') {
     const items = Array.isArray(input)
       ? input
       : input && Array.isArray(input.items) ? input.items : [];
     result = items.map((item) =>
-      run(config.script, item, workflow, config.timeout)
+      run(config.script, item, workflow, scopes, config.timeout)
     );
   } else {
-    result = run(config.script, input, workflow, config.timeout);
+    result = run(config.script, input, workflow, scopes, config.timeout);
   }
   parentPort.postMessage({ ok: true, result });
 } catch (error) {
@@ -57,11 +66,12 @@ export async function executeCode(
   config: CodeNodeConfig,
   input: unknown,
   workflow: Record<string, unknown> = {},
+  scopes: CodeNodeScopes = {},
 ): Promise<unknown> {
   if (typeof config.script !== 'string' || !config.script.trim())
     throw new Error('CODE_SCRIPT_REQUIRED');
   const timeout = Math.min(
-    Math.max(Math.trunc(config.timeout ?? 1000), 1),
+    Math.max(Math.trunc(config.timeout ?? 5000), 1),
     5000,
   );
   const mode = config.mode ?? 'runOnceForAll';
@@ -75,6 +85,7 @@ export async function executeCode(
         config: { script: config.script, mode, timeout },
         input,
         workflow,
+        scopes,
       },
       resourceLimits: {
         maxOldGenerationSizeMb: 16,