@gadmin2n/schematics 0.0.151 → 0.0.153

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/hooks/useDynamicResources.tsx

@@ -6,8 +6,6 @@ import {
   BgColorsOutlined,
   ScheduleOutlined,
   ApartmentOutlined,
-  TeamOutlined,
-  UserOutlined,
 } from '@ant-design/icons';
 import { getRoutePath } from 'config/routeRegistry';
 import { useUserPageAccess } from './useUserPageAccess';
@@ -48,8 +46,6 @@ export const iconMapping: Record<string, React.ReactNode> = {
   canvas: <BgColorsOutlined />,
   agenda: <ScheduleOutlined />,
   workflow: <ApartmentOutlined />,
-  person_directory: <UserOutlined />,
-  people_group: <TeamOutlined />,
 };
 
 // Pages whose children are tabs (not separate menu items)

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/locales/en/workflow.json

@@ -257,6 +257,15 @@
     "runOnceEach": "Run once for each item",
     "timeoutMilliseconds": "Timeout (milliseconds)"
   },
+  "settings": {
+    "title": "Feature Settings",
+    "subtitle": "Manage the service registration, connections, business events and people data that Workflow depends on.",
+    "tabTenant": "Service Registration",
+    "tabConnections": "Connections",
+    "tabEvents": "Business Events",
+    "tabPeople": "People Directory",
+    "tabGroups": "People Groups"
+  },
   "connection": {
     "title": "Connections",
     "subtitle": "Manage external system addresses and encrypted credentials for reuse by Workflow nodes.",
@@ -581,6 +590,9 @@
       }
     },
     "database": {
+      "mode": "Execution mode",
+      "functionMode": "Database Function",
+      "sqlMode": "Raw SQL",
       "function": "Database Function",
       "functionHint": "Only Functions in workflow_api in the current GAdmin database are shown.",
       "selectFunction": "Select a Function",
@@ -588,6 +600,17 @@
       "functionMissing": "This Function no longer exists. Select another Function.",
       "returnType": "Return type: {{type}}",
       "noArguments": "This Function has no arguments.",
+      "sql": "SQL statement",
+      "readOnly": "Read-only SQL",
+      "writeEnabled": "Writes enabled",
+      "allowWrite": "Allow writes",
+      "readOnlyDescription": "When off, this node can only query data.",
+      "readWriteDescription": "When on, this node can query, insert, update, or delete data.",
+      "parameters": "Parameter values",
+      "parameter": "Parameter",
+      "value": "Value",
+      "parametersHint": "Values are used by $1, $2, and so on in order.",
+      "addParameter": "Add parameter value",
       "timeout": "Timeout",
       "seconds": "seconds"
     },
@@ -999,6 +1022,7 @@
     "total": "Total",
     "last24h": "24H",
     "running": "Running",
+    "waitingRetry": "Waiting to retry",
     "pending": "Pending",
     "average24h": "Avg (24H)",
     "averageTotal": "Avg (Total)"
@@ -1030,6 +1054,7 @@
     "pending": "Pending",
     "completed": "Completed",
     "running": "Running",
+    "waitingRetry": "Waiting to retry",
     "failed": "Failed",
     "cancelled": "Cancelled",
     "publishedStatus": "Published",
@@ -1071,6 +1096,7 @@
     "statuses": {
       "pending": "Pending",
       "running": "Running",
+      "waiting_retry": "Waiting to retry",
       "completed": "Completed",
       "failed": "Failed",
       "cancelled": "Cancelled"
@@ -1093,15 +1119,11 @@
     "retryAllStarted": "The full Workflow retry has started",
     "retryFromNode": "Retry from here",
     "retryFromNodeConfirm": "Run again from “{{name}}”?",
-    "retryFromNodeDescription": "Successful earlier results will be reused and the failed run will be kept.",
-    "retryFromNodeStarted": "Retry started from the failed node",
+    "retryFromNodeDescription": "The same run will retry this failed node, then continue with the remaining nodes.",
+    "retryFromNodeStarted": "The failed node is retrying in the same run",
     "retryFromNodeFailed": "Unable to retry from this node",
     "viewRetryAttempt": "View retry #{{id}}",
-    "retrySource": "Resumed from",
-    "reusedResults": "Earlier results",
-    "reusedResultsCount": "Reused results from {{count}} successful nodes",
-    "reusedResult": "Reused earlier result",
-    "reusedResultDescription": "This node succeeded earlier, so its result was reused for this run."
+    "retrySource": "Resumed from"
   },
   "nodeTypeBadge": "{{type}} node",
   "nodeCategories": {

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/locales/zh_CN/workflow.json

@@ -257,6 +257,15 @@
     "runOnceEach": "对每一项分别运行",
     "timeoutMilliseconds": "超时时间（毫秒）"
   },
