@gadmin2n/schematics 0.0.139 → 0.0.141

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

@@ -0,0 +1,71 @@
+import React, { useEffect, useState } from 'react';
+import { Alert, Form, Input, Modal, Radio } from 'antd';
+
+interface Props {
+  open: boolean;
+  requestLabel?: string;
+  submitting?: boolean;
+  onCancel(): void;
+  onSubmit(input: { decision: 'APPROVE' | 'REJECT'; comment?: string }): void;
+}
+
+export function DecisionModal({
+  open,
+  requestLabel,
+  submitting,
+  onCancel,
+  onSubmit,
+}: Props) {
+  const [decision, setDecision] = useState<'APPROVE' | 'REJECT'>('APPROVE');
+  const [comment, setComment] = useState('');
+  useEffect(() => {
+    if (open) {
+      setDecision('APPROVE');
+      setComment('');
+    }
+  }, [open]);
+
+  return (
+    <Modal
+      open={open}
+      title="Confirm approval decision"
+      okText={decision === 'APPROVE' ? 'Confirm approval' : 'Confirm rejection'}
+      okButtonProps={{ danger: decision === 'REJECT', disabled: submitting }}
+      confirmLoading={submitting}
+      cancelButtonProps={{ disabled: submitting }}
+      onCancel={onCancel}
+      onOk={() =>
+        onSubmit({
+          decision,
+          ...(comment.trim() && { comment: comment.trim() }),
+        })
+      }
+    >
+      <Alert
+        type={decision === 'APPROVE' ? 'info' : 'warning'}
+        showIcon
+        message={`This decision is final for ${requestLabel ?? 'this request'}.`}
+        style={{ marginBottom: 16 }}
+      />
+      <Form layout="vertical">
+        <Form.Item label="Decision">
+          <Radio.Group
+            value={decision}
+            onChange={(event) => setDecision(event.target.value)}
+          >
+            <Radio.Button value="APPROVE">Approve</Radio.Button>
+            <Radio.Button value="REJECT">Reject</Radio.Button>
+          </Radio.Group>
+        </Form.Item>
+        <Form.Item label="Comment">
+          <Input.TextArea
+            rows={3}
+            value={comment}
+            onChange={(event) => setComment(event.target.value)}
+            placeholder="Optional context for this decision"
+          />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+}

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

@@ -0,0 +1,209 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import {
+  Button,
+  Card,
+  Empty,
+  Space,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import {
+  CheckCircleOutlined,
+  ReloadOutlined,
+  SyncOutlined,
+} from '@ant-design/icons';
+import { customRequest } from 'helpers/http';
+import { PageHeader } from 'components';
+import { PAGE_WRAPPER_STYLE } from 'constants/layout';
+import { DecisionModal } from './DecisionModal';
+
+interface InboxItem {
+  id: string;
+  eligibilityRevision: number;
+  request: {
+    id: string;
+    workflowInstanceId: string;
+    nodeId: string;
+    status: string;
+    startedAt: string;
+    expiresAt: string | null;
+    approvalRule: Record<string, unknown>;
+    rejectionRule: Record<string, unknown>;
+    dispatch?: {
+      state: 'DISPATCHING' | 'WAITING_APPROVAL' | 'DISPATCH_FAILED';
+      canRetry: boolean;
+      error?: string;
+    };
+  };
+}
+
+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 () => {
+    setLoading(true);
+    try {
+      setItems(await customRequest<InboxItem[]>('human-approval/inbox', 'GET'));
+    } catch (error: any) {
+      message.error(error?.message ?? 'Failed to load approval tasks');
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    void load();
+  }, [load]);
+
+  async function decide(input: {
+    decision: 'APPROVE' | 'REJECT';
+    comment?: string;
+  }) {
+    if (!selected || submitting) return;
+    setSubmitting(true);
+    try {
+      await customRequest(
+        `human-approval/${selected.request.id}/decisions`,
+        'POST',
+        input,
+      );
+      message.success(
+        input.decision === 'APPROVE' ? 'Request approved' : 'Request rejected',
+      );
+      setSelected(undefined);
+      await load();
+    } catch (error: any) {
+      message.error(error?.message ?? 'Decision failed');
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  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
+        title="Approval tasks"
+        subtitle="Requests waiting for your decision"
+        extra={
+          <Button icon={<ReloadOutlined />} loading={loading} onClick={load}>
+            Refresh
+          </Button>
+        }
+      />
+
+      {/* Table Card */}
+      <Card className="card-table">
+        <Table
+          rowKey={(item) => String(item.id)}
+          loading={loading}
+          dataSource={items}
+          locale={{
+            emptyText: <Empty description="No approval tasks waiting" />,
+          }}
+          columns={[
+            {
+              title: 'Request',
+              render: (_, item) => (
+                <Space direction="vertical" size={0}>
+                  <Typography.Text strong>
+                    {item.request.nodeId}
+                  </Typography.Text>
+                  <Typography.Text type="secondary">
+                    Workflow run #{item.request.workflowInstanceId}
+                  </Typography.Text>
+                </Space>
+              ),
+            },
+            {
+              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>;
+              },
+            },
+            {
+              title: 'Started',
+              render: (_, item) =>
+                new Date(item.request.startedAt).toLocaleString(),
+            },
+            {
+              title: 'Deadline',
+              render: (_, item) =>
+                item.request.expiresAt
+                  ? new Date(item.request.expiresAt).toLocaleString()
+                  : 'No timeout',
+            },
+            {
+              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>
+                ),
+            },
+          ]}
+        />
+      </Card>
+      <DecisionModal
+        open={Boolean(selected)}
+        requestLabel={selected?.request.nodeId}
+        submitting={submitting}
+        onCancel={() => !submitting && setSelected(undefined)}
+        onSubmit={decide}
+      />
+    </div>
+  );
+}

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

