@gadmin2n/schematics 0.0.152 → 0.0.154

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/plugins/devShellPlugin.ts

@@ -257,7 +257,7 @@ export function devShellPlugin(): Plugin {
             ? 'index.html'
             : 'dev-shell-entry.html';
           const rawHtml = fs.readFileSync(
-            path.resolve(__dirname, '..', '..', entryFile),
+            path.resolve(import.meta.dirname, '..', '..', entryFile),
             'utf-8',
           );
           const html = await server.transformIndexHtml(url, rawHtml);
@@ -277,7 +277,7 @@ export function devShellPlugin(): Plugin {
           (req.headers.accept ?? '').includes('text/html');
         if (isHtmlNav) {
           const rawHtml = fs.readFileSync(
-            path.resolve(__dirname, '..', '..', 'index.html'),
+            path.resolve(import.meta.dirname, '..', '..', 'index.html'),
             'utf-8',
           );
           const html = await server.transformIndexHtml(url, rawHtml);

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/audit/components/action-cell.css

@@ -1,3 +1,3 @@
 .highlight-changed-row {
   background-color: var(--ant-color-error-bg);
-} 
+}

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"

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

@@ -40,6 +40,11 @@ const STATUS_TAG: Record<
 > = {
   PENDING: { color: 'gold', label: 'Pending', icon: <ClockCircleOutlined /> },
   RUNNING: { color: 'blue', label: 'Running', icon: <LoadingOutlined /> },
+  WAITING_RETRY: {
+    color: 'orange',
+    label: 'Waiting to retry',
+    icon: <ClockCircleOutlined />,
+  },
   COMPLETED: {
     color: 'green',
     label: 'Completed',
@@ -65,7 +70,6 @@ interface NodeExecution {
 interface RetryAttempt {
   id: string;
   status: string;
-  retryFromNodeId: string | null;
   createdAt: string;
 }
 
@@ -88,9 +92,7 @@ interface InstanceDetail {
   approvableNodeIds: string[];
   retryableNodeIds: string[];
   retryAttempts: RetryAttempt[];
-  reusedNodeIds: string[];
   retryOfInstanceId: string | null;
-  retryFromNodeId: string | null;
   dsl?: WorkflowDSL;
 }
 
@@ -221,7 +223,11 @@ export default function WorkflowInstanceDetailPage() {
 
   // Auto-refresh for running instances
   useEffect(() => {
-    if (data?.status === 'RUNNING' || data?.status === 'PENDING') {
+    if (
+      data?.status === 'RUNNING' ||
+      data?.status === 'PENDING' ||
+      data?.status === 'WAITING_RETRY'
+    ) {
       const interval = setInterval(fetchData, 3000);
       return () => clearInterval(interval);
     }
@@ -263,16 +269,16 @@ export default function WorkflowInstanceDetailPage() {
     }
   };
 
-  const handleRetryFromNode = async (nodeId: string) => {
+  const handleRetryFailedNode = async (nodeId: string) => {
     setActionLoading(true);
     try {
-      const res = await customRequest<{ instanceId: string }>(
-        `workflow/instance/${instanceId}/retry-from-node`,
+      await customRequest(
+        `workflow/instance/${instanceId}/retry-failed-node`,
         'POST',
         { nodeId },
       );
       message.success(t('instanceDetail.retryFromNodeStarted'));
-      navigate(`/admin/workflow/instance/show/${res.instanceId}`);
+      await fetchData();
     } catch (e: any) {
       message.error(e?.message || t('instanceDetail.retryFromNodeFailed'));
     } finally {
@@ -325,17 +331,10 @@ export default function WorkflowInstanceDetailPage() {
     selectedNodeId && data.dsl
       ? data.dsl.nodes.find((n) => n.id === selectedNodeId)
       : null;
-  const selectedNodeWasReused = selectedNodeId
-    ? data.reusedNodeIds.includes(selectedNodeId)
-    : false;
   const latestRetryAttempt = data.retryAttempts[0];
-  const selectedRetryAttempt = selectedNodeId
-    ? data.retryAttempts.find(
-        (attempt) => attempt.retryFromNodeId === selectedNodeId,
-      )
-    : undefined;
-  const workflowFailure =
-    data.status === 'FAILED' ? getWorkflowFailureSummary(data.result) : null;
+  const workflowFailure = ['FAILED', 'WAITING_RETRY'].includes(data.status)
+    ? getWorkflowFailureSummary(data.result)
+    : null;
 
   return (
     <div className="workflow-page-stack">
@@ -383,7 +382,7 @@ export default function WorkflowInstanceDetailPage() {
                 {t('instanceDetail.openTemporal')}
               </Button>
             </Tooltip>
-            {(data.status === 'RUNNING' || data.status === 'PENDING') && (
+            {['RUNNING', 'PENDING', 'WAITING_RETRY'].includes(data.status) && (
               <Popconfirm
                 title="Cancel this workflow execution?"
                 onConfirm={handleCancel}
@@ -480,17 +479,10 @@ export default function WorkflowInstanceDetailPage() {
               </Button>
             </Descriptions.Item>
           )}
-          {data.reusedNodeIds.length > 0 && (
-            <Descriptions.Item label={t('instanceDetail.reusedResults')}>
-              {t('instanceDetail.reusedResultsCount', {
-                count: data.reusedNodeIds.length,
-              })}
-            </Descriptions.Item>
-          )}
         </Descriptions>
         {workflowFailure && (
           <Alert
-            type="error"
+            type={data.status === 'WAITING_RETRY' ? 'warning' : 'error'}
             showIcon
             style={{ marginTop: 16 }}
             message={workflowFailure.message}
@@ -571,9 +563,6 @@ export default function WorkflowInstanceDetailPage() {
                     const canRetryFromNode =
                       ne.status === 'FAILED' &&
                       data.retryableNodeIds.includes(ne.nodeId);
-                    const retryAttempt = data.retryAttempts.find(
-                      (attempt) => attempt.retryFromNodeId === ne.nodeId,
-                    );
                     return {
                       title: (
                         <Space
@@ -620,7 +609,7 @@ export default function WorkflowInstanceDetailPage() {
                               description={t(
                                 'instanceDetail.retryFromNodeDescription',
                               )}
-                              onConfirm={() => handleRetryFromNode(ne.nodeId)}
+                              onConfirm={() => handleRetryFailedNode(ne.nodeId)}
                               okText={t('instanceDetail.retryFromNode')}
                               cancelText={t('common.cancel')}
                             >
@@ -635,23 +624,6 @@ export default function WorkflowInstanceDetailPage() {
                               </Button>
                             </Popconfirm>
                           )}
-                          {retryAttempt && (
-                            <Button
-                              size="small"
-                              type="link"
-                              icon={<LinkOutlined />}
-                              onClick={(event) => {
-                                event.stopPropagation();
-                                navigate(
-                                  `/admin/workflow/instance/show/${retryAttempt.id}`,
-                                );
-                              }}
-                            >
-                              {t('instanceDetail.viewRetryAttempt', {
-                                id: retryAttempt.id,
-                              })}
-                            </Button>
-                          )}
                         </Space>
                       ),
                       description: (
@@ -821,7 +793,6 @@ export default function WorkflowInstanceDetailPage() {
                     showExecutionStatus={true}
                     selectedNodeId={selectedNodeId}
                     readonly={true}
-                    reusedNodeIds={data.reusedNodeIds}
                     onNodeClick={(nodeId) => setSelectedNodeId(nodeId)}
                   />
                 </div>
@@ -982,7 +953,7 @@ export default function WorkflowInstanceDetailPage() {
                                 'instanceDetail.retryFromNodeDescription',
                               )}
                               onConfirm={() =>
-                                handleRetryFromNode(selectedExecution.nodeId)
+                                handleRetryFailedNode(selectedExecution.nodeId)
                               }
                               okText={t('instanceDetail.retryFromNode')}
                               cancelText={t('common.cancel')}
@@ -997,22 +968,6 @@ export default function WorkflowInstanceDetailPage() {
                             </Popconfirm>
                           )}
 
-                        {selectedExecution.status === 'FAILED' &&
-                          selectedRetryAttempt && (
-                            <Button
-                              icon={<LinkOutlined />}
-                              onClick={() =>
-                                navigate(
-                                  `/admin/workflow/instance/show/${selectedRetryAttempt.id}`,
-                                )
-                              }
-                            >
-                              {t('instanceDetail.viewRetryAttempt', {
-                                id: selectedRetryAttempt.id,
-                              })}
-                            </Button>
-                          )}
-
                         {/* Approval actions */}
                         {selectedExecution.nodeType === 'approval' &&
                           selectedExecution.status === 'RUNNING' &&
@@ -1047,14 +1002,10 @@ export default function WorkflowInstanceDetailPage() {
                       <div>
                         <div style={{ marginBottom: 16 }}>
                           <Title level={5}>{selectedDslNode.label}</Title>
-                          <Tag
-                            color={selectedNodeWasReused ? 'green' : 'default'}
-                          >
-                            {selectedNodeWasReused
-                              ? t('instanceDetail.reusedResult')
-                              : instanceHasFinished
-                                ? 'Not Executed / Skipped'
-                                : 'Not Executed'}
+                          <Tag>
+                            {instanceHasFinished
+                              ? 'Not Executed / Skipped'
+                              : 'Not Executed'}
                           </Tag>
                         </div>
                         <Descriptions column={1} size="small">
@@ -1063,11 +1014,9 @@ export default function WorkflowInstanceDetailPage() {
                           </Descriptions.Item>
                           <Descriptions.Item label="Status">
                             <Text type="secondary">
-                              {selectedNodeWasReused
-                                ? t('instanceDetail.reusedResultDescription')
-                                : instanceHasFinished
-                                  ? 'Not executed in this run'
-                                  : 'Waiting for execution'}
+                              {instanceHasFinished
+                                ? 'Not executed in this run'
+                                : 'Waiting for execution'}
                             </Text>
                           </Descriptions.Item>
                         </Descriptions>