@gadmin2n/schematics 0.0.142 → 0.0.143

package/dist/lib/application/files/gadmin2-game-angle-demo/config/prisma/workflow.prisma

@@ -76,7 +76,6 @@ model Workflow {
 
   versions  WorkflowVersion[]
   instances WorkflowInstance[]
-  approvalChannelsAsDispatch ApprovalChannel[] @relation("ApprovalChannelDispatch")
 
   @@map("t_workflow")
 }
@@ -293,7 +292,9 @@ model WorkflowNodeInstance {
 /// never copied into Node Templates or WorkflowVersion DSL snapshots.
 /// @IgnoreNestCode
 /// @IgnoreReactCode
+/// @IgnoreAutoField
 model IntegrationConnection {
+  id               BigInt                    @id @default(autoincrement())
   code             String                    @unique @default(nanoid()) @db.VarChar(64)
   name             String                    @db.VarChar(128)
   description      String?                   @db.VarChar(512)
@@ -304,32 +305,13 @@ model IntegrationConnection {
   encryptedSecrets String?                   @db.Text @map("encrypted_secrets")
   isEnabled        Boolean                   @default(true) @map("is_enabled")
   revision         Int                       @default(1)
+  creator          String?                   @map("creator") @db.VarChar(128)
+  createdAt        DateTime                  @default(now()) @map("created_at")
+  updatedAt        DateTime                  @updatedAt @default(now()) @map("updated_at")
 
   @@map("t_integration_connection")
 }
 
-/// Reusable dispatch bridge between Human Approval and provider-specific workflows.
-/// @IgnoreNestCode
-/// @IgnoreReactCode
-/// @IgnoreAutoField
-model ApprovalChannel {
-  id                 BigInt   @id @default(autoincrement())
-  code               String   @unique @db.VarChar(64)
-  name               String   @db.VarChar(128)
-  description        String?  @db.VarChar(512)
-  dispatchWorkflowId BigInt   @map("dispatch_workflow_id")
-  isEnabled          Boolean  @default(true) @map("is_enabled")
-  revision           Int      @default(1)
-  creator            String   @default("") @db.VarChar(128)
-  createdAt          DateTime @default(now()) @map("created_at")
-  updatedAt          DateTime @updatedAt @map("updated_at")
-
-  dispatchWorkflow Workflow @relation("ApprovalChannelDispatch", fields: [dispatchWorkflowId], references: [id], onDelete: Restrict)
-
-  @@index([dispatchWorkflowId], map: "idx_ac_dispatch_workflow_id")
-  @@map("t_approval_channel")
-}
-
 // Outbox Pattern：业务表触发器将事件写入此表，outbox-poller 定时扫描并触发 workflow
 /// @IgnoreAutoField
 model WorkflowEventOutbox {

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

@@ -98,7 +98,8 @@ export async function bindResourceToPage(
   );
   await prisma.pageResource.upsert({
     where: { pageId_resourceId: { pageId, resourceId: resource.id } },
-    update: { actions: FULL_ACTIONS },
+    // update: {} — 保留 DB 里手工调整的 actions
+    update: {},
     create: { pageId, resourceId: resource.id, actions: FULL_ACTIONS },
   });
   return resource;
@@ -125,7 +126,8 @@ export async function grantRoleAccess(
   for (const resourceId of resourceIds) {
     await prisma.roleResource.upsert({
       where: { roleId_resourceId: { roleId, resourceId } },
-      update: { actions: FULL_ACTIONS },
+      // update: {} — 与 RolePages 一致：保留 DB 里手工收窄的 actions
+      update: {},
       create: { roleId, resourceId, actions: FULL_ACTIONS },
     });
   }

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

@@ -25,6 +25,9 @@
  *   ── 删除页面 ──────────────────────────────────────────────────────────────────
  *   ts-node scripts/page-manage.ts delete \
  *     --pageCode    myModule        (required)
+ *     --withResources               (optional — also delete Resource rows that are
+ *                                    bound ONLY to this page, plus their RoleResource
+ *                                    rows; shared or isCommonResource resources are kept)
  *
  *   ── 绑定资源 ──────────────────────────────────────────────────────────────────
  *   ts-node scripts/page-manage.ts bind \
@@ -174,7 +177,7 @@ async function actionUpdate(flags: Record<string, string>) {
 }
 
 async function actionDelete(flags: Record<string, string>) {
-  const { pageCode } = flags;
+  const { pageCode, withResources } = flags;
   if (!pageCode) {
     console.error('[page-manage] --pageCode is required.');
     process.exit(1);
@@ -182,6 +185,11 @@ async function actionDelete(flags: Record<string, string>) {
 
   const page = await requirePage(pageCode);
 
+  const pageResources = await prisma.pageResource.findMany({
+    where: { pageId: page.id },
+    include: { resource: true },
+  });
+
   await prisma.pageResource.deleteMany({ where: { pageId: page.id } });
   await prisma.rolePages.deleteMany({ where: { pageId: page.id } });
   await prisma.page.delete({ where: { id: page.id } });
@@ -189,6 +197,33 @@ async function actionDelete(flags: Record<string, string>) {
   console.log(
     `[page-manage] ✖ Deleted page: ${pageCode} (id=${page.id}) + its PageResource + RolePages rows`,
   );
+
+  if (withResources === 'true') {
+    for (const pr of pageResources) {
+      if (pr.resource.isCommonResource) {
+        console.warn(
+          `[page-manage]   ⚠ Resource "${pr.resource.code}" is a common resource — kept`,
+        );
+        continue;
+      }
+      const otherBindings = await prisma.pageResource.count({
+        where: { resourceId: pr.resourceId },
+      });
+      if (otherBindings > 0) {
+        console.warn(
+          `[page-manage]   ⚠ Resource "${pr.resource.code}" still bound to ${otherBindings} other page(s) — kept`,
+        );
+        continue;
+      }
+      await prisma.roleResource.deleteMany({
+        where: { resourceId: pr.resourceId },
+      });
+      await prisma.resource.delete({ where: { id: pr.resourceId } });
+      console.log(
+        `[page-manage]   ✖ Deleted resource: ${pr.resource.code} (+ its RoleResource rows)`,
+      );
+    }
+  }
 }
 
 async function actionBind(flags: Record<string, string>) {

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/agenda.seed.ts

@@ -1,5 +1,4 @@
 import { PrismaClient } from '@prisma/client';
-import { ADMIN_PAGE_CODE } from '../scripts/lib/admin-code';
 import {
   bindResourceToPage,
   getPageResourceIds,
@@ -10,25 +9,26 @@ import {
 /**
  * Agenda 模块 seed
  *
- * 职责：agenda page (顶级 admin/administration 子节点) + agenda resource + 自家 SYSTEM_ADMIN 授权。
- * 前置：seedBootstrap 已建好 顶级 page 与 SYSTEM_ADMIN。
+ * 职责：agenda page (与 admin 平级的顶级菜单) + agenda resource + 自家 SYSTEM_ADMIN 授权。
+ * 前置：seedBootstrap 已建好 SYSTEM_ADMIN。
  */
 export async function seedAgendaModule(prisma: PrismaClient): Promise<void> {
   const role = await prisma.role.findUniqueOrThrow({
     where: { name: 'SYSTEM_ADMIN' },
   });
-  const admin = await prisma.page.findUniqueOrThrow({
-    where: { code: ADMIN_PAGE_CODE },
-  });
 
-  const page = await upsertPage(prisma, {
-    code: 'agenda',
-    name: 'agenda',
-    zhName: 'Cron Jobs',
-    enName: 'Cron Jobs',
-    sortOrder: 1020,
-    parentId: admin.id,
-  });
+  const page = await upsertPage(
+    prisma,
+    {
+      code: 'agenda',
+      name: 'agenda',
+      zhName: 'Cron Jobs',
+      enName: 'Cron Jobs',
+      sortOrder: 1040,
+    },
+    // 从「系统管理」子菜单提升为顶级菜单：同步 parentId/排序到已有 DB
+    { parentId: null, sortOrder: 1040 },
+  );
   console.log(`[agenda] Page: ${page.code} (id=${page.id})`);
 
   await bindResourceToPage(prisma, page.id, 'agenda', 'Agenda job management');

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/bootstrap.ts

@@ -7,9 +7,9 @@ import { grantRoleAccess, upsertPage } from '../scripts/lib/page-helpers';
  *
  * 任何模块 seed 都假设以下 3 个对象已存在：
  *   1. SYSTEM_ADMIN 角色        —— 各模块 grant SYSTEM_ADMIN 时通过 name 查找
- *   2. ADMIN_PAGE_CODE 顶级 page —— 各业务模块 page 的 parentId
+ *   2. ADMIN_PAGE_CODE 顶级 page —— 系统内置模块（permission/audit/game）page 的 parentId
  *      （默认 'admin'；ERP 通过环境变量 ADMIN_PAGE_CODE=administration 覆盖）
- *   3. dataMngt 分组 page        —— 自动生成 CRUD 页面（data-mngt.seed.ts）的 parentId
+ *   3. dataMngt 顶级分组 page    —— 自动生成 CRUD 页面（data-mngt.seed.ts）的 parentId
  *
  * 同时把 SYSTEM_ADMIN 对 顶级 / dataMngt 这两个分组节点的 RolePages 也建好，
  * 否则它们的子菜单父节点不会展开。
@@ -39,21 +39,26 @@ export async function seedBootstrap(prisma: PrismaClient): Promise<void> {
       name: ADMIN_PAGE_CODE,
       zhName: '系统管理',
       enName: 'System Mgnt',
-      sortOrder: 1000,
+      // 排顶级菜单最下面：业务菜单用 10xx
+      sortOrder: 1050,
     },
-    { zhName: '系统管理', enName: 'System Mgnt', sortOrder: 1000 },
+    { zhName: '系统管理', enName: 'System Mgnt', sortOrder: 1050 },
   );
   console.log(`[bootstrap] Page: ${adminPage.code} (id=${adminPage.id})`);
 
-  // ── dataMngt 分组 page（自动 CRUD 菜单容器） ──────────────────────────────
-  const dataMngtPage = await upsertPage(prisma, {
-    code: 'dataMngt',
-    name: '数据管理',
-    zhName: '数据管理',
-    enName: 'Data Management',
-    sortOrder: 1000,
-    parentId: adminPage.id,
-  });
+  // ── dataMngt 分组 page（自动 CRUD 菜单容器，与 admin 平级的顶级菜单） ──────
+  const dataMngtPage = await upsertPage(
+    prisma,
+    {
+      code: 'dataMngt',
+      name: '数据管理',
+      zhName: '数据管理',
+      enName: 'Data Management',
+      sortOrder: 1010,
+    },
+    // 从「系统管理」子菜单提升为顶级菜单：同步 parentId/排序到已有 DB
+    { parentId: null, sortOrder: 1010 },
+  );
   console.log(`[bootstrap] Page: ${dataMngtPage.code} (id=${dataMngtPage.id})`);
 
   // ── 分组 page 的 SYSTEM_ADMIN RolePages（无 resource） ──────────────────────

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/canvas.seed.ts

@@ -1,5 +1,4 @@
 import { PrismaClient } from '@prisma/client';
-import { ADMIN_PAGE_CODE } from '../scripts/lib/admin-code';
 import {
   bindResourceToPage,
   getPageResourceIds,
@@ -10,25 +9,26 @@ import {
 /**
  * Canvas 模块 seed
  *
- * 职责：canvas page (顶级 admin/administration 子节点) + canvas resource + 自家 SYSTEM_ADMIN 授权。
- * 前置：seedBootstrap 已建好 顶级 page 与 SYSTEM_ADMIN。
+ * 职责：canvas page (与 admin 平级的顶级菜单) + canvas resource + 自家 SYSTEM_ADMIN 授权。
+ * 前置：seedBootstrap 已建好 SYSTEM_ADMIN。
  */
 export async function seedCanvasModule(prisma: PrismaClient): Promise<void> {
   const role = await prisma.role.findUniqueOrThrow({
     where: { name: 'SYSTEM_ADMIN' },
   });
-  const admin = await prisma.page.findUniqueOrThrow({
-    where: { code: ADMIN_PAGE_CODE },
-  });
 
-  const page = await upsertPage(prisma, {
-    code: 'canvas',
-    name: 'canvas',
-    zhName: 'Canvas',
-    enName: 'Canvas',
-    sortOrder: 1010,
-    parentId: admin.id,
-  });
+  const page = await upsertPage(
+    prisma,
+    {
+      code: 'canvas',
+      name: 'canvas',
+      zhName: 'Canvas',
+      enName: 'Canvas',
+      sortOrder: 1020,
+    },
+    // 从「系统管理」子菜单提升为顶级菜单：同步 parentId/排序到已有 DB
+    { parentId: null, sortOrder: 1020 },
+  );
   console.log(`[canvas] Page: ${page.code} (id=${page.id})`);
 
   await bindResourceToPage(prisma, page.id, 'canvas', 'Canvas management');

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/index.ts

@@ -44,7 +44,7 @@ export async function main() {
 if (require.main === module) {
   main()
     .catch((e) => {
-      console.log(e);
+      console.error(e);
       process.exit(1);
     })
     .finally(async () => {