@gadmin2n/schematics 0.0.68 → 0.0.70

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/RolePages.ts

@@ -0,0 +1,70 @@
+import { ModelConfig } from "../.types";
+import { pageActions, PAGE_SIZE } from "./_common";
+
+export const RolePages: ModelConfig = 
+{ 
+  metadata: {
+    nameKeys: ["id"],
+    pageActions,
+  },
+  table: {
+    toolbar: {
+      searchBar: {
+        fields: ["id"],
+        containsFields: [],
+        placeholder: "id",
+      },
+      actions: [
+        {action: 'REFRESH', desc: 'Refresh'},
+        {action: 'SETTING', desc: 'Setting'},
+        {
+          action: "EXPORT",
+          desc: 'export',
+          fields: ["*","!createdAt","!role.*","role","!page.*","page"]
+        },
+      ],
+    },
+    header: {
+      filter: ["role","page"],
+      sorter: ["id"],
+    },
+    fields: ["*","!createdAt","!role.*","role","!page.*","page"],
+    rowSelection: {
+      actions: [
+        {action: 'INSERT', desc: 'Insert'},
+        
+        {action: 'DELETE', desc: 'Delete'},
+        {action: 'EXPORT', desc: 'Export'},
+      ],
+    },
+    rowActions: {
+      visibleNum: 2,
+      actions: [
+        {
+          action: "EDIT",
+          desc: "Edit",
+        },
+        
+        {action: "DELETE", desc: 'Delete'}
+      ],
+    },
+    params: {
+      pageSize: PAGE_SIZE,
+    },
+  },
+  form: {
+    fields: ["*","!creator","!createdAt","!updatedAt","!role.*","!page.*"],
+    reaction: {
+      id: {
+        toggle: [],
+        defaultProps: {
+          hidden: true,
+        },
+      },
+    },
+  },
+  show: {
+    fields: ["*","!createdAt","!role.*","role","!page.*","page"],
+  },
+}
+;

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/RoleResource.ts

@@ -0,0 +1,70 @@
+import { ModelConfig } from "../.types";
+import { pageActions, PAGE_SIZE } from "./_common";
+
+export const RoleResource: ModelConfig = 
+{ 
+  metadata: {
+    nameKeys: ["id"],
+    pageActions,
+  },
+  table: {
+    toolbar: {
+      searchBar: {
+        fields: ["id"],
+        containsFields: [],
+        placeholder: "id",
+      },
+      actions: [
+        {action: 'REFRESH', desc: 'Refresh'},
+        {action: 'SETTING', desc: 'Setting'},
+        {
+          action: "EXPORT",
+          desc: 'export',
+          fields: ["*","!createdAt","!role.*","role","!resource.*","resource"]
+        },
+      ],
+    },
+    header: {
+      filter: ["role","resource"],
+      sorter: ["id"],
+    },
+    fields: ["*","!createdAt","!role.*","role","!resource.*","resource"],
+    rowSelection: {
+      actions: [
+        {action: 'INSERT', desc: 'Insert'},
+        
+        {action: 'DELETE', desc: 'Delete'},
+        {action: 'EXPORT', desc: 'Export'},
+      ],
+    },
+    rowActions: {
+      visibleNum: 2,
+      actions: [
+        {
+          action: "EDIT",
+          desc: "Edit",
+        },
+        
+        {action: "DELETE", desc: 'Delete'}
+      ],
+    },
+    params: {
+      pageSize: PAGE_SIZE,
+    },
+  },
+  form: {
+    fields: ["*","!creator","!createdAt","!updatedAt","!role.*","!resource.*"],
+    reaction: {
+      id: {
+        toggle: [],
+        defaultProps: {
+          hidden: true,
+        },
+      },
+    },
+  },
+  show: {
+    fields: ["*","!createdAt","!role.*","role","!resource.*","resource"],
+  },
+}
+;

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/SavedQuery.ts

@@ -0,0 +1,70 @@
+import { ModelConfig } from "../.types";
+import { pageActions, PAGE_SIZE } from "./_common";
+
+export const SavedQuery: ModelConfig = 
+{ 
+  metadata: {
+    nameKeys: ["id"],
+    pageActions,
+  },
+  table: {
+    toolbar: {
+      searchBar: {
+        fields: ["id"],
+        containsFields: [],
+        placeholder: "id",
+      },
+      actions: [
+        {action: 'REFRESH', desc: 'Refresh'},
+        {action: 'SETTING', desc: 'Setting'},
+        {
+          action: "EXPORT",
+          desc: 'export',
+          fields: ["*","!createdAt"]
+        },
+      ],
+    },
+    header: {
+      filter: [],
+      sorter: ["id"],
+    },
+    fields: ["*","!createdAt"],
+    rowSelection: {
+      actions: [
+        {action: 'INSERT', desc: 'Insert'},
+        
+        {action: 'DELETE', desc: 'Delete'},
+        {action: 'EXPORT', desc: 'Export'},
+      ],
+    },
+    rowActions: {
+      visibleNum: 2,
+      actions: [
+        {
+          action: "EDIT",
+          desc: "Edit",
+        },
+        
+        {action: "DELETE", desc: 'Delete'}
+      ],
+    },
+    params: {
+      pageSize: PAGE_SIZE,
+    },
+  },
+  form: {
+    fields: ["*","!creator","!createdAt","!updatedAt"],
+    reaction: {
+      id: {
+        toggle: [],
+        defaultProps: {
+          hidden: true,
+        },
+      },
+    },
+  },
+  show: {
+    fields: ["*","!createdAt"],
+  },
+}
+;

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/User.ts