+  "settings": {
+    "title": "功能设置",
+    "subtitle": "统一管理 Workflow 运行依赖的服务注册、连接、业务事件与人员数据。",
+    "tabTenant": "服务注册",
+    "tabConnections": "连接管理",
+    "tabEvents": "业务事件",
+    "tabPeople": "人员目录",
+    "tabGroups": "人员组"
+  },
   "connection": {
     "title": "连接管理",
     "subtitle": "集中管理外部系统地址和加密凭据，供 Workflow 节点复用。",
@@ -581,6 +590,9 @@
       }
     },
     "database": {
+      "mode": "执行方式",
+      "functionMode": "数据库 Function",
+      "sqlMode": "Raw SQL",
       "function": "数据库 Function",
       "functionHint": "只显示当前 GAdmin 数据库 workflow_api 中的 Function。",
       "selectFunction": "选择 Function",
@@ -588,6 +600,17 @@
       "functionMissing": "当前 Function 已不存在，请重新选择。",
       "returnType": "返回类型：{{type}}",
       "noArguments": "这个 Function 不需要参数。",
+      "sql": "SQL 语句",
+      "readOnly": "只读 SQL",
+      "writeEnabled": "允许写入",
+      "allowWrite": "允许写入",
+      "readOnlyDescription": "关闭时只能查询数据。",
+      "readWriteDescription": "开启后可以查询、新增、更新或删除数据。",
+      "parameters": "参数值",
+      "parameter": "参数",
+      "value": "值",
+      "parametersHint": "SQL 中的 $1、$2… 会依次使用这里的值。",
+      "addParameter": "添加参数值",
       "timeout": "超时时间",
       "seconds": "秒"
     },
@@ -999,6 +1022,7 @@
     "total": "总计",
     "last24h": "24 小时",
     "running": "运行中",
+    "waitingRetry": "等待重试",
     "pending": "等待中",
     "average24h": "平均耗时（24 小时）",
     "averageTotal": "平均耗时（全部）"
@@ -1030,6 +1054,7 @@
     "pending": "等待中",
     "completed": "已完成",
     "running": "运行中",
+    "waitingRetry": "等待重试",
     "failed": "失败",
     "cancelled": "已取消",
     "publishedStatus": "已发布",
