@gadmin2n/schematics 0.0.149 → 0.0.151

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

@@ -8,13 +8,13 @@ import {
   ShowButton,
   useTable,
 } from '@refinedev/antd';
-import {
-  getDefaultFilter,
-  type HttpError,
-  useGetIdentity,
-} from '@refinedev/core';
+import { getDefaultFilter, type HttpError } from '@refinedev/core';
 
-import { PlusOutlined, CodeOutlined } from '@ant-design/icons';
+import {
+  PlusOutlined,
+  ExportOutlined,
+  ImportOutlined,
+} from '@ant-design/icons';
 import { Button, Card, Input, Select, Space, Table, Tag, Tooltip } from 'antd';
 
 import {
@@ -30,11 +30,10 @@ import { CreateModal } from './components/create-modal';
 import { EditModal } from './components/edit-modal';
 import { ShowDrawer } from './components/show-drawer';
 import { LIST_CONTENT_PROPS } from '@/constants/layout';
-import { SqlModal, generateUserSql } from '../../components/SqlModal';
+import { TransferExportModal } from '@/components/TransferExportModal';
+import { TransferImportModal } from '@/components/TransferImportModal';
 
 export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
-  const { data: identity } = useGetIdentity<any>();
-
   // Fetch roles from backend using custom hook
   const { roleOptions, loading: rolesLoading } = useRoles();
 
@@ -59,7 +58,11 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
     });
   };
 