@@ -0,0 +1,70 @@
+import { ModelConfig } from "../.types";
+import { pageActions, PAGE_SIZE } from "./_common";
+
+export const User: ModelConfig = 
+{ 
+  metadata: {
+    nameKeys: ["id"],
+    pageActions,
+  },
+  table: {
+    toolbar: {
+      searchBar: {
+        fields: ["id"],
+        containsFields: [],
+        placeholder: "id",
+      },
+      actions: [
+        {action: 'REFRESH', desc: 'Refresh'},
+        {action: 'SETTING', desc: 'Setting'},
+        {
+          action: "EXPORT",
+          desc: 'export',
+          fields: ["*","!createdAt"]
+        },
+      ],
+    },
+    header: {
+      filter: ["roles"],
+      sorter: ["id","roles"],
+    },
+    fields: ["*","!createdAt"],
+    rowSelection: {
+      actions: [
+        {action: 'INSERT', desc: 'Insert'},
+        
+        {action: 'DELETE', desc: 'Delete'},
+        {action: 'EXPORT', desc: 'Export'},
+      ],
+    },
+    rowActions: {
+      visibleNum: 2,
+      actions: [
+        {
+          action: "EDIT",
+          desc: "Edit",
+        },
+        
+        {action: "DELETE", desc: 'Delete'}
+      ],
+    },
+    params: {
+      pageSize: PAGE_SIZE,
+    },
+  },
+  form: {
+    fields: ["*","!creator","!createdAt","!updatedAt"],
+    reaction: {
+      id: {
+        toggle: [],
+        defaultProps: {
+          hidden: true,
+        },
+      },
+    },
+  },
+  show: {
+    fields: ["*","!createdAt"],
+  },
+}
+;

package/dist/lib/application/files/gadmin2-game-angle-demo/readme.md

