@gadmin2n/schematics 0.0.83 → 0.0.85

package/dist/lib/application/files/gadmin2-game-angle-demo/server/package.json

@@ -26,7 +26,7 @@
     "migrate:status": "dotenv -e .env.local -e .env  -- prisma migrate status",
     "generate": "dotenv -e .env.local -e .env  -- npx prisma generate",
     "generate:dev": "npm run migrate:dev && dotenv -e .env.local -e .env  -- npx prisma generate",
-    "postgenerate:dev": "dotenv -e .env.local -e .env  -- ts-node  scripts/syncDataMngtPages.ts && dotenv -e .env.local -e .env  -- ts-node scripts/sync-resources.ts",
+    "postgenerate:dev": "dotenv -e .env.local -e .env  -- ts-node  scripts/sync-data-mngt-pages.ts && dotenv -e .env.local -e .env  -- ts-node scripts/sync-resources.ts",
     "generate:web": "dotenv -e .env.local -e .env  -- npx prisma generate --generator react",
     "generate:server": "dotenv -e .env.local -e .env  -- npx prisma generate --generator client --generator nestjs",
     "push:db": "dotenv -e .env.local -e .env  -- prisma db push --skip-generate",

package/dist/lib/application/files/gadmin2-game-angle-demo/server/scripts/lib/page-helpers.ts

@@ -2,7 +2,7 @@
  * page-helpers.ts — 页面与权限管理的共享 DB 操作原语
  *
  * 接受 PrismaClient 作为参数，可被 CLI 脚本（page-manage.ts / permission-manage.ts）
- * 和 seed 函数（syncDataMngtPages.ts / seed/permissions.ts）共同调用。
+ * 和 ../sync-data-mngt-pages.ts / seed/permissions.ts）共同调用。
  */
 
 import { PrismaClient } from '@prisma/client';

package/dist/lib/application/files/gadmin2-game-angle-demo/server/scripts/{syncDataMngtPages.ts → sync-data-mngt-pages.ts}

@@ -7,6 +7,22 @@ import {
 } from './lib/page-helpers';
 import { readPrismaModels } from './prismaModels';
 
+/**
+ * Models whose Page record should be marked `isVirtual = true`,
+ * i.e. routes / resources / role grants are still seeded so that the page
+ * remains reachable by URL and protected by RBAC, but the page is hidden
+ * from the auto-generated 「系统管理 / 数据管理」 menu.
+ *
+ * Use this when a model's CRUD page is exposed elsewhere (e.g. embedded
+ * inside another custom admin page) instead of as its own menu entry.
+ */
+const HIDDEN_FROM_DATA_MNGT_MENU = new Set<string>([
+  // Surfaced via a button in /admin/agenda-jobs (Cron Jobs page).
+  'agendaJob',
+  // Surfaced via a button in /admin/workflow (Workflow list page).
+  'workflowEventOutbox',
+]);
+
 // ─── Main Seed Function ───────────────────────────────────────────────────────
 
 /**
@@ -64,6 +80,7 @@ export async function seedDataMngtPages(prisma: PrismaClient): Promise<void> {
     console.log(`[seedDataMngtPages] ── ${model.name} ──`);
 
     const pagePath = `/admin/data-mngt/${model.slug}`;
+    const hideFromMenu = HIDDEN_FROM_DATA_MNGT_MENU.has(model.code);
 
     // 1 + 2 + 3: Upsert page, resource, and PageResource link
     const page = await upsertPage(
@@ -74,11 +91,17 @@ export async function seedDataMngtPages(prisma: PrismaClient): Promise<void> {
         sortOrder: 2000 + index * 10,
         parentId: dataMngtPage.id,
         path: pagePath,
+        isVirtual: hideFromMenu,
       },
-      { path: pagePath }, // keep path in sync with model name on update
+      // keep path in sync with model name on update;
+      // also force isVirtual when in the hide-from-menu list so existing
+      // rows get reconciled (otherwise the default upsertPage update is {}).
+      { path: pagePath, ...(hideFromMenu && { isVirtual: true }) },
     );
     console.log(
-      `[seedDataMngtPages]   Page upserted: ${page.code} → ${pagePath} (id=${page.id})`,
+      `[seedDataMngtPages]   Page upserted: ${page.code} → ${pagePath} (id=${
+        page.id
+      })${hideFromMenu ? ' [hidden from menu]' : ''}`,
     );
 
     const resource = await bindResourceToPage(

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

@@ -76,6 +76,7 @@ function App() {
                 options={{
                   syncWithLocation: true,
                   warnWhenUnsavedChanges: true,
+                  breadcrumb: null,
                 }}
               >
                 {resources.length === 0 ? (

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/agentPanel/inspectorActions.ts

@@ -552,8 +552,7 @@ export function getInspectorActions(
           promptTemplate: `为 ${r} 搜索栏添加 Checkbox 多选过滤`,
           promptPrefix: '要添加的字段：',
           requiresInput: true,
-          inputPlaceholder:
-            '请填写字段名及选项，例如：字段 category',
+          inputPlaceholder: '请填写字段名及选项，例如：字段 category',
           promptSuffix:
             '\n你先理解下这个需求，然后找我澄清需求（非技术方案），我确认后再行动',
         },

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/layout/header.tsx

@@ -63,7 +63,7 @@ export const Header: React.FC = () => {
 
   return (
     <Layout.Header style={headerStyles} {...agentAttrs({ type: 'app-header' })}>
-      <Select
+      {/* <Select
         showSearch
         defaultValue={business.gameId}
         style={{ width: 160 }}
@@ -87,7 +87,7 @@ export const Header: React.FC = () => {
           setBusiness(gameInfo);
           window.location.reload();
         }}
-      />
+      /> */}
       <Dropdown menu={langMenu}>
         <Button type="link">
           <Space>

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/layout/sider.tsx