@@ -1071,6 +1096,7 @@
     "statuses": {
       "pending": "等待中",
       "running": "运行中",
+      "waiting_retry": "等待重试",
       "completed": "已完成",
       "failed": "失败",
       "cancelled": "已取消"
@@ -1093,15 +1119,11 @@
     "retryAllStarted": "已开始重新运行整个流程",
     "retryFromNode": "从这里重试",
     "retryFromNodeConfirm": "从“{{name}}”重新执行吗？",
-    "retryFromNodeDescription": "将复用此前成功节点的结果，原失败记录会保留。",
-    "retryFromNodeStarted": "已从失败节点开始重试",
+    "retryFromNodeDescription": "将在当前运行中重试这个失败节点，成功后继续执行后续节点。",
+    "retryFromNodeStarted": "已在当前运行中重试失败节点",
     "retryFromNodeFailed": "无法从该节点重试",
     "viewRetryAttempt": "查看重试 #{{id}}",
-    "retrySource": "恢复来源",
-    "reusedResults": "前序结果",
-    "reusedResultsCount": "已复用 {{count}} 个成功节点的结果",
-    "reusedResult": "复用前序结果",
-    "reusedResultDescription": "这个节点此前已成功，本次直接复用其结果。"
+    "retrySource": "恢复来源"
   },
   "nodeTypeBadge": "{{type}}节点",
   "nodeCategories": {

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

@@ -18,8 +18,7 @@ import {
   message,
   type TableColumnsType,
 } from 'antd';
-import { PageHeader } from 'components';
-import { PAGE_WRAPPER_STYLE, SEARCH_CARD_PROPS } from 'constants/layout';
+import { SEARCH_CARD_PROPS } from 'constants/layout';
 import { useCallback, useEffect, useState } from 'react';
 import { PeopleGroupModal } from './PeopleGroupModal';
 import {
@@ -153,11 +152,23 @@ export default function PeopleGroupsPage() {
   ];
 
   return (
-    <div style={PAGE_WRAPPER_STYLE}>
-      <PageHeader
-        title="人员组"
-        subtitle="将人员或已有人员组组合为可复用的审批对象。"
-        extra={
+    <>
+      <Card {...SEARCH_CARD_PROPS}>
+        <div
+          style={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            flexWrap: 'wrap',
+            gap: 8,
+          }}
+        >
+          <Input.Search
+            allowClear
+            placeholder="搜索名称或组标识"
+            style={{ width: 280 }}
+            onSearch={setQuery}
+          />
           <Space>
             <Button icon={<ReloadOutlined />} onClick={load} />
             <Button
@@ -168,15 +179,7 @@ export default function PeopleGroupsPage() {
               新建人员组
             </Button>
           </Space>
-        }
-      />
-      <Card {...SEARCH_CARD_PROPS}>
-        <Input.Search
-          allowClear
-          placeholder="搜索名称或组标识"
-          style={{ width: 280 }}
-          onSearch={setQuery}
-        />
+        </div>
       </Card>
       <Card className="card-table">
         <Table
@@ -198,6 +201,6 @@ export default function PeopleGroupsPage() {
           }}
         />
       )}
-    </div>
+    </>
   );
 }

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

@@ -18,8 +18,7 @@ import {
   message,
   type TableColumnsType,
 } from 'antd';
-import { PageHeader } from 'components';
-import { PAGE_WRAPPER_STYLE, SEARCH_CARD_PROPS } from 'constants/layout';
+import { SEARCH_CARD_PROPS } from 'constants/layout';
 import { useCallback, useEffect, useState } from 'react';
 import { PersonModal } from './PersonModal';
 import {
@@ -140,11 +139,41 @@ export default function PersonDirectoryPage() {
   ];
 
   return (
-    <div style={PAGE_WRAPPER_STYLE}>
-      <PageHeader
-        title="人员目录"
-        subtitle="维护可被审批、人员组等功能引用的人员；未授予角色的人员不能访问系统。"
-        extra={
+    <>
+      <Card {...SEARCH_CARD_PROPS}>
+        <div
+          style={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            flexWrap: 'wrap',
+            gap: 8,
+          }}
+        >
+          <Space wrap>
+            <Input.Search
+              allowClear
+              placeholder="搜索姓名或账号"
+              style={{ width: 260 }}
+              onSearch={(value) => {
+                setPage(1);
+                setQuery(value);
+              }}
+            />
+            <Select
+              allowClear
+              placeholder="全部状态"
+              style={{ width: 140 }}
+              options={[
+                { label: '已启用', value: true },
+                { label: '已停用', value: false },
+              ]}
+              onChange={(value) => {
+                setPage(1);
+                setActive(value);
+              }}
+            />
+          </Space>
           <Space>
             <Button icon={<ReloadOutlined />} onClick={load} />
             <Button
@@ -155,33 +184,7 @@ export default function PersonDirectoryPage() {
               添加人员
             </Button>
           </Space>
-        }
-      />
-      <Card {...SEARCH_CARD_PROPS}>
-        <Space wrap>
-          <Input.Search
-            allowClear
-            placeholder="搜索姓名或账号"
-            style={{ width: 260 }}
-            onSearch={(value) => {
-              setPage(1);
-              setQuery(value);
-            }}
-          />
-          <Select
-            allowClear
-            placeholder="全部状态"
-            style={{ width: 140 }}
-            options={[
-              { label: '已启用', value: true },
-              { label: '已停用', value: false },
-            ]}
-            onChange={(value) => {
-              setPage(1);
-              setActive(value);
-            }}
-          />
-        </Space>
+        </div>
       </Card>
       <Card className="card-table">
         <Table
@@ -209,6 +212,6 @@ export default function PersonDirectoryPage() {
           }}
         />
       )}