@@ -13,6 +13,31 @@ Check CLI version
 $ gadmin2 -v
 ```
 
+## Template Sync
+
+本项目是 gadmin2 的实例项目。日常在本项目迭代新功能，完成后需要同步回模板。
+
+### 查看与模板的差异
+```bash
+# 完整 diff（含文件内容差异）
+$ gadmin2 template diff
+
+# 只看文件列表
+$ gadmin2 template diff --no-content
+```
+
+### 从模板拉取更新
+```bash
+# 预览变更（不执行）
+$ gadmin2 template update --dry-run
+
+# 执行更新（冲突文件会生成 conflict markers）
+$ gadmin2 template update
+
+# 跳过确认
+$ gadmin2 template update -y
+```
+
 ## Usage
 
 ### Define data model
@@ -45,5 +70,73 @@ $ yarn start:dev
 ```
 About nestjs server [read more](https://ptc.coding.intlgame.com/p/gadmin2/d/schematics/git/tree/master/src/lib/application/files/server/nest/README.md)
 
-## License
-Gadmin2 is [MIT licensed](LICENSE).
+## 登录流程
+
+```
+┌─────────────────────────────────────────────────────────────────┐
+│                        用户访问页面                              │
+└──────────────────────────────┬──────────────────────────────────┘
+                               │
+                               ▼
+                    authProvider.check()
+                       checkLogin()
+                               │
+               ┌───────────────┼───────────────┐
+               ▼               ▼               ▼
+          URL 有            Cookie 有        两者都没有
+       gadmin-token       gadmin-token
+               │               │               │
+               ▼               │               ▼
+      写入 Cookie             │         返回 false
+      返回 true              │               │
+               │               │               ▼
+               └───────────────┘     redirect to /login
+                       │                      │
+                       │                      ▼
+                       │              login() 函数
+                       │                      │
+                       │                      ▼
+                       │      跳转后端 /login?redirect_url=当前URL
+                       │                      │
+                       │          ┌───────────┴────────────┐
+                       │          ▼                        ▼
+                       │    WOA 认证成功             Taihu 认证成功
+                       │    (x-tai-identity          (gadmin-token
+                       │      等 header)                cookie)
+                       │          └───────────┬────────────┘
+                       │                      │
+                       │                      ▼
+                       │      redirect 回 redirect_url
+                       │      ?gadmin-token=<JWT>
+                       │                      │
+                       └──────────────────────┘
+                               │
+                               ▼ authenticated: true
+                    ┌──────────────────────┐
+                    │      进入页面         │
+                    └──────────┬───────────┘
+                               │
+                               ▼
+                     发起 API 请求
+                  requestHeaders() 自动携带
+                  Cookie 中的 gadmin-token
+                               │
+                    ┌──────────┴──────────┐
+                    ▼                     ▼
+                 200 OK               401 响应
+                    │                     │
+                    ▼                     ▼
+                正常使用           login() 函数
+                              跳转后端 /login 重新认证
+```
+
+**关键节点说明：**
+
+| 位置 | 文件 | 作用 |
+|------|------|------|
+| `checkLogin()` | `web/src/helpers/login.ts` | 检查 URL 参数 / Cookie，将 URL token 存入 Cookie |
+| `authProvider.check()` | `web/src/authProvider.ts` | Refine 框架调用，决定是否已认证 |
+| `login()` | `web/src/helpers/login.ts` | 跳转后端登录页，携带 `redirect_url` |
+| 后端 `/login` | NestJS | 走 WOA 或 Taihu OAuth，认证后带 token 跳回前端 |
+| axios 拦截器 | `web/src/helpers/http.ts` | 捕获 API 401，触发重新登录 |
+| `requestHeaders()` | `web/src/helpers/login.ts` | 每次请求自动从 Cookie 读取 token 加入 header |

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

@@ -15,12 +15,14 @@ module.exports = {
     node: true,
     jest: true,
   },
-  ignorePatterns: ['.eslintrc.js'],
+  ignorePatterns: ['.eslintrc.js', 'node_modules/', 'dist/'],
   rules: {
     '@typescript-eslint/interface-name-prefix': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-var-requires': 'off',
+    '@typescript-eslint/no-empty-function': 'warn',
+    'import/order': 'off',
   },
-  "quote": "single"   
 };

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

@@ -1 +1,7 @@
-src/**/*.enum.ts
+src/**/*.enum.ts
+src/generated/**
+dist/**
+node_modules/**
+src/generated/**
+dist/**
+node_modules/**

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

@@ -1,5 +1,3 @@
-import { debug } from "console";
-
 const config: Record<string, any> = {
   nest: {
     port: 8000,
@@ -40,7 +38,7 @@ const config: Record<string, any> = {
     path: 'api',
   },
   graphql: {
-    playgroundEnabled: true,
+    canvasEnabled: true,
     debug: true,
     schemaDestination: './src/schema.graphql',
     sortSchema: true,

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

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/nest-cli",
-  "collection": "@gadmin2/schematics",
+  "collection": "@gadmin2n/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
     "plugins": [
@@ -13,5 +13,5 @@
       }
     ]
   },
-  "template": "gadmin2-game-angle-demo"
+  "template": "gadmin2n-game-angle-demo"
 }

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

@@ -8,7 +8,7 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "gadmin2 build",
-    "format": "prettier --write \"../config/*.ts\" \"src/**/*.ts\" \"src/**/*.tsx\" \"test/**/*.ts\"",
+    "format": "prettier --write \"../config/*.ts\" \"src/**/*.ts\" \"test/**/*.ts\"",
     "prepare": "cd .. && husky install",
     "start": "dotenv -e .env.local -e .env  -- gadmin2 start",
     "start:dev": "dotenv -e .env.local -e .env  -- gadmin2 start --watch",
@@ -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 seed/seedDataMngtPages.ts",
+    "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",
     "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",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@azure/identity": "^4.13.0",
-    "@gadmin2n/nest-common": "^0.0.39",
+    "@gadmin2n/nest-common": "^0.0.41",
     "@nestjs/cache-manager": "^3.0.1",
     "@nestjs/common": "^10.4.15",
     "@nestjs/config": "^3.2.0",
@@ -84,8 +84,9 @@
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@gadmin2n/prisma-nest-generator": "^0.0.33",
-    "@gadmin2n/prisma-react-generator": "^0.0.49",
+    "@faker-js/faker": "^10.4.0",
+    "@gadmin2n/prisma-nest-generator": "^0.0.35",
+    "@gadmin2n/prisma-react-generator": "^0.0.51",
     "@nestjs/testing": "^10.4.15",
     "@types/cookie-parser": "^1.4.3",
     "@types/express": "^4.17.21",

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