-  const { tableProps, filters } = useTable<User, HttpError, Partial<User>>({
+  const {
+    tableProps,
+    filters,
+    tableQuery: tableQueryResult,
+  } = useTable<User, HttpError, Partial<User>>({
     resource: 'user',
     pagination: {
       pageSize: 20,
@@ -105,20 +108,8 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
     id: null,
   });
 
-  const [sqlModal, setSqlModal] = useState<{
-    open: boolean;
-    title: string;
-    sql: string;
-  }>({ open: false, title: '', sql: '' });
-
-  const handleShowSql = (record: any) => {
-    const operator = {
-      authorId: identity?.userid,
-      authorName: identity?.username,
-    };
-    const sql = generateUserSql(record, operator);
-    setSqlModal({ open: true, title: `SQL — User: ${record.userid}`, sql });
-  };
+  const [exportEndpoint, setExportEndpoint] = useState<string | null>(null);
+  const [importOpen, setImportOpen] = useState(false);
 
   // 处理modal关闭
   const handleModalClose = () => {
@@ -132,13 +123,21 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
         contentProps={LIST_CONTENT_PROPS}
         headerButtons={() => {
           return (
-            <Button
-              type="primary"
-              icon={<PlusOutlined />}
-              onClick={() => setShowModal({ type: 'create', id: null })}
-            >
-              新增访问主体
-            </Button>
+            <Space>
+              <Button
+                icon={<ImportOutlined />}
+                onClick={() => setImportOpen(true)}
+              >
+                导入
+              </Button>
+              <Button
+                type="primary"
+                icon={<PlusOutlined />}
+                onClick={() => setShowModal({ type: 'create', id: null })}
+              >
+                新增访问主体
+              </Button>
+            </Space>
           );
         }}
       >
@@ -313,12 +312,16 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
                         setShowModal({ type: 'edit', id: record.id })
                       }
                     />
-                    <Tooltip title="Generate SQL">
+                    <Tooltip title="导出">
                       <Button
                         size="small"
-                        icon={<CodeOutlined />}
+                        icon={<ExportOutlined />}
                         style={{ backgroundColor: 'transparent' }}
-                        onClick={() => handleShowSql(record)}
+                        onClick={() =>
+                          setExportEndpoint(
+                            `user/${encodeURIComponent(record.userid)}/export-token`,
+                          )
+                        }
                       />
                     </Tooltip>
                     <DeleteButton
@@ -350,12 +353,18 @@ export const UserListPage: React.FC<PropsWithChildren> = ({ children }) => {
         <CreateModal onClose={handleModalClose} />
       )}
 
-      {/* SQL Modal */}
-      <SqlModal
-        open={sqlModal.open}
-        onClose={() => setSqlModal({ open: false, title: '', sql: '' })}
-        title={sqlModal.title}
-        sql={sqlModal.sql}
+      <TransferExportModal
+        open={!!exportEndpoint}
+        exportTokenEndpoint={exportEndpoint}
+        entity="user"
+        onClose={() => setExportEndpoint(null)}
+      />
+      <TransferImportModal
+        open={importOpen}
+        onClose={() => setImportOpen(false)}
+        onSuccess={() => tableQueryResult?.refetch()}
+        previewEndpoint="user/import-preview"
+        confirmEndpoint="user/import-confirm"
       />
 
       {children}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/NodePropertyPanel.test.tsx

@@ -129,11 +129,18 @@ describe('NodePropertyPanel instance references', () => {
       configSchema: {
         type: 'object',
         properties: {
-          allowWrite: { type: 'boolean' },
-          sql: { type: 'string' },
+          functionRef: {
+            type: 'object',
+            properties: {
+              schema: { type: 'string' },
+              name: { type: 'string' },
+              identityArguments: { type: 'string' },
+            },
+          },
+          argumentBindings: { type: 'array' },
           timeoutSeconds: { type: 'integer' },
         },
-        required: ['allowWrite', 'sql'],
+        required: ['functionRef', 'argumentBindings'],
       },
       uiSchema: { widget: 'db-execute-config' },
     } as unknown as WorkflowNodeType;
@@ -157,8 +164,12 @@ describe('NodePropertyPanel instance references', () => {
                 label: 'Database Operation',
                 position: { x: 0, y: 0 },
                 config: {
-                  allowWrite: false,
-                  sql: 'SELECT 1',
+                  functionRef: {
+                    schema: 'workflow_api',
+                    name: 'refresh_summary',
+                    identityArguments: '',
+                  },
+                  argumentBindings: [],
                   timeoutSeconds: 3,
                 },
               })

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/ReadonlyNodePanel.test.tsx

@@ -9,28 +9,46 @@ const node: WorkflowNode = {
   type: 'db_execute',
   label: '查询待处理订单',
   position: { x: 0, y: 0 },
-  config: { allowWrite: false, sql: 'SELECT * FROM orders' },
+  config: {
+    functionRef: {
+      schema: 'workflow_api',
+      name: 'find_pending_orders',
+      identityArguments: '',
+    },
+    argumentBindings: [],
+  },
 };
 
 const nodeType = {
   id: '1',
   type: 'db_execute',
-  label: 'Database Operation',
-  description: 'Read records from PostgreSQL',
+  label: 'Database Function',
+  description: 'Call a PostgreSQL Function',
   category: 'ACTION',
   configSchema: {
     type: 'object',
     properties: {
-      allowWrite: { type: 'boolean', title: 'Allow writes' },
-      sql: { type: 'string', title: 'SQL' },
+      functionRef: {
+        type: 'object',
+        title: 'Function',
+        properties: {
+          schema: { type: 'string', title: 'Schema' },
+          name: { type: 'string', title: 'Name' },
+          identityArguments: { type: 'string', title: 'Arguments' },
+        },
+      },
+      argumentBindings: {
+        type: 'array',
+        title: 'Argument bindings',
+        items: { type: 'object' },
+      },
     },
   },
   uiSchema: {},
   outputSchema: {
     type: 'object',
     properties: {
-      rows: { type: 'array' },
-      rowCount: { type: 'number' },
+      result: {},
     },
   },
   outputs: [],
@@ -62,9 +80,9 @@ describe('ReadonlyNodePanel', () => {
       screen.getByRole('heading', { name: 'Node configuration' }),
     ).toBeInTheDocument();
     expect(screen.getByDisplayValue('查询待处理订单')).toBeDisabled();
-    expect(screen.getByDisplayValue('SELECT * FROM orders')).toBeDisabled();
+    expect(screen.getByDisplayValue('find_pending_orders')).toBeDisabled();
     expect(screen.getByText('No node template is used')).toBeInTheDocument();
-    expect(screen.getByText('input.rows')).toBeInTheDocument();
+    expect(screen.getByText('input.result')).toBeInTheDocument();
     expect(screen.queryByText(/"position"/)).not.toBeInTheDocument();
     expect(screen.getByText('Database Operation')).toBeInTheDocument();
     expect(screen.queryByText('Perform an action')).not.toBeInTheDocument();
@@ -82,7 +100,7 @@ describe('ReadonlyNodePanel', () => {
     fireEvent.click(screen.getByText('Advanced configuration'));
 
     expect(screen.getByText(/"position"/)).toBeInTheDocument();
-    expect(screen.getByText(/SELECT \* FROM orders/)).toBeInTheDocument();
+    expect(screen.getByText(/find_pending_orders/)).toBeInTheDocument();
     expect(
       screen.getByRole('button', { name: 'Copy JSON' }),
     ).toBeInTheDocument();

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/instance-detail.test.tsx

@@ -1,5 +1,11 @@
 import { describe, expect, it } from 'vitest';
-import { getStepStatus, shouldShowNodeError } from './instance-detail';
+import {
+  getDisplayNodeExecutions,
+  getErrorSummary,
+  getStepStatus,
+  getWorkflowFailureSummary,
+  shouldShowNodeError,
+} from './instance-detail';
 
 describe('Workflow instance cancellation display', () => {
   it('does not present a cancelled node as an error', () => {
@@ -23,4 +29,57 @@ describe('Workflow instance cancellation display', () => {
     ).toBe(true);
     expect(getStepStatus('FAILED')).toBe('error');
   });
+
+  it('shows the root cause instead of the generic Activity wrapper', () => {
+    const error = {
+      message: 'database connection refused',
+      errorType: 'DatabaseConnectionError',
+      stack: 'DatabaseConnectionError: database connection refused',
+      causes: [
+        { name: 'ActivityFailure', message: 'Activity task failed' },
+        {
+          name: 'ApplicationFailure',
+          message: 'database connection refused',
+        },
+      ],
+    };
+
+    expect(getErrorSummary(error)).toBe('database connection refused');
+    expect(
+      getWorkflowFailureSummary({ error, failedNodeId: 'database-node' }),
+    ).toEqual({
+      message: 'database connection refused',
+      failedNodeId: 'database-node',
+    });
+  });
+
+  it('shows a completed trigger for legacy instances without a trigger execution record', () => {
+    const executions = getDisplayNodeExecutions({
+      context: { workflow: { requestId: 42 } },
+      startedAt: '2026-09-02T10:00:00.000Z',
+      nodeExecutions: [],
+      dsl: {
+        nodes: [
+          {
+            id: 'event-start',
+            type: 'event_trigger',
+            label: '业务事件触发',
+            config: {},
+            position: { x: 0, y: 0 },
+          },
+        ],
+        edges: [],
+      },
+    });
+
+    expect(executions).toEqual([
+      expect.objectContaining({
+        nodeId: 'event-start',
+        nodeType: 'event_trigger',
+        status: 'COMPLETED',
+        input: { requestId: 42 },
+        output: { requestId: 42 },
+      }),
+    ]);
+  });
 });

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/instance-detail.tsx

@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import {
+  Alert,
   Button,
   Card,
   Descriptions,
@@ -93,6 +94,38 @@ interface InstanceDetail {
   dsl?: WorkflowDSL;
 }
 
+export function getDisplayNodeExecutions(
+  instance: Pick<
+    InstanceDetail,
+    'context' | 'dsl' | 'nodeExecutions' | 'startedAt'
+  >,
+): NodeExecution[] {
+  if (!instance.dsl || !instance.startedAt) return instance.nodeExecutions;
+
+  const recordedNodeIds = new Set(
+    instance.nodeExecutions.map((execution) => execution.nodeId),
+  );
+  const workflowInput = instance.context?.workflow ?? null;
+  const legacyTriggerExecutions = instance.dsl.nodes
+    .filter(
+      (node) => node.type.endsWith('_trigger') && !recordedNodeIds.has(node.id),
+    )
+    .map<NodeExecution>((node) => ({
+      id: `legacy-trigger-${node.id}`,
+      nodeId: node.id,
+      nodeType: node.type,
+      nodeLabel: node.label ?? null,
+      status: 'COMPLETED',
+      input: workflowInput,
+      output: workflowInput,
+      error: null,
+      startedAt: instance.startedAt,
+      finishedAt: instance.startedAt,
+    }));
+
+  return [...legacyTriggerExecutions, ...instance.nodeExecutions];
+}
+
 function formatDuration(start: string | null, end: string | null): string {
   if (!start) return '—';
   const endTime = end ? new Date(end).getTime() : Date.now();
@@ -128,6 +161,35 @@ export function shouldShowNodeError(
   return execution.status === 'FAILED' && Boolean(execution.error);
 }
 
+export function getErrorSummary(error: unknown): string {
+  if (typeof error === 'string') return error;
+  if (error && typeof error === 'object') {
+    const message = (error as Record<string, unknown>).message;
+    if (typeof message === 'string' && message.trim()) return message;
+    try {
+      return JSON.stringify(error);
+    } catch {
+      return String(error);
+    }
+  }
+  return String(error ?? 'Unknown error');
+}
+
+export function getWorkflowFailureSummary(
+  result: unknown,
+): { message: string; failedNodeId?: string } | null {
+  if (!result || typeof result !== 'object' || Array.isArray(result))
+    return null;
+  const record = result as Record<string, unknown>;
+  if (record.error === undefined || record.error === null) return null;
+  const failedNodeId =
+    typeof record.failedNodeId === 'string' ? record.failedNodeId : undefined;
+  return {
+    message: getErrorSummary(record.error),
+    ...(failedNodeId && { failedNodeId }),
+  };
+}
+
 export default function WorkflowInstanceDetailPage() {
   const { t } = useTranslation('workflow');
   const { instanceId } = useParams<{ instanceId: string }>();
@@ -251,9 +313,13 @@ export default function WorkflowInstanceDetailPage() {
 
   if (!data) return null;
 
+  const displayNodeExecutions = getDisplayNodeExecutions(data);
+  const instanceHasFinished = ['COMPLETED', 'FAILED', 'CANCELLED'].includes(
+    data.status,
+  );
   const statusCfg = STATUS_TAG[data.status] || STATUS_TAG.PENDING;
   const selectedExecution = selectedNodeId
-    ? data.nodeExecutions.find((ne) => ne.nodeId === selectedNodeId)
+    ? displayNodeExecutions.find((ne) => ne.nodeId === selectedNodeId)
     : null;
   const selectedDslNode =
     selectedNodeId && data.dsl
@@ -268,6 +334,8 @@ export default function WorkflowInstanceDetailPage() {
         (attempt) => attempt.retryFromNodeId === selectedNodeId,
       )
     : undefined;
+  const workflowFailure =
+    data.status === 'FAILED' ? getWorkflowFailureSummary(data.result) : null;
 
   return (
     <div className="workflow-page-stack">
@@ -420,6 +488,19 @@ export default function WorkflowInstanceDetailPage() {
             </Descriptions.Item>
           )}
         </Descriptions>
+        {workflowFailure && (
+          <Alert
+            type="error"
+            showIcon
+            style={{ marginTop: 16 }}
+            message={workflowFailure.message}
+            description={
+              workflowFailure.failedNodeId
+                ? `${t('instanceDetail.failedNode')}: ${workflowFailure.failedNodeId}`
+                : undefined
+            }
+          />
+        )}
         {data.result !== null && data.result !== undefined && (
           <div style={{ marginTop: 16 }}>
             <Text strong style={{ display: 'block', marginBottom: 8 }}>
@@ -474,14 +555,14 @@ export default function WorkflowInstanceDetailPage() {
           // Timeline View
           <div style={{ display: 'flex', gap: 16 }}>
             <div style={{ flex: 1 }}>
-              {data.nodeExecutions.length === 0 ? (
+              {displayNodeExecutions.length === 0 ? (
                 <Text type="secondary">No node executions recorded yet.</Text>
               ) : (
                 <Steps
                   direction="vertical"
                   size="small"
                   current={-1}
-                  items={data.nodeExecutions.map((ne) => {
+                  items={displayNodeExecutions.map((ne) => {
                     const isApprovalPending =
                       ne.nodeType === 'approval' &&
                       ne.status === 'RUNNING' &&
@@ -590,10 +671,7 @@ export default function WorkflowInstanceDetailPage() {
                           </span>
                           {shouldShowNodeError(ne) && (
                             <div style={{ color: '#ff4d4f', marginTop: 4 }}>
-                              Error:{' '}
-                              {typeof ne.error === 'object'
-                                ? JSON.stringify(ne.error)
-                                : String(ne.error)}
+                              Error: {getErrorSummary(ne.error)}
                             </div>
                           )}
                         </div>
@@ -717,7 +795,7 @@ export default function WorkflowInstanceDetailPage() {
                         borderRadius: 4,
                         fontSize: 11,
                         color: '#ff4d4f',
-                        maxHeight: 150,
+                        maxHeight: 320,
                         overflow: 'auto',
                       }}
                     >
@@ -739,7 +817,7 @@ export default function WorkflowInstanceDetailPage() {
                 <div style={{ flex: 1, height: 500, minHeight: 500 }}>
                   <EnhancedFlowRenderer
                     dsl={data.dsl}
-                    nodeExecutions={data.nodeExecutions}
+                    nodeExecutions={displayNodeExecutions}
                     showExecutionStatus={true}
                     selectedNodeId={selectedNodeId}
                     readonly={true}
@@ -875,7 +953,7 @@ export default function WorkflowInstanceDetailPage() {
                                 borderRadius: 4,
                                 fontSize: 11,
                                 color: '#ff4d4f',
-                                maxHeight: 150,
+                                maxHeight: 320,
                                 overflow: 'auto',
                               }}
                             >
@@ -974,7 +1052,9 @@ export default function WorkflowInstanceDetailPage() {
                           >
                             {selectedNodeWasReused
                               ? t('instanceDetail.reusedResult')
-                              : 'Not Executed'}
+                              : instanceHasFinished
+                                ? 'Not Executed / Skipped'
+                                : 'Not Executed'}
                           </Tag>
                         </div>
                         <Descriptions column={1} size="small">
@@ -985,7 +1065,9 @@ export default function WorkflowInstanceDetailPage() {
                             <Text type="secondary">
                               {selectedNodeWasReused
                                 ? t('instanceDetail.reusedResultDescription')
-                                : 'Waiting for execution'}
+                                : instanceHasFinished
+                                  ? 'Not executed in this run'
+                                  : 'Waiting for execution'}
                             </Text>
                           </Descriptions.Item>
                         </Descriptions>

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/node-instance-show.css

@@ -98,6 +98,19 @@
   background: var(--ant-color-fill-quaternary);
 }
 
+.node-instance-show__raw-configuration {
+  max-width: 960px;
+  margin: 0;
+  padding: 16px;
+  overflow: auto;
+  border: 1px solid var(--ant-color-border-secondary);
+  border-radius: 10px;
+  background: var(--ant-color-fill-quaternary);
+  font-family: var(--ant-font-family-code);
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+}
+
 .node-instance-show__empty {
   margin: 0;
   padding: 28px 0;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/schema-form/default-widgets.tsx

@@ -5,7 +5,7 @@ import { CodeConfigEditor } from '../widgets/CodeConfigEditor';
 import { CronTriggerConfigEditor } from '../widgets/CronTriggerConfigEditor';
 import { DbExecuteConfigEditor } from '../widgets/DbExecuteConfigEditor';
 import { DelayConfigEditor } from '../widgets/DelayConfigEditor';
-import { EventTriggerConfigEditor } from '../widgets/EventTriggerConfigEditor';
+import { EventTriggerLifecycleConfigEditor } from '../widgets/EventTriggerLifecycleConfigEditor';
 import { ExternalRequestConfigEditor } from '../widgets/ExternalRequestConfigEditor';
 import { ExternalWaitConfigEditor } from '../widgets/ExternalWaitConfigEditor';
 import { ForEachConfigEditor } from '../widgets/ForEachConfigEditor';
@@ -14,9 +14,9 @@ import { HumanApprovalConfigEditor } from '../widgets/HumanApprovalConfigEditor'
 import { IfElseConfigEditor } from '../widgets/IfElseConfigEditor';
 import { ManualTriggerConfigEditor } from '../widgets/ManualTriggerConfigEditor';
 import { ParallelConfigEditor } from '../widgets/ParallelConfigEditor';
+import { SubjectPicker } from '../widgets/SubjectPicker';
 import { SubWorkflowConfigEditor } from '../widgets/SubWorkflowConfigEditor';
 import { SwitchConfigEditor } from '../widgets/SwitchConfigEditor';
-import { SubjectPicker } from '../widgets/SubjectPicker';
 import {
   widgetRegistry,
   type WidgetComponent,
@@ -130,7 +130,7 @@ const DEFAULT_WIDGETS = {
   'parallel-config': ParallelConfigEditor,
   'sub-workflow-config': SubWorkflowConfigEditor,
   'db-execute-config': DbExecuteConfigEditor,
-  'event-trigger-config': EventTriggerConfigEditor,
+  'event-trigger-config': EventTriggerLifecycleConfigEditor,
   'if-else-config': IfElseConfigEditor,
   'manual-trigger-config': ManualTriggerConfigEditor,
   'switch-config': SwitchConfigEditor,

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/show.tsx

@@ -308,7 +308,14 @@ export default function NodeInstanceShowPage() {
               />
             </div>
           </Form>
-        ) : null}
+        ) : (
+          <pre
+            className="node-instance-show__raw-configuration"
+            aria-label={t('nodeInstance.rawConfiguration')}
+          >
+            {JSON.stringify(record.config, null, 2)}
+          </pre>
+        )}
       </Card>
 
       <Card>