@gadmin2n/schematics 0.0.84 → 0.0.86

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

@@ -211,6 +211,20 @@ export const useDynamicResources = (): IResourceItem[] => {
   const dynamicResources = resultResources;
   const allResources = dynamicResources;
 
+  // 防御性保护：用户已有角色但算出来 0 个资源，说明 rolePagesData
+  // 还没到位（isLoading 误报为 false 时进了这条分支），不要把空结果
+  // 永久写入 cachedResources，否则后续真正加载完成后无法重算
+  if (allResources.length === 0 && roleNames.length > 0) {
+    isComputing = false;
+    if (import.meta.env.DEV) {
+      console.warn(
+        '[useDynamicResources] ⚠️ Skip caching: 0 resources but roles present',
+        { roleNames },
+      );
+    }
+    return [];
+  }
+
   // Cache the result - will be used for all subsequent calls
   cachedResources = allResources;
   isComputing = false;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/hooks/useUserPageAccess.ts

@@ -333,10 +333,20 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
     if (hasCache && pagesData && rolePagesData) return false;
     if (isRoleLoading) return true;
     if (!pagesData) return true;
-    if (roleNames.length > 0 && roleIds.length > 0 && !rolePagesData)
-      return true;
+    // 等待 /role/findMany 返回（roleNames 已拿到但 rolesData 还在路上）
+    if (roleNames.length > 0 && !rolesData) return true;
+    // 等待 /rolePages/findMany 返回
+    if (roleIds.length > 0 && !rolePagesData) return true;
     return false;
-  }, [isRoleLoading, pagesData, roleNames, roleIds, rolePagesData, hasCache]);
+  }, [
+    isRoleLoading,
+    pagesData,
+    roleNames,
+    rolesData,
+    roleIds,
+    rolePagesData,
+    hasCache,
+  ]);
 
   return {
     accessiblePageIds,

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

@@ -102,16 +102,20 @@ function RunDot({
   count,
   color,
   label,
+  onClick,
 }: {
   count: number;
   color: string;
   label: string;
+  onClick?: () => void;
 }) {
   const size = 28;
   const hasCount = count > 0;
+  const clickable = hasCount && !!onClick;
   return (
     <Tooltip title={`${label}: ${count}`}>
       <span
+        onClick={clickable ? onClick : undefined}
         style={{
           display: 'inline-flex',
           alignItems: 'center',
@@ -124,7 +128,7 @@ function RunDot({
           fontSize: 11,
           fontWeight: 600,
           color: hasCount ? color : '#d9d9d9',
-          cursor: 'default',
+          cursor: clickable ? 'pointer' : 'default',
           lineHeight: 1,
         }}
       >
@@ -339,14 +343,38 @@ export default function AgendaJobsPage() {
       title: 'Runs',
       key: 'runs',
       width: 170,
-      render: (_: any, record: JobItem) => (
-        <Space size={6}>
-          <RunDot count={record.runs.queued} color="#faad14" label="Queued" />
-          <RunDot count={record.runs.success} color="#006d32" label="Success" />
-          <RunDot count={record.runs.running} color="#52c41a" label="Running" />
-          <RunDot count={record.runs.failed} color="#ff4d4f" label="Failed" />
-        </Space>
-      ),
+      render: (_: any, record: JobItem) => {
+        const go = (status: string) =>
+          navigate(`show/${encodeURIComponent(record.name)}?status=${status}`);
+        return (
+          <Space size={6}>
+            <RunDot
+              count={record.runs.queued}
+              color="#faad14"
+              label="Queued"
+              onClick={() => go('queued')}
+            />
+            <RunDot
+              count={record.runs.success}
+              color="#006d32"
+              label="Success"
+              onClick={() => go('success')}
+            />
+            <RunDot
+              count={record.runs.running}
+              color="#52c41a"
+              label="Running"
+              onClick={() => go('running')}
+            />
+            <RunDot
+              count={record.runs.failed}
+              color="#ff4d4f"
+              label="Failed"
+              onClick={() => go('failed')}
+            />
+          </Space>
+        );
+      },
     },
     {
       title: 'Schedule',
@@ -451,7 +479,7 @@ export default function AgendaJobsPage() {
                 icon={<DatabaseOutlined />}
                 onClick={() => navigate('/admin/data-mngt/agenda-job')}
               >
-                AgendaJob 表
+                任务原始表
               </Button>
             </Tooltip>
             <Button

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

@@ -22,7 +22,7 @@ import {
   DeleteOutlined,
   PlayCircleOutlined,
 } from '@ant-design/icons';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
 import { customRequest } from 'helpers/http';
 import { useECharts } from 'hooks/useECharts';
 import dayjs from 'dayjs';
@@ -216,6 +216,8 @@ export default function AgendaJobShow() {
   const { jobName: rawJobName } = useParams<{ jobName: string }>();
   const jobName = decodeURIComponent(rawJobName || '');
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  const initialStatus = searchParams.get('status') || undefined;
 
   const [detail, setDetail] = useState<JobDetail | null>(null);
   const [loading, setLoading] = useState(true);
@@ -231,7 +233,9 @@ export default function AgendaJobShow() {
   // Chart filters
   const [filterBefore, setFilterBefore] = useState<dayjs.Dayjs | null>(dayjs());
   const [filterLimit, setFilterLimit] = useState(25);
-  const [filterStatus, setFilterStatus] = useState<string | undefined>();
+  const [filterStatus, setFilterStatus] = useState<string | undefined>(
+    initialStatus,
+  );
 
   // Fetch job detail
   const fetchDetail = useCallback(async () => {
@@ -327,9 +331,10 @@ export default function AgendaJobShow() {
   if (!detail) {
     return (
       <div style={{ padding: 24 }}>
-        <Button icon={<ArrowLeftOutlined />} onClick={() => navigate(-1)}>
-          返回
-        </Button>
+        <Button
+          icon={<ArrowLeftOutlined />}
+          onClick={() => navigate(-1)}
+        ></Button>
         <div style={{ marginTop: 24, textAlign: 'center', color: '#999' }}>
           Job 不存在
         </div>

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

@@ -408,9 +408,7 @@ export default function WorkflowEditorPage() {
               type="text"
               icon={<ArrowLeftOutlined />}
               onClick={() => navigate('/admin/workflow')}
-            >
-              Back
-            </Button>
+            ></Button>
             {editingTitle ? (
               <Input
                 ref={titleInputRef}

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

@@ -420,7 +420,7 @@ export default function WorkflowListPage() {
                   navigate('/admin/data-mngt/workflow-event-outbox')
                 }
               >
-                EventOutbox 表
+                PG表事件队列
               </Button>
             </Tooltip>
             <Button

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

@@ -234,9 +234,7 @@ export default function WorkflowInstanceDetailPage() {
               type="text"
               icon={<ArrowLeftOutlined />}
               onClick={() => navigate(-1)}
-            >
-              Back
-            </Button>
+            ></Button>
             <Title level={4} style={{ margin: 0 }}>
               {data.workflow.name} — Instance #{data.id}
             </Title>

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

@@ -197,9 +197,7 @@ export default function WorkflowInstancesPage() {
               type="text"
               icon={<ArrowLeftOutlined />}
               onClick={() => navigate('/admin/workflow')}
-            >
-              Back
-            </Button>
+            ></Button>
             <Title level={4} style={{ margin: 0 }}>
               {workflowName || 'Workflow'} — Execution History
             </Title>

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

@@ -93,9 +93,11 @@ export function NodeInstanceForm({
           }}
         >
           <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
-            <Button type="text" icon={<ArrowLeftOutlined />} onClick={onBack}>
-              返回
-            </Button>
+            <Button
+              type="text"
+              icon={<ArrowLeftOutlined />}
+              onClick={onBack}
+            ></Button>
             <Title level={4} style={{ margin: 0 }}>
               {title}
             </Title>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/schematics",
-  "version": "0.0.84",
+  "version": "0.0.86",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@schematics)",
   "main": "dist/index.js",
   "files": [