@@ -0,0 +1,157 @@
+/**
+ * page-helpers.ts — 页面与权限管理的共享 DB 操作原语
+ *
+ * 接受 PrismaClient 作为参数，可被 CLI 脚本（page-manage.ts / permission-manage.ts）
+ * 和 seed 函数（syncDataMngtPages.ts / seed/permissions.ts）共同调用。
+ */
+
+import { PrismaClient } from '@prisma/client';
+
+export const FULL_ACTIONS = ['createAny', 'readAny', 'updateAny', 'deleteAny'];
+
+// ─── Resource ─────────────────────────────────────────────────────────────────
+
+/**
+ * Upsert a Resource row.
+ * update: {} preserves any manual edits on re-run.
+ */
+export async function upsertResource(
+  prisma: PrismaClient,
+  code: string,
+  description = `${code} resource`,
+) {
+  return prisma.resource.upsert({
+    where: { code },
+    update: {},
+    create: { code, name: code, description, isCommonResource: false },
+  });
+}
+
+// ─── Page ─────────────────────────────────────────────────────────────────────
+
+export interface PageDef {
+  code: string;
+  name: string;
+  zhName?: string;
+  enName?: string;
+  sortOrder?: number;
+  parentId?: number;
+  isVirtual?: boolean;
+  /** Only applied on create — update: {} preserves user edits */
+  path?: string;
+}
+
+/**
+ * Upsert a Page row.
+ * update: {} on the default call so manual DB edits are preserved.
+ * Pass updateData to selectively sync specific fields (e.g. path).
+ */
+export async function upsertPage(
+  prisma: PrismaClient,
+  def: PageDef,
+  updateData: Record<string, unknown> = {},
+) {
+  return prisma.page.upsert({
+    where: { code: def.code },
+    update: updateData,
+    create: {
+      code: def.code,
+      name: def.name,
+      zhName: def.zhName ?? def.name,
+      enName: def.enName ?? def.name,
+      isVirtual: def.isVirtual ?? false,
+      sortOrder: def.sortOrder ?? 9999,
+      ...(def.parentId !== undefined && { parentId: def.parentId }),
+      ...(def.path !== undefined && { path: def.path }),
+    },
+  });
+}
+
+// ─── PageResource ─────────────────────────────────────────────────────────────
+
+/**
+ * Upsert a Resource then link it to a page via PageResource.
+ * Idempotent — safe to re-run.
+ */
+export async function bindResourceToPage(
+  prisma: PrismaClient,
+  pageId: number,
+  code: string,
+  description?: string,
+) {
+  const resource = await upsertResource(
+    prisma,
+    code,
+    description ?? `${code} resource`,
+  );
+  await prisma.pageResource.upsert({
+    where: { pageId_resourceId: { pageId, resourceId: resource.id } },
+    update: { actions: FULL_ACTIONS },
+    create: { pageId, resourceId: resource.id, actions: FULL_ACTIONS },
+  });
+  return resource;
+}
+
+// ─── Role access ──────────────────────────────────────────────────────────────
+
+/**
+ * Grant a role access to a page + its linked resources.
+ * Upserts RolePages and one RoleResource per resource.
+ */
+export async function grantRoleAccess(
+  prisma: PrismaClient,
+  roleId: number,
+  pageId: number,
+  resourceIds: number[],
+) {
+  await prisma.rolePages.upsert({
+    where: { roleId_pageId: { roleId, pageId } },
+    update: {},
+    create: { roleId, pageId },
+  });
+
+  for (const resourceId of resourceIds) {
+    await prisma.roleResource.upsert({
+      where: { roleId_resourceId: { roleId, resourceId } },
+      update: { actions: FULL_ACTIONS },
+      create: { roleId, resourceId, actions: FULL_ACTIONS },
+    });
+  }
+}
+
+/**
+ * Revoke a role's access to a page + its linked resources.
+ * Deletes RolePages and RoleResource rows.
+ */
+export async function revokeRoleAccess(
+  prisma: PrismaClient,
+  roleId: number,
+  pageId: number,
+  resourceIds: number[],
+) {
+  await prisma.rolePages.deleteMany({ where: { roleId, pageId } });
+
+  for (const resourceId of resourceIds) {
+    await prisma.roleResource.deleteMany({ where: { roleId, resourceId } });
+  }
+}
+
+// ─── Convenience: get resource IDs linked to a page ──────────────────────────
+
+export async function getPageResourceIds(
+  prisma: PrismaClient,
+  pageId: number,
+): Promise<number[]> {
+  const rows = await prisma.pageResource.findMany({
+    where: { pageId },
+    select: { resourceId: true },
+  });
+  return rows.map((r) => r.resourceId);
+}
+
+export async function getPageResources(prisma: PrismaClient, pageId: number) {
+  return prisma.pageResource.findMany({
+    where: { pageId },
+    include: { resource: { select: { id: true, code: true } } },
+  });
+}