@@ -16,6 +16,7 @@ import {
   useGo,
 } from '@refinedev/core';
 import { useTranslation } from 'react-i18next';
+import { useLocation } from 'react-router-dom';
 
 import {
   BarsOutlined,
@@ -87,6 +88,7 @@ const getMenuLabel = (
 export const Sider: React.FC = () => {
   const { token } = useToken();
   const { menuItems, selectedKey, defaultOpenKeys } = useMenu();
+  const { pathname: currentPathname } = useLocation();
   const { t, i18n } = useTranslation();
   const currentLocale = i18n.language;
 
@@ -205,12 +207,18 @@ export const Sider: React.FC = () => {
     }
 
     // Skip auto-redirect for CRUD detail pages (edit/show/create)
-    // These pages are not in the menu but are valid navigation targets
+    // These pages are not in the menu but are valid navigation targets.
+    // Also skip auto-generated /admin/data-mngt/* CRUD list pages —
+    // some of them are intentionally hidden from the sidebar via
+    // meta.hide but remain reachable through buttons on other pages.
+    // Use the live router pathname (not Refine's selectedKey, which
+    // collapses to an ancestor when the resource is hidden).
     if (
-      selectedKey &&
-      (selectedKey.includes('/edit/') ||
-        selectedKey.includes('/show/') ||
-        selectedKey.endsWith('/create'))
+      currentPathname &&
+      (currentPathname.includes('/edit/') ||
+        currentPathname.includes('/show/') ||
+        currentPathname.endsWith('/create') ||
+        currentPathname.includes('/data-mngt/'))
     ) {
       return;
     }
@@ -248,7 +256,7 @@ export const Sider: React.FC = () => {
     }, 300);
 
     return () => clearTimeout(timer);
-  }, [items, selectedKey, go]);
+  }, [items, selectedKey, currentPathname, go]);
 
   const handleOpenChange = useCallback(
     (keys: string[]) => {

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/config/routeRegistry.tsx

@@ -162,10 +162,12 @@ const S = ({ children }: { children: React.ReactNode }) => (
 // ─── Route Registry ──────────────────────────────────────────────────────────
 //
 // 路由路径命名规则：
-// Sider 组件会对不在菜单中的路径执行 auto-redirect。只有路径中包含
-// `/edit/`、`/show/` 或以 `/create` 结尾的页面才会被豁免。
-// 因此，所有不在侧边栏菜单中的子页面（详情、编辑、创建等），
-// 路径必须包含上述关键词，例如：
+// Sider 组件会对不在菜单中的路径执行 auto-redirect。豁免规则（见
+// components/layout/sider.tsx 中的 useEffect）：
+//   ✅ 路径含 `/edit/` 或 `/show/`，或以 `/create` 结尾（CRUD 详情页）
+//   ✅ 路径含 `/data-mngt/`（数据管理 CRUD 列表，部分通过 meta.hide 隐藏）
+//   ❌ 其它不在菜单的列表路径会被自动重定向到第一个菜单项
+// 因此，新加的不在侧边栏的子页面，路径必须命中上述某条豁免规则，例如：
 //   ✅ instance/show/:id
 //   ✅ node-instances/edit/:id
 //   ❌ instance/:id          ← 会被 auto-redirect 导致 404
@@ -256,7 +258,7 @@ export const routeRegistry: Record<string, RouteEntry> = {
         path: 'p/:slug',
         component: lazy(() => import('routes/canvas-page')),
       },
-      game: {
+      /*game: {
         path: 'game-list',
         children: {
           list: {
@@ -285,7 +287,7 @@ export const routeRegistry: Record<string, RouteEntry> = {
             ),
           },
         },
-      },
+      },*/
       // Agenda Jobs — sortOrder 1080, code: admin.agenda
       agenda: {
         path: 'agenda-jobs',

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/dev-shell/DevShell.tsx

@@ -219,9 +219,8 @@ export default function DevShell() {
               });
           } else {
             setTimeout(() => {
-              startNewConversationAndSend(sdk, data.payload).catch(
-                (err: any) =>
-                  console.error('[DevShell] sendUserPrompt failed:', err),
+              startNewConversationAndSend(sdk, data.payload).catch((err: any) =>
+                console.error('[DevShell] sendUserPrompt failed:', err),
               );
             }, 300);
           }

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

@@ -130,8 +130,12 @@ export const useDynamicResources = (): IResourceItem[] => {
   sortedAccessiblePages.forEach((page) => {
     if (!page) return;
 
-    // Skip virtual pages
-    if (page.isVirtual) return;
+    // NOTE: isVirtual pages are NOT skipped here — keeping them in the
+    // resources array lets Refine hooks (useResource, useNavigation, etc.)
+    // resolve the page's metadata, and React Router routes for these
+    // pages are registered independently via routeRegistry. The menu
+    // entry is hidden below by setting `meta.hide = true`, which
+    // Refine's useMenu honours.
 
     // Skip children of pages that use tabs
     if (page.parentId) {
@@ -191,6 +195,11 @@ export const useDynamicResources = (): IResourceItem[] => {
         parentPageCode: page.parentId
           ? pageMap.get(page.parentId)?.code
           : undefined,
+        // Refine's useMenu skips items whose meta.hide === true.
+        // This lets us hide a CRUD page from the auto-generated
+        // 「数据管理」menu (e.g. AgendaJob is surfaced from the Cron
+        // Jobs custom page instead) while keeping the route reachable.
+        ...(page.isVirtual && { hide: true }),
       },
     };
 
@@ -202,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

@@ -19,6 +19,7 @@ import {
   message,
 } from 'antd';
 import {
+  DatabaseOutlined,
   DeleteOutlined,
   PlayCircleOutlined,
   PlusOutlined,
@@ -445,6 +446,14 @@ export default function AgendaJobsPage() {
             Cron Jobs
           </Title>
           <Space>
+            <Tooltip title="查看 AgendaJob 表原始数据">
+              <Button
+                icon={<DatabaseOutlined />}
+                onClick={() => navigate('/admin/data-mngt/agenda-job')}
+              >
+                AgendaJob 表
+              </Button>
+            </Tooltip>
             <Button
               type="primary"
               icon={<PlusOutlined />}

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

@@ -22,7 +22,7 @@ import {
   useTranslate,
   useApiUrl,
 } from '@refinedev/core';
-import { useLocation } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import {
   getColumns,
   ModelType,
@@ -61,6 +61,7 @@ export const AgendaJobList: React.FC<IResourceComponentsProps> = () => {
   const resourceName = 'agendaJob';
   const t = useTranslate();
   const apiUrl = useApiUrl();
+  const navigate = useNavigate();
   const { search } = useLocation();
   const { parsedSorter, parsedFilters } = parseTableParams(search);
 
@@ -163,6 +164,7 @@ export const AgendaJobList: React.FC<IResourceComponentsProps> = () => {
   return (
     <List
       headerProps={{
+        onBack: () => navigate('/admin/agenda-jobs'),
         subTitle: (
           <BulkActions
             selectedRowKeys={batchOps.selectedRowKeys}

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

@@ -17,6 +17,7 @@ import {
   Modal,
   message,
   Tabs,
+  Typography,
 } from 'antd';
 import {
   SaveOutlined,
@@ -1280,7 +1281,17 @@ export const PageManagementListPage: React.FC = () => {
 
   return (
     <div>
-      <Space style={{ marginBottom: 16 }}>
+      <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={() =>
@@ -1292,7 +1303,7 @@ export const PageManagementListPage: React.FC = () => {
         >
           Create Page
         </Button>
-      </Space>
+      </div>
 
       <Tabs
         activeKey={activeTab}

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

@@ -1,6 +1,6 @@
 import React, { useState, useMemo } from 'react';
 import { useTable, FilterDropdown } from '@refinedev/antd';
-import { Table, Button, Space, Tooltip, Input } from 'antd';
+import { Table, Button, Space, Tooltip, Input, Typography } from 'antd';
 import {
   EditOutlined,
   EyeOutlined,
@@ -117,7 +117,17 @@ export const ResourceManagementListPage: React.FC = () => {
 
   return (
     <div>
-      <Space style={{ marginBottom: 16 }}>
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+          marginBottom: 16,
+        }}
+      >
+        <Typography.Title level={4} style={{ margin: 0 }}>
+          Resource mgnts
+        </Typography.Title>
         <Button
           type="primary"
           onClick={() =>
@@ -129,7 +139,7 @@ export const ResourceManagementListPage: React.FC = () => {
         >
           Create Resource
         </Button>
-      </Space>
+      </div>
       <Table {...tableProps} rowKey="id">
         <Table.Column
           dataIndex="code"

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

@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { useTable } from '@refinedev/antd';
 import { useGetLocale, useGetIdentity } from '@refinedev/core';
-import { Table, Button, Space, Tooltip, message } from 'antd';
+import { Table, Button, Space, Tooltip, message, Typography } from 'antd';
 
 import { EditModal } from './Components/EditModal';
 import { CreateModal } from './Components/CreateModal';
@@ -321,7 +321,17 @@ export const RoleManagementListPage: React.FC = () => {
 
   return (
     <div>
-      <Space style={{ marginBottom: 16 }}>
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+          marginBottom: 16,
+        }}
+      >
+        <Typography.Title level={4} style={{ margin: 0 }}>
+          Role mgnts
+        </Typography.Title>
         <Button
           type="primary"
           onClick={() =>
@@ -333,7 +343,7 @@ export const RoleManagementListPage: React.FC = () => {
         >
           Create Role
         </Button>
-      </Space>
+      </div>
       <Table {...tableProps} rowKey="id">
         <Table.Column dataIndex="name" title="Name" />
         <Table.Column dataIndex="description" title="Description" />

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

@@ -15,6 +15,7 @@ import {
   message,
 } from 'antd';
 import {
+  DatabaseOutlined,
   DeleteOutlined,
   EditOutlined,
   ExportOutlined,
@@ -412,7 +413,16 @@ export default function WorkflowListPage() {
             Workflows
           </Title>
           <Space>
-            <Button icon={<ReloadOutlined />} onClick={fetchData} />
+            <Tooltip title="查看 WorkflowEventOutbox 表原始数据">
+              <Button
+                icon={<DatabaseOutlined />}
+                onClick={() =>
+                  navigate('/admin/data-mngt/workflow-event-outbox')
+                }
+              >
+                EventOutbox 表
+              </Button>
+            </Tooltip>
             <Button
               icon={<ImportOutlined />}
               onClick={() => setImportModalOpen(true)}
@@ -426,6 +436,7 @@ export default function WorkflowListPage() {
             >
               New Workflow
             </Button>
+            <Button icon={<ReloadOutlined />} onClick={fetchData} />
           </Space>
         </div>
       </Card>

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

@@ -236,10 +236,9 @@ export default function NodeInstanceListPage() {
           }}
         >
           <Title level={4} style={{ margin: 0 }}>
-            Node Instance Mgnt
+            Node instance mgnts
           </Title>
           <Space>
-            <Button icon={<ReloadOutlined />} onClick={fetchData} />
             <Button
               type="primary"
               icon={<PlusOutlined />}
@@ -247,6 +246,7 @@ export default function NodeInstanceListPage() {
             >
               New Instance
             </Button>
+            <Button icon={<ReloadOutlined />} onClick={fetchData} />
           </Space>
         </div>
       </Card>

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

@@ -22,7 +22,7 @@ import {
   useTranslate,
   useApiUrl,
 } from '@refinedev/core';
-import { useLocation } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import {
   getColumns,
   ModelType,
@@ -66,6 +66,7 @@ export const WorkflowEventOutboxList: React.FC<
   const resourceName = 'workflowEventOutbox';
   const t = useTranslate();
   const apiUrl = useApiUrl();
+  const navigate = useNavigate();
   const { search } = useLocation();
   const { parsedSorter, parsedFilters } = parseTableParams(search);
 
@@ -172,6 +173,7 @@ export const WorkflowEventOutboxList: React.FC<
   return (
     <List
       headerProps={{
+        onBack: () => navigate('/admin/workflow'),
         subTitle: (
           <BulkActions
             selectedRowKeys={batchOps.selectedRowKeys}

package/package.json

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