-    </div>
+    </>
   );
 }

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

@@ -28,6 +28,7 @@ const PAGE_SIZE = 20;
 const STATUS_COLOR: Record<string, string> = {
   PENDING: 'gold',
   RUNNING: 'blue',
+  WAITING_RETRY: 'orange',
   COMPLETED: 'green',
   FAILED: 'red',
   CANCELLED: 'default',
@@ -222,7 +223,7 @@ export default function BusinessEventDetailPage() {
             <Typography.Text code>{event.registrationCode}</Typography.Text>
           ) : null
         }
-        onBack={() => navigate('/admin/workflow/business-events')}
+        onBack={() => navigate('/admin/workflow/settings?tab=events')}
         backLabel={t('common.back')}
         actions={
           <Select
@@ -236,6 +237,10 @@ export default function BusinessEventDetailPage() {
             options={[
               { value: 'PENDING', label: t('instances.statuses.pending') },
               { value: 'RUNNING', label: t('instances.statuses.running') },
+              {
+                value: 'WAITING_RETRY',
+                label: t('instances.statuses.waiting_retry'),
+              },
               {
                 value: 'COMPLETED',
                 label: t('instances.statuses.completed'),

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/business-events/index.tsx

@@ -13,8 +13,7 @@ import {
   message,
 } from 'antd';
 import type { TableColumnsType } from 'antd';
-import { PageHeader } from 'components';
-import { PAGE_WRAPPER_STYLE, SEARCH_CARD_PROPS } from 'constants/layout';
+import { SEARCH_CARD_PROPS } from 'constants/layout';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
@@ -183,11 +182,29 @@ export default function BusinessEventCatalogPage() {
   ];
 
   return (
-    <div className="workflow-page-stack" style={PAGE_WRAPPER_STYLE}>
-      <PageHeader
-        title={t('eventCatalog.title')}
-        subtitle={t('eventCatalog.subtitle')}
-        extra={
+    <div className="workflow-page-stack">
+      <Card {...SEARCH_CARD_PROPS}>
+        <div
+          style={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            flexWrap: 'wrap',
+            gap: 8,
+          }}
+        >
+          <div className="workflow-event-catalog__filters">
+            <Input.Search
+              allowClear
+              value={query}
+              placeholder={t('eventCatalog.searchPlaceholder')}
+              onChange={(event) => setQuery(event.target.value)}
+              className="workflow-event-catalog__search"
+            />
+            <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+              {t('eventCatalog.resultCount', { count: filteredEvents.length })}
+            </Typography.Text>
+          </div>
           <Space>
             <Button icon={<ReloadOutlined />} onClick={load} loading={loading}>
               {t('eventCatalog.refresh')}
@@ -200,21 +217,6 @@ export default function BusinessEventCatalogPage() {
               {t('eventCatalog.registration.register')}
             </Button>
           </Space>
-        }
-      />
-
-      <Card {...SEARCH_CARD_PROPS}>
-        <div className="workflow-event-catalog__filters">
-          <Input.Search
-            allowClear
-            value={query}
-            placeholder={t('eventCatalog.searchPlaceholder')}
-            onChange={(event) => setQuery(event.target.value)}
-            className="workflow-event-catalog__search"
-          />
-          <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-            {t('eventCatalog.resultCount', { count: filteredEvents.length })}
-          </Typography.Text>
         </div>
       </Card>
 

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

@@ -76,7 +76,6 @@ interface EnhancedFlowRendererProps {
   onDslChange?: (dsl: WorkflowDSL) => void;
   // New props for execution status
   nodeExecutions?: NodeExecution[];
-  reusedNodeIds?: string[];
   showExecutionStatus?: boolean;
 }
 
@@ -103,7 +102,6 @@ function EnhancedFlowCanvas({
   onNodeClick,
   onDslChange,
   nodeExecutions,
-  reusedNodeIds,
   showExecutionStatus,
 }: EnhancedFlowRendererProps) {
   const { t } = useTranslation('workflow');
@@ -134,11 +132,6 @@ function EnhancedFlowCanvas({
     });
     return map;
   }, [nodeExecutions]);
-  const reusedNodeSet = useMemo(
-    () => new Set(reusedNodeIds ?? []),
-    [reusedNodeIds],
-  );
-
   const { nodes, edges } = useMemo(() => {
     if (!dsl) return { nodes: [] as Node[], edges: [] as Edge[] };
 
@@ -178,9 +171,6 @@ function EnhancedFlowCanvas({
             execution.finishedAt,
           );
           nodeData.error = execution.error;
-        } else if (reusedNodeSet.has(n.id)) {
-          nodeData.executionStatus = 'COMPLETED';
-          nodeData.executionStatusLabel = t('instanceDetail.reusedResult');
         } else {
           nodeData.executionStatus = 'NOT_EXECUTED';
         }
@@ -234,7 +224,6 @@ function EnhancedFlowCanvas({
     selectedNodeId,
     selectedEdgeId,
     executionMap,
-    reusedNodeSet,
     showExecutionStatus,
     readonly,
     deleteEdges,

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

@@ -198,6 +198,30 @@ export function StatusCards({ overview, activeFilter, onFilter }: Props) {
           </div>
         </Card>
       </Col>
+
+      {/* Waiting for retry — clickable */}
+      <Col flex="1">
+        <Card
+          size="small"
+          hoverable
+          onClick={() => handleClick('WAITING_RETRY')}
+          style={cardStyle('WAITING_RETRY')}
+        >
+          <Text type="secondary" style={{ fontSize: 14 }}>
+            {t('status.waitingRetry')}
+          </Text>
+          <div
+            style={{
+              fontSize: 24,
+              fontWeight: 600,
+              lineHeight: 1.3,
+              color: '#fa8c16',
+            }}
+          >
+            {overview.waitingRetry ?? 0}
+          </div>
+        </Card>
+      </Col>
     </Row>
   );
 }

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

@@ -19,8 +19,7 @@ import {
   PlusOutlined,
   ReloadOutlined,
 } from '@ant-design/icons';
-import { PageHeader } from 'components';
-import { PAGE_WRAPPER_STYLE, SEARCH_CARD_PROPS } from 'constants/layout';
+import { SEARCH_CARD_PROPS } from 'constants/layout';
 import { ConnectionModal } from './ConnectionModal';
 import type { IntegrationConnection } from './connection.types';
 import { deleteConnection, fetchConnections } from './connectionsApi';
@@ -186,11 +185,24 @@ export default function ConnectionsPage() {
   ];
 
   return (
-    <div className="workflow-page-stack" style={PAGE_WRAPPER_STYLE}>
-      <PageHeader
-        title={t('connection.title')}
-        subtitle={t('connection.subtitle')}
-        extra={
+    <div className="workflow-page-stack">
+      {/* Search Card */}
+      <Card {...SEARCH_CARD_PROPS}>
+        <div
+          style={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            flexWrap: 'wrap',
+            gap: 8,
+          }}
+        >
+          <Input.Search
+            allowClear
+            placeholder={t('connection.search')}
+            onSearch={setQuery}
+            style={{ width: 300 }}
+          />
           <Space>
             <Button icon={<ReloadOutlined />} onClick={load}>
               {t('connection.refresh')}
@@ -203,17 +215,7 @@ export default function ConnectionsPage() {
               {t('connection.new')}
             </Button>
           </Space>
-        }
-      />
-
-      {/* Search Card */}
-      <Card {...SEARCH_CARD_PROPS}>
-        <Input.Search
-          allowClear
-          placeholder={t('connection.search')}
-          onSearch={setQuery}
-          style={{ width: 300 }}
-        />
+        </div>
       </Card>
 
       {/* Content Card */}

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

@@ -288,6 +288,7 @@ export default function WorkflowListPage() {
         const runs = record.runs || {
           pending: 0,
           running: 0,
+          waiting_retry: 0,
           completed: 0,
           failed: 0,
           cancelled: 0,
@@ -316,6 +317,12 @@ export default function WorkflowListPage() {
               label={t('list.running')}
               onClick={() => go('RUNNING')}
             />
+            <RunDot
+              count={runs.waiting_retry ?? 0}
+              color="#fa8c16"
+              label={t('list.waitingRetry')}
+              onClick={() => go('WAITING_RETRY')}
+            />
             <RunDot
               count={runs.failed}
               color="#ff4d4f"