@gadmin2n/schematics 0.0.147 → 0.0.149

package/dist/lib/application/files/gadmin2-game-angle-demo/config/prisma/workflow.prisma

@@ -149,6 +149,7 @@ model WorkflowInstance {
   retryFromNodeId String?                @db.VarChar(64) @map("retry_from_node_id") // 本实例从哪个失败节点继续执行
   cancellationStatus WorkflowCancellationStatus @default(NONE) @map("cancellation_status")
   cancellationRequestedAt DateTime?      @map("cancellation_requested_at") @db.Timestamptz(3)
+  cancellationRequestedBy String?        @map("cancellation_requested_by") @db.VarChar(128)
   cancellationReason String?             @map("cancellation_reason") @db.VarChar(512)
   cancellationLastError String?          @map("cancellation_last_error") @db.Text
   cancellationBlockedAt DateTime?        @map("cancellation_blocked_at") @db.Timestamptz(3)
@@ -377,7 +378,7 @@ model WorkflowBusinessEventRegistration {
   registrationKey  String                 @unique @map("registration_key") @db.Char(64)
   schemaName       String                 @map("schema_name") @db.VarChar(63)
   tableName        String                 @map("table_name") @db.VarChar(63)
-  operation        WorkflowEventOperation
+  operations       WorkflowEventOperation[]
   watchedFields    Json                   @map("watched_fields")
   primaryKeyFields Json                   @map("primary_key_fields")
   isEnabled        Boolean                @default(true) @map("is_enabled")

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

@@ -12,8 +12,9 @@ import {
  *
  * 职责（仅本模块自家）：
  *   1. permission 父分组 page (顶级 admin/administration → permission)
- *   2. 5 个 leaf page: permission_readme / user / role / page / resource
- *   3. 7 个 resource: user / role / rolePages / roleResource / page / pageResource / resource
+ *   2. 7 个 leaf page: permission_readme / person_directory / user /
+ *      people_group / role / page / resource
+ *   3. permission 模块所需 resource 及页面绑定
  *   4. PageResource 绑定（page ↔ resource，多对多）
  *   5. SYSTEM_ADMIN 对上述全部 page + resource 的全量授权
  *
@@ -54,14 +55,31 @@ export async function seedPermissionModule(
       enName: 'Menu Guide',
       sortOrder: 1005,
     },
-    { code: 'user', zhName: '用户管理', enName: 'User Mgnt', sortOrder: 1010 },
-    { code: 'role', zhName: '角色管理', enName: 'Role Mgnt', sortOrder: 1020 },
-    { code: 'page', zhName: '页面管理', enName: 'Page Mgnt', sortOrder: 1030 },
+    {
+      code: 'person_directory',
+      zhName: '人员目录',
+      enName: 'People Directory',
+      sortOrder: 1010,
+    },
+    {
+      code: 'user',
+      zhName: '访问授权',
+      enName: 'Access Grants',
+      sortOrder: 1020,
+    },
+    {
+      code: 'people_group',
+      zhName: '人员组',
+      enName: 'People Groups',
+      sortOrder: 1030,
+    },
+    { code: 'role', zhName: '角色管理', enName: 'Role Mgnt', sortOrder: 1040 },
+    { code: 'page', zhName: '页面管理', enName: 'Page Mgnt', sortOrder: 1050 },
     {
       code: 'resource',
       zhName: '资源管理',
       enName: 'Resource Management',
-      sortOrder: 1040,
+      sortOrder: 1060,
     },
   ];
 
@@ -69,14 +87,23 @@ export async function seedPermissionModule(
   pagesByCode.set(permissionPage.code, permissionPage.id);
 
   for (const def of leafDefs) {
-    const p = await upsertPage(prisma, {
-      code: def.code,
-      name: def.code,
-      zhName: def.zhName,
-      enName: def.enName,
-      sortOrder: def.sortOrder,
-      parentId: permissionPage.id,
-    });
+    const p = await upsertPage(
+      prisma,
+      {
+        code: def.code,
+        name: def.code,
+        zhName: def.zhName,
+        enName: def.enName,
+        sortOrder: def.sortOrder,
+        parentId: permissionPage.id,
+      },
+      {
+        zhName: def.zhName,
+        enName: def.enName,
+        sortOrder: def.sortOrder,
+        parentId: permissionPage.id,
+      },
+    );
     pagesByCode.set(p.code, p.id);
     console.log(`[permission] Page: ${p.code} (id=${p.id})`);
   }
@@ -87,7 +114,32 @@ export async function seedPermissionModule(
     description: string;
     pageCode: string;
   }[] = [
-    { code: 'user', description: 'User management', pageCode: 'user' },
+    {
+      code: 'user',
+      description: 'People directory',
+      pageCode: 'person_directory',
+    },
+    {
+      code: 'staffDirectory',
+      description: 'Search the shared staff directory',
+      pageCode: 'person_directory',
+    },
+    { code: 'user', description: 'Access grants', pageCode: 'user' },
+    {
+      code: 'userGroup:read',
+      description: 'Read reusable people groups',
+      pageCode: 'people_group',
+    },
+    {
+      code: 'userGroup:create',
+      description: 'Maintain reusable people groups',
+      pageCode: 'people_group',
+    },
+    {
+      code: 'user',
+      description: 'Read people for group membership',
+      pageCode: 'people_group',
+    },
     { code: 'role', description: 'Role management', pageCode: 'role' },
     {
       code: 'rolePages',

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

@@ -202,65 +202,82 @@ const NODE_DEFINITIONS: BaseNodeTypeSeed[] = [
           minLength: 1,
           description: '前端登记的 PostgreSQL 表字段监听标识',
         },
-        match: {
-          type: 'object',
-          properties: {
-            combineOperation: {
-              type: 'string',
-              enum: ['AND', 'OR'],
-            },
-            conditions: {
-              type: 'array',
-              minItems: 1,
-              items: {
+        operationRules: {
+          type: 'array',
+          minItems: 1,
+          maxItems: 3,
+          description: '按数据操作配置启动规则；未启用的操作不启动',
+          items: {
+            type: 'object',
+            properties: {
+              operation: {
+                type: 'string',
+                enum: ['INSERT', 'UPDATE', 'DELETE'],
+              },
+              match: {
                 type: 'object',
                 properties: {
-                  id: { type: 'string', minLength: 1 },
-                  left: {
-                    type: 'object',
-                    properties: {
-                      source: { const: 'WORKFLOW' },
-                      path: { type: 'string', minLength: 1 },
-                    },
-                    required: ['source', 'path'],
-                    additionalProperties: false,
-                  },
-                  operator: {
+                  combineOperation: {
                     type: 'string',
-                    enum: ['EQ', 'NEQ', 'EMPTY', 'NOT_EMPTY'],
-                  },
-                  right: {
-                    type: 'object',
-                    properties: {
-                      source: { const: 'FIXED' },
-                      valueType: {
-                        type: 'string',
-                        enum: ['STRING', 'NUMBER', 'BOOLEAN'],
-                      },
-                      value: { type: 'string' },
-                    },
-                    required: ['source', 'valueType', 'value'],
-                    additionalProperties: false,
+                    enum: ['AND', 'OR'],
                   },
-                },
-                required: ['id', 'left', 'operator'],
-                allOf: [
-                  {
-                    if: {
+                  conditions: {
+                    type: 'array',
+                    minItems: 1,
+                    items: {
+                      type: 'object',
                       properties: {
-                        operator: { enum: ['EQ', 'NEQ'] },
+                        id: { type: 'string', minLength: 1 },
+                        left: {
+                          type: 'object',
+                          properties: {
+                            source: { const: 'WORKFLOW' },
+                            path: { type: 'string', minLength: 1 },
+                          },
+                          required: ['source', 'path'],
+                          additionalProperties: false,
+                        },
+                        operator: {
+                          type: 'string',
+                          enum: ['EQ', 'NEQ', 'IN', 'EMPTY', 'NOT_EMPTY'],
+                        },
+                        right: {
+                          type: 'object',
+                          properties: {
+                            source: { const: 'FIXED' },
+                            valueType: {
+                              type: 'string',
+                              enum: ['STRING', 'NUMBER', 'BOOLEAN'],
+                            },
+                            value: { type: 'string' },
+                          },
+                          required: ['source', 'valueType', 'value'],
+                          additionalProperties: false,
+                        },
                       },
-                      required: ['operator'],
+                      required: ['id', 'left', 'operator'],
+                      allOf: [
+                        {
+                          if: {
+                            properties: {
+                              operator: { enum: ['EQ', 'NEQ', 'IN'] },
+                            },
+                            required: ['operator'],
+                          },
+                          then: { required: ['right'] },
+                        },
+                      ],
+                      additionalProperties: false,
                     },
-                    then: { required: ['right'] },
                   },
-                ],
+                },
+                required: ['combineOperation', 'conditions'],
                 additionalProperties: false,
               },
             },
+            required: ['operation'],
+            additionalProperties: false,
           },
-          required: ['combineOperation', 'conditions'],
-          additionalProperties: false,
         },
         processingMode: {
           type: 'string',
@@ -281,7 +298,7 @@ const NODE_DEFINITIONS: BaseNodeTypeSeed[] = [
           description: '顺序调度器最多同时处理的业务对象数量',
         },
       },
-      required: ['registrationCode', 'processingMode'],
+      required: ['registrationCode', 'operationRules', 'processingMode'],
       allOf: [
         {
           if: {
@@ -980,7 +997,11 @@ const HUMAN_APPROVAL_CONFIG_SCHEMA: NodeTypeSeed['configSchema'] = {
         type: 'object',
         properties: {
           source: { type: 'string', enum: ['STATIC', 'DYNAMIC'] },
-          provider: { type: 'string', enum: ['USER', 'USER_GROUP'] },
+          provider: {
+            type: 'string',
+            enum: ['USER', 'USER_GROUP'],
+            default: 'USER',
+          },
           refs: {
             type: 'array',
             minItems: 1,
@@ -998,7 +1019,7 @@ const HUMAN_APPROVAL_CONFIG_SCHEMA: NodeTypeSeed['configSchema'] = {
             additionalProperties: false,
           },
         },
-        required: ['source', 'provider'],
+        required: ['source'],
         allOf: [
           {
             if: { properties: { source: { const: 'STATIC' } } },
@@ -1093,7 +1114,7 @@ const humanApprovalNode: NodeTypeSeed = {
   configSchema: HUMAN_APPROVAL_CONFIG_SCHEMA,
   outputs: ['true', 'false'],
   runtimeKey: 'human_approval',
-  schemaVersion: 20,
+  schemaVersion: 22,
   instancePolicy: 'OPTIONAL',
   uiSchema: HUMAN_APPROVAL_UI_SCHEMA,
 };
@@ -1323,7 +1344,7 @@ const dedicatedEditorNodes: NodeTypeSeed[] = [
   ),
   schemaVersion:
     type === 'event_trigger'
-      ? 4
+      ? 5
       : type === 'db_execute'
       ? 4
       : type === 'parallel'
@@ -1361,7 +1382,16 @@ export const NODE_TYPES: NodeTypeSeed[] = [
 
 export async function seedNodeTypes(prisma: PrismaClient) {
   console.log('Seeding workflow node types...');
-  for (const removedType of ['return_result', 'db_query']) {
+  for (const removedType of [
+    'return_result',
+    'db_query',
+    'approval_request_trigger',
+    'send_notification',
+    'set_variable',
+    'submit_approval_result',
+    'submit_external_result',
+    'error_handler',
+  ]) {
     const removedNodeType = await prisma.workflowNodeType.findUnique({
       where: { type: removedType },
       select: { id: true },

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/config/index.ts

@@ -60,6 +60,11 @@ const config: Record<string, any> = {
   integration: {
     secretKey: process.env.INTEGRATION_SECRET_KEY ?? '',
   },
+  staffDirectory: {
+    baseUrl: process.env.STAFF_DIRECTORY_BASE_URL ?? '',
+    apiKey: process.env.STAFF_DIRECTORY_API_KEY ?? '',
+    searchPath: process.env.STAFF_DIRECTORY_SEARCH_PATH ?? '/api/staff/search',
+  },
 };
 
 export default () => config;

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/lib/structured-all-exceptions.filter.spec.ts

@@ -1,4 +1,5 @@
 import { ArgumentsHost, BadRequestException } from '@nestjs/common';
+import { Prisma } from '@prisma/client';
 import { StructuredAllExceptionsFilter } from './structured-all-exceptions.filter';
 
 function httpHost(url = '/api/workflowNodeInstance') {
@@ -51,4 +52,27 @@ describe('StructuredAllExceptionsFilter', () => {
       path: '/api/workflowNodeInstance',
     });
   });
+
+  it('returns a safe 409 response for an unhandled Prisma unique conflict', () => {
+    const filter = new StructuredAllExceptionsFilter();
+    const structured = httpHost('/api/user/createOne');
+
+    filter.catch(
+      new Prisma.PrismaClientKnownRequestError('sensitive database details', {
+        code: 'P2002',
+        clientVersion: '6.19.3',
+        meta: { target: ['userid'] },
+      }),
+      structured.host,
+    );
+
+    expect(structured.response.status).toHaveBeenCalledWith(409);
+    expect(structured.response.json).toHaveBeenCalledWith({
+      statusCode: 409,
+      code: 'RESOURCE_ALREADY_EXISTS',
+      message: '记录已存在，请勿重复提交',
+      error: 'Conflict',
+      path: '/api/user/createOne',
+    });
+  });
 });

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/lib/structured-all-exceptions.filter.ts

@@ -4,6 +4,7 @@ import {
   ExceptionFilter,
   HttpStatus,
 } from '@nestjs/common';
+import { Prisma } from '@prisma/client';
 
 interface ControlledException {
   getStatus?: () => number;
@@ -24,6 +25,20 @@ export class StructuredAllExceptionsFilter implements ExceptionFilter {
     const error = controlled?.name ?? 'Error';
     const path = request.url ?? '';
 
+    if (
+      exception instanceof Prisma.PrismaClientKnownRequestError &&
+      exception.code === 'P2002'
+    ) {
+      response.status(HttpStatus.CONFLICT).json({
+        statusCode: HttpStatus.CONFLICT,
+        code: 'RESOURCE_ALREADY_EXISTS',
+        message: '记录已存在，请勿重复提交',
+        error: 'Conflict',
+        path,
+      });
+      return;
+    }
+
     if (isRecord(payload)) {
       response.status(statusCode).json({
         ...payload,

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

@@ -22,6 +22,8 @@ class JobsQueryDto {
   toggle?: string;
   module?: string;
   q?: string;
+  dateFrom?: string;
+  dateTo?: string;
   skip?: number;
   limit?: number;
 }
@@ -55,6 +57,8 @@ export class AgendaController {
       toggle: query.toggle,
       module: query.module,
       q: query.q,
+      dateFrom: query.dateFrom,
+      dateTo: query.dateTo,
       skip: query.skip ? Number(query.skip) : 0,
       limit: query.limit ? Number(query.limit) : 20,
     });

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/agenda/agenda.service.ts

@@ -16,6 +16,8 @@ interface GetJobsParams {
   toggle?: string; // 'active' | 'paused'
   module?: string;
   q?: string;
+  dateFrom?: string; // ISO：按 lastRunAt 过滤区间下界
+  dateTo?: string; // ISO：按 lastRunAt 过滤区间上界
   skip?: number;
   limit?: number;
 }
@@ -364,7 +366,17 @@ export class AgendaService
         totalPages: 0,
       };
     }
-    const { job, state, toggle, module, q, skip = 0, limit = 20 } = params;
+    const {
+      job,
+      state,
+      toggle,
+      module,
+      q,
+      dateFrom,
+      dateTo,
+      skip = 0,
+      limit = 20,
+    } = params;
 
     const allQuery: JobsQueryOptions = {};
     if (job) allQuery.name = job;
@@ -381,6 +393,21 @@ export class AgendaService
         )
       : allResult.jobs;
 
+    // 应用层过滤 lastRunAt 时间区间（Agenda queryJobs 同样不支持日期过滤）。
+    // 未执行过（lastRunAt 为空）的任务在设置了时间区间时不纳入。
+    const fromTs = dateFrom ? new Date(dateFrom).getTime() : null;
+    const toTs = dateTo ? new Date(dateTo).getTime() : null;
+    const dateFiltered =
+      fromTs !== null || toTs !== null
+        ? moduleFiltered.filter((j) => {
+            if (!j.lastRunAt) return false;
+            const t = new Date(j.lastRunAt).getTime();
+            if (fromTs !== null && t < fromTs) return false;
+            if (toTs !== null && t > toTs) return false;
+            return true;
+          })
+        : moduleFiltered;
+
     const overview: Record<string, number> = {
       running: 0,
       scheduled: 0,
@@ -392,15 +419,15 @@ export class AgendaService
       active: 0,
     };
 
-    for (const j of moduleFiltered) {
+    for (const j of dateFiltered) {
       const s = j.state;
       if (s in overview) overview[s]++;
     }
 
     // 第一步：按 job 原始状态过滤（running/queued 等）
     const stateFiltered = state
-      ? moduleFiltered.filter((j) => j.state === state)
-      : moduleFiltered;
+      ? dateFiltered.filter((j) => j.state === state)
+      : dateFiltered;
 
     // 从状态过滤后的数据计算 active/paused 数量
     for (const j of stateFiltered) {

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

@@ -28,12 +28,11 @@ describe('CodeRuntimeController', () => {
                   subjects: [
                     {
                       source: 'DYNAMIC',
-                      provider: 'USER',
                       inputKey: 'direct_manager',
                       lookup: {
                         result: {
                           script:
-                            "return { subjects: [{ provider: 'USER', refs: [response.data.leader] }], requester: input.user_id };",
+                            'return [response.data.leader, input.user_id];',
                         },
                       },
                     },
@@ -89,10 +88,7 @@ describe('CodeRuntimeController', () => {
         workflow: {},
       }),
     ).resolves.toEqual({
-      result: {
-        subjects: [{ provider: 'USER', refs: ['leader-a'] }],
-        requester: 'applicant-a',
-      },
+      result: ['leader-a', 'applicant-a'],
     });
   });
 });

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/humanApproval/approval-subject-source.util.spec.ts

@@ -5,36 +5,22 @@ describe('materializeApprovalSubjects', () => {
     expect(
       materializeApprovalSubjects(
         [
-          { source: 'STATIC', provider: 'USER', refs: ['alice'] },
+          { source: 'STATIC', refs: ['alice', 'bob'] },
           {
             source: 'DYNAMIC',
-            provider: 'USER',
             inputKey: 'request_owner',
           },
           {
             source: 'DYNAMIC',
-            provider: 'USER_GROUP',
-            inputKey: 'review_groups',
+            inputKey: 'backup_approvers',
           },
         ],
         {
-          request_owner: {
-            subjects: [{ provider: 'USER', refs: ['bob'] }],
-          },
-          review_groups: {
-            subjects: [
-              {
-                provider: 'USER_GROUP',
-                refs: ['finance', 'risk', 'finance'],
-              },
-            ],
-          },
+          request_owner: ['bob', 'carol'],
+          backup_approvers: ['alice', 'dave', 'carol'],
         },
       ),
-    ).toEqual([
-      { provider: 'USER', refs: ['alice', 'bob'] },
-      { provider: 'USER_GROUP', refs: ['finance', 'risk'] },
-    ]);
+    ).toEqual([{ provider: 'USER', refs: ['alice', 'bob', 'carol', 'dave'] }]);
   });
 
   it('rejects a missing dynamic approver input', () => {
@@ -43,7 +29,6 @@ describe('materializeApprovalSubjects', () => {
         [
           {
             source: 'DYNAMIC',
-            provider: 'USER',
             inputKey: 'request_owner',
           },
         ],
@@ -58,32 +43,46 @@ describe('materializeApprovalSubjects', () => {
         [
           {
             source: 'DYNAMIC',
-            provider: 'USER',
             inputKey: 'direct_manager',
           },
         ],
-        {
-          direct_manager: {
-            subjects: [{ provider: 'USER', refs: ['leader-a'] }],
-          },
-        },
+        { direct_manager: ['leader-a'] },
       ),
     ).toEqual([{ provider: 'USER', refs: ['leader-a'] }]);
   });
 
-  it('rejects a lookup result that does not use the configured provider', () => {
+  it('keeps fixed user groups for runtime expansion while deduplicating users', () => {
+    expect(
+      materializeApprovalSubjects(
+        [
+          { source: 'STATIC', provider: 'USER', refs: ['alice'] },
+          {
+            source: 'STATIC',
+            provider: 'USER_GROUP',
+            refs: ['finance'],
+          },
+          { source: 'DYNAMIC', inputKey: 'backup_approvers' },
+        ],
+        { backup_approvers: ['alice', 'bob', 'bob'] },
+      ),
+    ).toEqual([
+      { provider: 'USER', refs: ['alice', 'bob'] },
+      { provider: 'USER_GROUP', refs: ['finance'] },
+    ]);
+  });
+
+  it('rejects a lookup result that is not a user ID array', () => {
     expect(() =>
       materializeApprovalSubjects(
         [
           {
             source: 'DYNAMIC',
-            provider: 'USER',
             inputKey: 'direct_manager',
           },
         ],
         {
           direct_manager: {
-            subjects: [{ provider: 'USER_GROUP', refs: ['leaders'] }],
+            subjects: [{ provider: 'USER', refs: ['leader-a'] }],
           },
         },
       ),