@gadmin2n/schematics 0.0.142 → 0.0.144

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

@@ -26,6 +26,7 @@ import { useLocation } from 'react-router-dom';
 import {
   getColumns,
   ModelType,
+  pick,
   produceModel,
   tableSearchBar,
 } from '@gadmin2n/react-common';
@@ -123,19 +124,37 @@ export const GameList: React.FC<IResourceComponentsProps> = () => {
     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<Game>({
     maxItemCount: 200,
     pageSize: 100,
+    ...(exportAllFields?.length
+      ? { mapData: (item: Game) => 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<Game>({
     pageSize: 100,
     meta: { where: { id: { in: batchOps.selectedRowKeys.map(Number) } } },
+    ...(exportSelectedFields?.length
+      ? { mapData: (item: Game) => pick(item, exportSelectedFields) }
+      : {}),
   });
 
   // Import

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

@@ -9,11 +9,7 @@ import {
   Typography,
   message,
 } from 'antd';
-import {
-  CheckCircleOutlined,
-  ReloadOutlined,
-  SyncOutlined,
-} from '@ant-design/icons';
+import { CheckCircleOutlined, ReloadOutlined } from '@ant-design/icons';
 import { customRequest } from 'helpers/http';
 import { PageHeader } from 'components';
 import { PAGE_WRAPPER_STYLE } from 'constants/layout';
@@ -31,11 +27,6 @@ interface InboxItem {
     expiresAt: string | null;
     approvalRule: Record<string, unknown>;
     rejectionRule: Record<string, unknown>;
-    dispatch?: {
-      state: 'DISPATCHING' | 'WAITING_APPROVAL' | 'DISPATCH_FAILED';
-      canRetry: boolean;
-      error?: string;
-    };
   };
 }
 
@@ -43,7 +34,6 @@ 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 () => {
@@ -85,23 +75,6 @@ export default function ApprovalInboxPage() {
     }
   }
 
-  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={PAGE_WRAPPER_STYLE}>
       <PageHeader
@@ -139,22 +112,9 @@ export default function ApprovalInboxPage() {
             },
             {
               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>;
-              },
+              render: (_, item) => (
+                <Tag color="gold">{item.request.status}</Tag>
+              ),
             },
             {
               title: 'Started',
@@ -171,28 +131,16 @@ export default function ApprovalInboxPage() {
             {
               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>
-                ),
+              render: (_, item) => (
+                <Button
+                  type="primary"
+                  icon={<CheckCircleOutlined />}
+                  disabled={submitting}
+                  onClick={() => setSelected(item)}
+                >
+                  Decide
+                </Button>
+              ),
             },
           ]}
         />

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

@@ -52,10 +52,10 @@ import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
 
 import { customRequest } from '@/helpers/http';
 
-import { AssignRolesModal } from './Components/AssignRolesModal';
-import { EditPageModal } from './Components/EditPageModal';
-import { CreatePageModal } from './Components/CreatePageModal';
-import { PageDetailDrawer } from './Components/PageDetailDrawer';
+import { AssignRolesModal } from './components/AssignRolesModal';
+import { EditPageModal } from './components/EditPageModal';
+import { CreatePageModal } from './components/CreatePageModal';
+import { PageDetailDrawer } from './components/PageDetailDrawer';
 import type {
   PageMenuTreeNode,
   PageResourceAssignment,

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

@@ -13,9 +13,9 @@ import {
   useGetIdentity,
 } from '@refinedev/core';
 import type { Resource } from './types';
-import { EditModal } from './Components/EditModal';
-import { CreateModal } from './Components/CreateModal';
-import { ResourceDetailDrawer } from './Components/ResourceDetailDrawer';
+import { EditModal } from './components/EditModal';
+import { CreateModal } from './components/CreateModal';
+import { ResourceDetailDrawer } from './components/ResourceDetailDrawer';
 import { SqlModal, generateResourceSql } from '../../components/SqlModal';
 import { PageHeader } from 'components';
 import { PAGE_WRAPPER_STYLE } from 'constants/layout';

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

@@ -3,12 +3,12 @@ import { useTable } from '@refinedev/antd';
 import { useGetLocale, useGetIdentity } from '@refinedev/core';
 import { Table, Button, Card, Space, Tooltip, message } from 'antd';
 
-import { EditModal } from './Components/EditModal';
-import { CreateModal } from './Components/CreateModal';
+import { EditModal } from './components/EditModal';
+import { CreateModal } from './components/CreateModal';
 import type { RolePageTreeNode } from './types';
 import { useRolePage } from './hooks/useRolePage';
 import { EditOutlined, EyeOutlined, CodeOutlined } from '@ant-design/icons';
-import { RoleDetailDrawer } from './Components/RoleDetailDrawer';
+import { RoleDetailDrawer } from './components/RoleDetailDrawer';
 import { SqlModal, generateRoleSql } from '../../components/SqlModal';
 import { customRequest } from '@/helpers/http';
 import { buildPageTree } from '@/helpers/page-tree';

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

@@ -0,0 +1,29 @@
+import { ReactFlowProvider } from '@xyflow/react';
+import { render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import '../../../i18n';
+import { CustomNode } from './CustomNode';
+
+describe('CustomNode', () => {
+  it('shows the node type separately from its custom label', () => {
+    render(
+      <ReactFlowProvider>
+        <CustomNode
+          {...({
+            id: 'approval-1',
+            data: {
+              label: 'MyOA 人工审批',
+              type: 'approval',
+              category: 'APPROVAL',
+              isSelected: false,
+              readonly: true,
+            },
+          } as any)}
+        />
+      </ReactFlowProvider>,
+    );
+
+    expect(screen.getByText('人工审批节点')).toBeInTheDocument();
+    expect(screen.getByText('MyOA 人工审批')).toBeInTheDocument();
+  });
+});

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

@@ -2,12 +2,13 @@ import { Handle, Position, type NodeProps } from '@xyflow/react';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { LookupPort, RuntimePorts } from '../utils/resolveLookupPorts';
+import { NodeTypeBadge } from './NodeTypeBadge';
 
 const CATEGORY_COLORS: Record<string, { bg: string; border: string }> = {
   TRIGGER: { bg: '#e6f7ff', border: '#91caff' },
   ACTION: { bg: '#f6ffed', border: '#b7eb8f' },
   CONDITION: { bg: '#fff7e6', border: '#ffd591' },
-  LOOP: { bg: '#f9f0ff', border: '#d3adf7' },
+  FLOW_CONTROL: { bg: '#f9f0ff', border: '#d3adf7' },
   APPROVAL: { bg: '#fff1f0', border: '#ffa39e' },
   SUB_WORKFLOW: { bg: '#f0f5ff', border: '#adc6ff' },
 };
@@ -136,7 +137,8 @@ export const CustomNode = memo(({ data }: NodeProps) => {
           {runtimePorts.inputLabel}
         </span>
       )}
-      <div>{nodeData.label}</div>
+      <NodeTypeBadge type={nodeData.type} borderColor={colors.border} />
+      <div style={{ fontWeight: 500 }}>{nodeData.label}</div>
       {lookupRowCount > 0 && (
         <div
           style={{

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

@@ -150,11 +150,9 @@ function EnhancedFlowCanvas({
 
       const nodeData: any = {
         label:
-          n.type === 'approval_request_trigger'
-            ? t('nodeTypes.callable_trigger')
-            : n.type === 'webhook_trigger'
-              ? t('nodeTypes.webhook_trigger')
-              : n.label,
+          n.type === 'webhook_trigger'
+            ? t('nodeTypes.webhook_trigger')
+            : n.label,
         category,
         type: n.type,
         outputs: resolveOutputs(n, nodeTypeMap?.[n.type]),
@@ -502,7 +500,7 @@ function EnhancedFlowCanvas({
               TRIGGER: '#91caff',
               ACTION: '#b7eb8f',
               CONDITION: '#ffd591',
-              LOOP: '#d3adf7',
+              FLOW_CONTROL: '#d3adf7',
               APPROVAL: '#ffa39e',
               SUB_WORKFLOW: '#adc6ff',
             };

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import { ReactFlowProvider } from '@xyflow/react';
 import { describe, expect, it } from 'vitest';
+import '../../../i18n';
 import { ExecutionStatusNode } from './ExecutionStatusNode';
 
 describe('ExecutionStatusNode', () => {
@@ -14,6 +15,7 @@ describe('ExecutionStatusNode', () => {
             data: {
               label: '审批人查询',
               category: 'ACTION',
+              type: 'code',
               isSelected: false,
               readonly: true,
               lookupPorts: [
@@ -58,5 +60,6 @@ describe('ExecutionStatusNode', () => {
         '[data-handleid="lookup:dynamic_user_groups"].source',
       ),
     ).toBeInTheDocument();
+    expect(container).toHaveTextContent('代码处理节点');
   });
 });

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

@@ -8,12 +8,13 @@ import { Handle, Position, type NodeProps } from '@xyflow/react';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { LookupPort, RuntimePorts } from '../utils/resolveLookupPorts';
+import { NodeTypeBadge } from './NodeTypeBadge';
 
 const CATEGORY_COLORS: Record<string, { bg: string; border: string }> = {
   TRIGGER: { bg: '#e6f7ff', border: '#91caff' },
   ACTION: { bg: '#f6ffed', border: '#b7eb8f' },
   CONDITION: { bg: '#fff7e6', border: '#ffd591' },
-  LOOP: { bg: '#f9f0ff', border: '#d3adf7' },
+  FLOW_CONTROL: { bg: '#f9f0ff', border: '#d3adf7' },
   APPROVAL: { bg: '#fff1f0', border: '#ffa39e' },
   SUB_WORKFLOW: { bg: '#f0f5ff', border: '#adc6ff' },
 };
@@ -249,6 +250,7 @@ export const ExecutionStatusNode = memo(({ data }: NodeProps) => {
         </div>
       )}
 
+      <NodeTypeBadge type={nodeData.type} borderColor={borderColor} />
       <div style={{ fontWeight: 500, marginBottom: nodeData.duration ? 4 : 0 }}>
         {nodeData.label}
       </div>

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

@@ -161,11 +161,9 @@ function FlowCanvas({
         selected: n.id === selectedNodeId,
         data: {
           label:
-            n.type === 'approval_request_trigger'
-              ? t('nodeTypes.callable_trigger')
-              : n.type === 'webhook_trigger'
-                ? t('nodeTypes.webhook_trigger')
-                : n.label,
+            n.type === 'webhook_trigger'
+              ? t('nodeTypes.webhook_trigger')
+              : n.label,
           category,
           type: n.type,
           outputs: resolveOutputs(n, nodeTypeMap?.[n.type]),
@@ -444,7 +442,7 @@ function FlowCanvas({
               TRIGGER: '#91caff',
               ACTION: '#b7eb8f',
               CONDITION: '#ffd591',
-              LOOP: '#d3adf7',
+              FLOW_CONTROL: '#d3adf7',
               APPROVAL: '#ffa39e',
               SUB_WORKFLOW: '#adc6ff',
             };

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

@@ -35,8 +35,6 @@ function nodeType(
     | 'return_result'
     | 'http_request'
     | 'webhook_trigger'
-    | 'submit_approval_result'
-    | 'submit_external_result'
     | 'external_wait',
 ): WorkflowNodeType {
   return {
@@ -52,30 +50,23 @@ function nodeType(
         type === 'code'
           ? { code: { type: 'string' } }
           : type === 'return_result'
-            ? {
-                resultType: { type: 'string' },
-                path: { type: 'string' },
-              }
+            ? {}
             : type === 'webhook_trigger'
               ? {
                   method: { type: 'string' },
                   path: { type: 'string' },
                   secret: { type: 'string' },
                 }
-              : type === 'submit_approval_result' ||
-                  type === 'submit_external_result'
-                ? { inputBindings: { type: 'object' } }
-                : type === 'external_wait'
-                  ? {
-                      dispatchWorkflowId: { type: 'string' },
-                      outcomes: { type: 'array' },
-                      timeout: { type: 'object' },
-                    }
-                  : {
-                      connectionRef: { type: 'string' },
-                      method: { type: 'string' },
-                      path: { type: 'string' },
-                    },
+              : type === 'external_wait'
+                ? {
+                    callbackTokenBinding: { type: 'object' },
+                    timeout: { type: 'object' },
+                  }
+                : {
+                    connectionRef: { type: 'string' },
+                    method: { type: 'string' },
+                    path: { type: 'string' },
+                  },
     },
     uiSchema: {},
     inputSchema: {},
@@ -86,8 +77,6 @@ function nodeType(
     instancePolicy:
       type === 'return_result' ||
       type === 'webhook_trigger' ||
-      type === 'submit_approval_result' ||
-      type === 'submit_external_result' ||
       type === 'external_wait'
         ? 'INLINE_ONLY'
         : 'OPTIONAL',
@@ -100,8 +89,6 @@ function dropNode(
     | 'return_result'
     | 'http_request'
     | 'webhook_trigger'
-    | 'submit_approval_result'
-    | 'submit_external_result'
     | 'external_wait',
 ) {
   fireEvent.drop(screen.getByTestId('react-flow'), {
@@ -117,7 +104,7 @@ describe.each([
   ['FlowRenderer', FlowRenderer],
   ['EnhancedFlowRenderer', EnhancedFlowRenderer],
 ] as const)('%s new-node defaults', (_name, Renderer) => {
-  it('gives a new Return Result node ordinary data from the previous step', () => {
+  it('creates a zero-config Finish and return node', () => {
     const onDslChange = vi.fn();
     render(
       <Renderer dsl={{ nodes: [], edges: [] }} onDslChange={onDslChange} />,
@@ -130,12 +117,7 @@ describe.each([
         nodes: [
           expect.objectContaining({
             type: 'return_result',
-            config: expect.objectContaining({
-              resultType: 'JSON',
-              sourceMode: 'INPUT',
-              httpStatusCode: 200,
-              httpHeaders: {},
-            }),
+            config: {},
           }),
         ],
       }),
@@ -198,61 +180,7 @@ describe.each([
     );
   });
 
-  it('reads a new approval result from the previous node by default', () => {
-    const onDslChange = vi.fn();
-    render(
-      <Renderer dsl={{ nodes: [], edges: [] }} onDslChange={onDslChange} />,
-    );
-
-    dropNode('submit_approval_result');
-
-    expect(onDslChange).toHaveBeenCalledWith(
-      expect.objectContaining({
-        nodes: [
-          expect.objectContaining({
-            type: 'submit_approval_result',
-            config: {
-              inputBindings: {
-                requestId: { source: 'INPUT', path: 'requestId' },
-                channelRef: { source: 'INPUT', path: 'channelRef' },
-                eventId: { source: 'INPUT', path: 'eventId' },
-                approverId: { source: 'INPUT', path: 'approverId' },
-                decision: { source: 'INPUT', path: 'decision' },
-              },
-            },
-          }),
-        ],
-      }),
-    );
-  });
-
-  it('reads a new external result from the previous node by default', () => {
-    const onDslChange = vi.fn();
-    render(
-      <Renderer dsl={{ nodes: [], edges: [] }} onDslChange={onDslChange} />,
-    );
-
-    dropNode('submit_external_result');
-
-    expect(onDslChange).toHaveBeenCalledWith(
-      expect.objectContaining({
-        nodes: [
-          expect.objectContaining({
-            type: 'submit_external_result',
-            config: {
-              inputBindings: {
-                callbackToken: { source: 'INPUT', path: 'callbackToken' },
-                eventId: { source: 'INPUT', path: 'eventId' },
-                outcome: { source: 'INPUT', path: 'outcome' },
-              },
-            },
-          }),
-        ],
-      }),
-    );
-  });
-
-  it('gives a new external wait understandable result branches', () => {
+  it('binds a new external wait to the supplied token and deadline', () => {
     const onDslChange = vi.fn();
     render(
       <Renderer dsl={{ nodes: [], edges: [] }} onDslChange={onDslChange} />,
@@ -266,13 +194,16 @@ describe.each([
           expect.objectContaining({
             type: 'external_wait',
             config: expect.objectContaining({
-              outcomes: [
-                { code: 'COMPLETED', label: '已完成' },
-                { code: 'REJECTED', label: '已拒绝' },
-              ],
+              callbackTokenBinding: {
+                source: 'WORKFLOW',
+                path: 'callbackToken',
+              },
               timeout: {
-                durationSeconds: 86400,
-                outcome: 'TIMEOUT',
+                mode: 'DEADLINE',
+                deadlineBinding: {
+                  source: 'WORKFLOW',
+                  path: 'expiresAt',
+                },
               },
             }),
           }),