@@ -135,7 +135,12 @@ export const AssignRolesModal: React.FC<AssignRolesModalProps> = ({
     >
       <Spin spinning={loading}>
         {existingRoleIds.length > 0 && (
-          <div style={{ marginBottom: 12, color: '#666' }}>
+          <div
+            style={{
+              marginBottom: 12,
+              color: 'var(--ant-color-text-secondary)',
+            }}
+          >
             Currently <strong>{existingRoleIds.length}</strong> role(s) can
             access this page
           </div>

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

@@ -10,6 +10,7 @@ import { useGetIdentity } from '@refinedev/core';
 import {
   Table,
   Button,
+  Card,
   Space,
   Tooltip,
   Tag,
@@ -17,7 +18,6 @@ import {
   Modal,
   message,
   Tabs,
-  Typography,
 } from 'antd';
 import {
   SaveOutlined,
@@ -59,14 +59,13 @@ import { PageDetailDrawer } from './Components/PageDetailDrawer';
 import type {
   PageMenuTreeNode,
   PageResourceAssignment,
-  PageResourcePermissionSummary,
   ResourceDefinition,
 } from './types';
 import { usePageManagement } from './hooks/usePageManagement';
 import { useTranslation } from 'react-i18next';
 import { SqlModal, generatePageSql } from '../../components/SqlModal';
-
-const RESOURCE_NAME_DISPLAY_TRUNCATION_LIMIT = 40;
+import { PageHeader } from 'components';
+import { PAGE_WRAPPER_STYLE } from 'constants/layout';
 
 // Sparse number gap for sortOrder (allows inserting items between existing ones)
 const SORT_ORDER_GAP = 10000;
@@ -92,7 +91,7 @@ const safelyConvertToNumber = (value: unknown): number | null => {
 
 const extractPermissionActionsFromAssociation = (
   associationRecord: any,
-  resourceRecord: any,
+  _resourceRecord: any,
 ): string[] => {
   const aggregatedPermissionActions = new Set<string>();
 
@@ -295,7 +294,8 @@ export const PageManagementListPage: React.FC = () => {
             children: removeEmptyChildrenArrays(node.children),
           };
         }
-        const { children, ...nodeWithoutChildren } = node;
+        const nodeWithoutChildren = { ...node };
+        delete nodeWithoutChildren.children;
         return nodeWithoutChildren as PageMenuTreeNode;
       });
 
@@ -303,69 +303,6 @@ export const PageManagementListPage: React.FC = () => {
     return removeEmptyChildrenArrays(rootLevelNodes);
   }, [pageListData]);
 
-  const pageResourcePermissionSummaryMap = useMemo<
-    Record<number, PageResourcePermissionSummary>
-  >(() => {
-    const associationsArray: any[] = Array.isArray(
-      pageResourceAssociationsData?.data,
-    )
-      ? pageResourceAssociationsData.data
-      : [];
-    const summaryMapByPageId: Record<number, PageResourcePermissionSummary> =
-      {};
-
-    associationsArray.forEach((association: any) => {
-      const pageId = safelyConvertToNumber(association?.pageId);
-      const resourceId = safelyConvertToNumber(association?.resourceId);
-
-      if (pageId === null || resourceId === null) {
-        return;
-      }
-
-      if (!summaryMapByPageId[pageId]) {
-        summaryMapByPageId[pageId] = {
-          resourceIds: [],
-          resourceNames: [],
-          allPermissionActions: [],
-        };
-      }
-
-      const pageSummary = summaryMapByPageId[pageId];
-
-      if (!pageSummary.resourceIds.includes(resourceId)) {
-        pageSummary.resourceIds.push(resourceId);
-      }
-
-      const resourceRecord =
-        association?.resource ?? resourceLookupByIdMap[resourceId];
-      const resourceDisplayName =
-        resourceRecord?.name ||
-        resourceRecord?.code ||
-        `Resource ${resourceId}`;
-
-      if (
-        resourceDisplayName &&
-        !pageSummary.resourceNames.includes(resourceDisplayName)
-      ) {
-        pageSummary.resourceNames.push(resourceDisplayName);
-      }
-
-      extractPermissionActionsFromAssociation(
-        association,
-        resourceRecord,
-      ).forEach((permissionAction) => {
-        if (
-          permissionAction &&
-          !pageSummary.allPermissionActions.includes(permissionAction)
-        ) {
-          pageSummary.allPermissionActions.push(permissionAction);
-        }
-      });
-    });
-
-    return summaryMapByPageId;
-  }, [pageResourceAssociationsData, resourceLookupByIdMap]);
-
   const getPageResourceAssignmentsForModal = useCallback(
     (pageId: number): PageResourceAssignment[] => {
       console.log(
@@ -541,7 +478,12 @@ export const PageManagementListPage: React.FC = () => {
       );
       setSqlModal({ open: true, title: `SQL — Page: ${record.name}`, sql });
     },
-    [pageListData, pageResourceAssociationsData, resourceLookupByIdMap],
+    [
+      pageListData,
+      pageResourceAssociationsData,
+      resourceLookupByIdMap,
+      identity,
+    ],
   );
 
   // Ref for expand button click/double-click disambiguation
@@ -1001,46 +943,6 @@ export const PageManagementListPage: React.FC = () => {
     setExpandedKeys(new Set());
   }, []);
 
-  // Common column renderers for both tables
-  const renderAssignedResourcesColumn = (record: any) => {
-    const permissionSummary = pageResourcePermissionSummaryMap[record.id];
-
-    if (!permissionSummary?.resourceNames.length) {
-      return <span style={{ color: '#999' }}>No resources assigned</span>;
-    }
-
-    const joinedResourceNames = permissionSummary.resourceNames.join(', ');
-    const shouldTruncateDisplay =
-      joinedResourceNames.length > RESOURCE_NAME_DISPLAY_TRUNCATION_LIMIT;
-    const truncatedDisplayValue = shouldTruncateDisplay
-      ? `${joinedResourceNames.slice(0, RESOURCE_NAME_DISPLAY_TRUNCATION_LIMIT)}...`
-      : joinedResourceNames;
-
-    return (
-      <Tooltip title={joinedResourceNames}>
-        <span>{truncatedDisplayValue}</span>
-      </Tooltip>
-    );
-  };
-
-  const renderPermissionActionsColumn = (record: any) => {
-    const permissionSummary = pageResourcePermissionSummaryMap[record.id];
-
-    if (!permissionSummary?.allPermissionActions.length) {
-      return <span style={{ color: '#999' }}>-</span>;
-    }
-
-    return (
-      <Space size={[4, 4]} wrap>
-        {permissionSummary.allPermissionActions.map((permissionAction) => (
-          <Tag key={`${record.id}-${permissionAction}`} color="blue">
-            {permissionAction}
-          </Tag>
-        ))}
-      </Space>
-    );
-  };
-
   // Handle click on add child page button
   const handleAddChildPage = useCallback((parentPage: any) => {
     const parentPath = parentPage.path || '';
@@ -1280,48 +1182,43 @@ export const PageManagementListPage: React.FC = () => {
   );
 
   return (
-    <div>
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'center',
-          marginBottom: 16,
-        }}
-      >
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          Page mgnts
-        </Typography.Title>
-        <Button
-          type="primary"
-          onClick={() =>
-            setActiveModalState({
-              modalType: 'create',
-              targetPageId: null,
-            })
-          }
-        >
-          Create Page
-        </Button>
-      </div>
-
-      <Tabs
-        activeKey={activeTab}
-        onChange={setActiveTab}
-        items={[
-          {
-            key: 'regular',
-            label: `Regular Pages (${regularPagesData.length})`,
-            children: renderRegularPagesTable(),
-          },
-          {
-            key: 'virtual',
-            label: `Virtual Pages (${virtualPagesData.length})`,
-            children: renderVirtualPagesTable(),
-          },
-        ]}
+    <div style={PAGE_WRAPPER_STYLE}>
+      <PageHeader
+        title="Page mgnts"
+        extra={
+          <Button
+            type="primary"
+            onClick={() =>
+              setActiveModalState({
+                modalType: 'create',
+                targetPageId: null,
+              })
+            }
+          >
+            Create Page
+          </Button>
+        }
       />
 
+      <Card className="card-table">
+        <Tabs
+          activeKey={activeTab}
+          onChange={setActiveTab}
+          items={[
+            {
+              key: 'regular',
+              label: `Regular Pages (${regularPagesData.length})`,
+              children: renderRegularPagesTable(),
+            },
+            {
+              key: 'virtual',
+              label: `Virtual Pages (${virtualPagesData.length})`,
+              children: renderVirtualPagesTable(),
+            },
+          ]}
+        />
+      </Card>
+
       {activeModalState.modalType === 'edit' &&
         activeModalState.targetPageId && (
           <EditPageModal

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

@@ -1,4 +1,6 @@
 import { Alert, Card, Collapse, Divider, Table, Tabs, Typography } from 'antd';
+import { PageHeader } from 'components';
+import { CARD_GAP_STYLE, PAGE_WRAPPER_STYLE } from 'constants/layout';
 
 const { Title, Paragraph, Text } = Typography;
 
@@ -333,16 +335,14 @@ const comparisonData = [
 
 export const PermissionReadmePage = () => {
   return (
-    <div>
-      <Typography>
-        <Title level={2}>菜单管理说明</Title>
-        <Paragraph>
-          本页面介绍系统的菜单、路由与权限管理机制，帮助管理员理解如何添加和配置不同类型的菜单项。
-        </Paragraph>
-      </Typography>
+    <div style={PAGE_WRAPPER_STYLE}>
+      <PageHeader
+        title="菜单管理说明"
+        subtitle="本页面介绍系统的菜单、路由与权限管理机制，帮助管理员理解如何添加和配置不同类型的菜单项。"
+      />
 
       {/* ── 架构概览 ──────────────────────────────────────────────── */}
-      <Card title="菜单系统架构" style={{ marginBottom: 24 }}>
+      <Card title="菜单系统架构" style={CARD_GAP_STYLE}>
         <Paragraph>
           系统的菜单管理涉及<Text strong>前端路由注册</Text>和
           <Text strong>数据库页面配置</Text>两个部分的协作。 未匹配到
@@ -374,7 +374,7 @@ export const PermissionReadmePage = () => {
       </Card>
 
       {/* ── 核心概念 ──────────────────────────────────────────────── */}
-      <Card title="核心概念" style={{ marginBottom: 24 }}>
+      <Card title="核心概念" style={CARD_GAP_STYLE}>
         <Table
           columns={coreConceptColumns}
           dataSource={coreConceptData}
@@ -394,7 +394,7 @@ export const PermissionReadmePage = () => {
       </Card>
 
       {/* ── 四种注册方式 ──────────────────────────────────────────── */}
-      <Card title="菜单注册方式" style={{ marginBottom: 24 }}>
+      <Card title="菜单注册方式" style={CARD_GAP_STYLE}>
         <Alert
           type="info"
           showIcon
@@ -450,7 +450,7 @@ export const PermissionReadmePage = () => {
                   <Title level={5}>routeRegistry 示例</Title>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -557,7 +557,7 @@ office: {
                   </ul>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -611,7 +611,7 @@ overview: {
                   <Title level={5}>CRUD 模块完整示例</Title>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -697,7 +697,7 @@ staff: {
                   <Title level={5}>工作流程</Title>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -755,7 +755,8 @@ staff: {
                           目标网站必须允许被 iframe 嵌入（未设置{' '}
                           <Text code>X-Frame-Options: DENY</Text> 或{' '}
                           <Text code>
-                            Content-Security-Policy: frame-ancestors 'none'
+                            Content-Security-Policy: frame-ancestors
+                            &apos;none&apos;
                           </Text>
                           ）
                         </li>
@@ -791,7 +792,7 @@ staff: {
                   </Paragraph>
                   <pre
                     style={{
-                      background: '#f5f5f5',
+                      background: 'var(--ant-color-fill-quaternary)',
                       padding: 16,
                       borderRadius: 6,
                       overflow: 'auto',
@@ -876,11 +877,11 @@ interface DynamicMenuGroup {
       </Card>
 
       {/* ── 权限层级关系 ────────────────────────────────────────────── */}
-      <Card title="权限层级关系" style={{ marginBottom: 24 }}>
+      <Card title="权限层级关系" style={CARD_GAP_STYLE}>
         <Title level={5}>实体关系总览</Title>
         <pre
           style={{
-            background: '#f5f5f5',
+            background: 'var(--ant-color-fill-quaternary)',
             padding: 16,
             borderRadius: 6,
             overflow: 'auto',
@@ -953,7 +954,7 @@ Role (t_role)
         <Title level={5}>权限检查完整流程</Title>
         <pre
           style={{
-            background: '#f5f5f5',
+            background: 'var(--ant-color-fill-quaternary)',
             padding: 16,
             borderRadius: 6,
             overflow: 'auto',
@@ -991,7 +992,7 @@ Role (t_role)
         </Paragraph>
         <pre
           style={{
-            background: '#f5f5f5',
+            background: 'var(--ant-color-fill-quaternary)',
             padding: 16,
             borderRadius: 6,
             overflow: 'auto',