@gadmin2n/schematics 0.0.133 → 0.0.135

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

@@ -89,7 +89,7 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^10.4.0",
-    "@gadmin2n/prisma-nest-generator": "^0.0.48",
+    "@gadmin2n/prisma-nest-generator": "^0.0.49",
     "@gadmin2n/prisma-react-generator": "^0.0.65",
     "@nestjs/cli": "^11.0.21",
     "@nestjs/testing": "^10.4.15",

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/lib/auth.guard.ts

@@ -32,8 +32,31 @@ export const AllowUnauthorizedRequest = () =>
 
 export const AllowApiKeyRequest = () => SetMetadata('allowApiKeyRequest', true);
 
-async function getIdentity(headers, cookies): Promise<UserType> {
-  // 先验证woa登录态 https://iwiki.woa.com/p/4007728669#nodejs-%E7%A4%BA%E4%BE%8B
+type AuthSource = 'gadmin-token' | 'woa' | 'apikey';
+
+async function getIdentity(
+  headers,
+  cookies,
+): Promise<{ user: UserType; source: AuthSource }> {
+  // 优先验证 gadmin-token（JWT）
+  const token = headers[GAdminTokenName] || cookies[GAdminTokenName];
+  if (token) {
+    try {
+      const userInfo = await TaiHuId.verify(token);
+      logger.info(
+        `gadmin_token_auth_success - Token认证成功 - 用户ID: ${userInfo.sub}`,
+      );
+      return {
+        user: { userid: userInfo.sub, username: userInfo.sub },
+        source: 'gadmin-token',
+      };
+    } catch (e) {
+      logger.warn(`gadmin_token_auth_failed - Token验证失败: ${e.message}`);
+    }
+  }
+
+  // gadmin-token 不存在或失效，回退到 WOA 认证
+  // https://iwiki.woa.com/p/4007728669#nodejs-%E7%A4%BA%E4%BE%8B
   try {
     const { staffid, staffname } = await getWoaIdentity(
       headers,
@@ -43,23 +66,33 @@ async function getIdentity(headers, cookies): Promise<UserType> {
       logger.info(
         `woa_auth_success - 用户ID: ${staffid}, 用户名: ${staffname}`,
       );
-      return { userid: staffname, username: staffname };
+      return {
+        user: { userid: staffname, username: staffname },
+        source: 'woa',
+      };
     }
   } catch (e) {
     logger.warn(`woa_auth_failed - WOA认证失败: ${e.message}`);
   }
 
-  // 再验证taihu登录态 https://iwiki.woa.com/p/4008986665
-  const token = headers[GAdminTokenName] || cookies[GAdminTokenName];
-  const userInfo = await TaiHuId.verify(token);
-
-  logger.info(
-    `taihu_auth_success - Taihu认证成功 - 用户ID: ${userInfo.sub}, Token长度: ${
-      token ? token.length : 0
-    }`,
-  );
+  // 全部失败，抛出异常触发太湖登录流程
+  // https://iwiki.woa.com/p/4008986665
+  throw new UnauthorizedException('no valid auth credential');
+}
 
-  return { userid: userInfo.sub, username: userInfo.sub };
+async function issueGAdminTokenCookie(res, user: UserType) {
+  const expiresIn = 7 * 24 * 3600;
+  const payload = {
+    user_id: user.userid,
+    sub: user.userid,
+    name: user.username,
+    email: `${user.userid}@tencent.com`,
+  };
+  const token = await TaiHuId.sign(payload, expiresIn);
+  res.cookie(GAdminTokenName, token, {
+    maxAge: expiresIn * 1000,
+    httpOnly: false,
+  });
 }
 
 @Injectable()
@@ -95,6 +128,7 @@ export default class AuthGuard implements CanActivate {
 
   canActivate(context: ExecutionContext): boolean | Promise<boolean> {
     const request = context.switchToHttp().getRequest();
+    const response = context.switchToHttp().getResponse();
     const handler = context.getHandler();
     const controller = context.getClass();
 
@@ -124,7 +158,10 @@ export default class AuthGuard implements CanActivate {
 
     return (
       allowApiKeyRequest
-        ? this.getApikeyIdentity(request)
+        ? this.getApikeyIdentity(request).then((user) => ({
+            user,
+            source: 'apikey' as AuthSource,
+          }))
         : Promise.reject("don't allow api key request.")
     )
       .catch((error) => {
@@ -134,11 +171,23 @@ export default class AuthGuard implements CanActivate {
 
         return getIdentity(request.headers, request.cookies);
       })
-      .then((userInfo) => {
-        request.user = userInfo;
+      .then(async ({ user, source }) => {
+        request.user = user;
+
+        // WOA 认证通过时补签 gadmin-token cookie，后续请求走本地 JWT 校验，
+        // 避免每次都调用 WOA 认证接口。
+        if (source === 'woa') {
+          try {
+            await issueGAdminTokenCookie(response, user);
+          } catch (e) {
+            logger.warn(
+              `gadmin_token_sign_failed - 签发gadmin-token失败: ${e.message}`,
+            );
+          }
+        }
 
         logger.info(
-          `auth_success - 认证成功 - 用户ID: ${userInfo.userid}, 用户名: ${userInfo.username}, 端点: ${request.method} ${request.url}`,
+          `auth_success - 认证成功 - 用户ID: ${user.userid}, 用户名: ${user.username}, 端点: ${request.method} ${request.url}, 来源: ${source}`,
         );
 
         return true;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/locales/en/common.json

@@ -146,6 +146,7 @@
   "canvas": {
     "componentLib": "Components",
     "backToList": "Back to list",
+    "undo": "Undo",
     "save": "Save",
     "saveDirty": "Save •",
     "preview": "Preview",

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/locales/zh_CN/common.json

@@ -148,6 +148,7 @@
   "canvas": {
     "componentLib": "组件库",
     "backToList": "返回列表",
+    "undo": "撤销",
     "save": "保存",
     "saveDirty": "保存 •",
     "preview": "预览",

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

@@ -7,6 +7,7 @@ import type { SavedCanvas, CanvasItem } from './types';
 import type { LayoutItem } from 'react-grid-layout';
 import { fetchCanvas, updateCanvas, unpublishCanvas } from './canvasApi';
 import { useTranslation } from 'react-i18next';
+import { useCanvasHistory } from './hooks/useCanvasHistory';
 
 const CanvasEditPage: React.FC = () => {
   const { id } = useParams<{ id: string }>();
@@ -21,6 +22,7 @@ const CanvasEditPage: React.FC = () => {
   const [publishModalOpen, setPublishModalOpen] = useState(false);
   const [unpublishModalOpen, setUnpublishModalOpen] = useState(false);
   const [unpublishing, setUnpublishing] = useState(false);
+  const history = useCanvasHistory();
 
   const liveRef = useRef({
     canvas,
@@ -51,6 +53,7 @@ const CanvasEditPage: React.FC = () => {
         setCanvas(data);
         setCanvasItems(data.items ?? []);
         setCanvasLayout(data.layout ?? []);
+        history.clear();
       })
       .catch((err) => {
         console.error('[CanvasEditPage] load failed:', err);
@@ -61,25 +64,68 @@ const CanvasEditPage: React.FC = () => {
   }, [id]); // eslint-disable-line react-hooks/exhaustive-deps
 
   // ── Change handlers ──
-  const handleItemsChange = useCallback((items: CanvasItem[]) => {
-    setCanvasItems(items);
-    setIsDirty(true);
-  }, []);
+  const handleItemsChange = useCallback(
+    (items: CanvasItem[], opts?: { coalesce?: boolean }) => {
+      history.push(
+        {
+          items: liveRef.current.canvasItems,
+          layout: liveRef.current.canvasLayout,
+        },
+        opts?.coalesce ?? false,
+      );
+      setCanvasItems(items);
+      setIsDirty(true);
+    },
+    [history],
+  );
 
-  const handleLayoutChange = useCallback((layout: LayoutItem[]) => {
-    setCanvasLayout(layout);
-    setIsDirty(true);
-  }, []);
+  const handleLayoutChange = useCallback(
+    (layout: LayoutItem[], opts?: { coalesce?: boolean }) => {
+      history.push(
+        {
+          items: liveRef.current.canvasItems,
+          layout: liveRef.current.canvasLayout,
+        },
+        opts?.coalesce ?? false,
+      );
+      setCanvasLayout(layout);
+      setIsDirty(true);
+    },
+    [history],
+  );
 
   const handleBothChange = useCallback(
-    (items: CanvasItem[], layout: LayoutItem[]) => {
+    (
+      items: CanvasItem[],
+      layout: LayoutItem[],
+      opts?: { coalesce?: boolean },
+    ) => {
+      history.push(
+        {
+          items: liveRef.current.canvasItems,
+          layout: liveRef.current.canvasLayout,
+        },
+        opts?.coalesce ?? false,
+      );
       setCanvasItems(items);
       setCanvasLayout(layout);
       setIsDirty(true);
     },
-    [],
+    [history],
   );
 
+  // ── Undo: pop a snapshot and write it back directly, WITHOUT going
+  // through handleItemsChange/handleLayoutChange/handleBothChange —
+  // those push to history, which would re-add the state we're leaving
+  // and make consecutive undos toggle instead of walking further back. ──
+  const handleUndo = useCallback(() => {
+    const snapshot = history.pop();
+    if (!snapshot) return;
+    setCanvasItems(snapshot.items);
+    setCanvasLayout(snapshot.layout);
+    setIsDirty(true);
+  }, [history]);
+
   // ── Save ──
   const handleSave = useCallback(async () => {
     const { canvas, canvasItems, canvasLayout } = liveRef.current;
@@ -160,6 +206,8 @@ const CanvasEditPage: React.FC = () => {
         isDirty={isDirty}
         canvasName={canvas.name}
         isPublished={!!canvas.publishedPageCode}
+        canUndo={history.canUndo}
+        onUndo={handleUndo}
         onItemsChange={handleItemsChange}
         onLayoutChange={handleLayoutChange}
         onBothChange={handleBothChange}

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

@@ -115,9 +115,18 @@ interface CanvasPageProps {
   isDirty: boolean;
   canvasName: string;
   isPublished: boolean;
-  onItemsChange: (items: CanvasItemType[]) => void;
-  onLayoutChange: (layout: LayoutItem[]) => void;
-  onBothChange: (items: CanvasItemType[], layout: LayoutItem[]) => void;
+  canUndo: boolean;
+  onUndo: () => void;
+  onItemsChange: (
+    items: CanvasItemType[],
+    opts?: { coalesce?: boolean },
+  ) => void;
+  onLayoutChange: (layout: LayoutItem[], opts?: { coalesce?: boolean }) => void;
+  onBothChange: (
+    items: CanvasItemType[],
+    layout: LayoutItem[],
+    opts?: { coalesce?: boolean },
+  ) => void;
   onSave: () => void;
   onBack: () => void;
   onPublish: () => void;
@@ -132,6 +141,8 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
   isDirty,
   canvasName,
   isPublished,
+  canUndo,
+  onUndo,
   onItemsChange,
   onLayoutChange,
   onBothChange,
@@ -360,18 +371,22 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
   }, []);
 
   // 更新组件代码
-  const updateCode = useCallback((id: string, code: string) => {
-    const { items, onItemsChange } = liveRef.current;
-    onItemsChange(
-      items.map((item) => (item.id === id ? { ...item, code } : item)),
-    );
-  }, []);
+  const updateCode = useCallback(
+    (id: string, code: string, opts?: { coalesce?: boolean }) => {
+      const { items, onItemsChange } = liveRef.current;
+      onItemsChange(
+        items.map((item) => (item.id === id ? { ...item, code } : item)),
+        opts,
+      );
+    },
+    [],
+  );
 
   // ── canvas:patch HMR 监听 — agent 通过 POST /canvas-patch 触发画布实时更新 ──
   useEffect(() => {
     if (!import.meta.hot) return;
     const handler = ({ itemId, code }: { itemId: string; code: string }) => {
-      updateCode(itemId, code);
+      updateCode(itemId, code, { coalesce: true });
     };
     import.meta.hot.on('canvas:patch', handler);
     return () => {
@@ -404,6 +419,7 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
             minH: 2,
           },
         ],
+        { coalesce: true },
       );
     };
     import.meta.hot.on('canvas:add-item', handler);
@@ -412,6 +428,31 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
     };
   }, []);
 
+  // ── 全局 Ctrl/Cmd+Z 撤销快捷键 — 焦点在代码编辑器或普通输入框内时，
+  // 交给它们自己处理本地撤销，不拦截 ──
+  useEffect(() => {
+    const handler = (e: KeyboardEvent) => {
+      const isUndoCombo =
+        (e.ctrlKey || e.metaKey) && !e.shiftKey && e.key.toLowerCase() === 'z';
+      if (!isUndoCombo) return;
+      const active = document.activeElement as HTMLElement | null;
+      if (active) {
+        if (active.closest('.monaco-editor')) return;
+        if (
+          active.tagName === 'INPUT' ||
+          active.tagName === 'TEXTAREA' ||
+          active.isContentEditable
+        ) {
+          return;
+        }
+      }
+      e.preventDefault();
+      onUndo();
+    };
+    window.addEventListener('keydown', handler);
+    return () => window.removeEventListener('keydown', handler);
+  }, [onUndo]);
+
   // ── MultiChart 工具栏切换图表类型时，同步更新代码中的 defaultVariant ──
   useEffect(() => {
     const handler = (e: Event) => {
@@ -615,6 +656,8 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
           isDirty={isDirty}
           canvasName={canvasName}
           isPublished={isPublished}
+          canUndo={canUndo}
+          onUndo={onUndo}
           onSave={onSave}
           onBack={onBack}
           onPublish={onPublish}
@@ -868,7 +911,9 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
               code={editingItem.code}
               props={editingDef.props}
               variants={editingDef.variants}
-              onChange={(code) => updateCode(editingItem.id, code)}
+              onChange={(code) =>
+                updateCode(editingItem.id, code, { coalesce: true })
+              }
               onClose={() => setEditingId(null)}
             />
           )}

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

@@ -7,6 +7,7 @@ import {
   RocketOutlined,
   EyeOutlined,
   RobotOutlined,
+  UndoOutlined,
 } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 
@@ -14,6 +15,8 @@ interface CanvasToolbarProps {
   isDirty: boolean;
   canvasName: string;
   isPublished: boolean;
+  canUndo: boolean;
+  onUndo: () => void;
   onSave: () => void;
   onBack: () => void;
   onPublish: () => void;
@@ -26,6 +29,8 @@ const CanvasToolbar: React.FC<CanvasToolbarProps> = ({
   isDirty,
   canvasName,
   isPublished,
+  canUndo,
+  onUndo,
   onSave,
   onBack,
   onPublish,
@@ -96,6 +101,22 @@ const CanvasToolbar: React.FC<CanvasToolbarProps> = ({
             gap: 10,
           }}
         >
+          <Tooltip title={t('canvas.undo')}>
+            <Button
+              size="small"
+              icon={<UndoOutlined />}
+              onClick={onUndo}
+              disabled={!canUndo}
+              style={{
+                borderRadius: 8,
+                border: '1px solid #e0e0e0',
+                background: 'transparent',
+                color: canUndo ? '#555' : '#ccc',
+                fontWeight: 500,
+                transition: 'all 200ms ease',
+              }}
+            />
+          </Tooltip>
           {isAgentAllowed && (
             <Button
               size="small"

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

@@ -0,0 +1,65 @@
+import { useCallback, useRef, useState } from 'react';
+import type { LayoutItem } from 'react-grid-layout';
+import type { CanvasItem } from '../types';
+
+export interface CanvasSnapshot {
+  items: CanvasItem[];
+  layout: LayoutItem[];
+}
+
+/** Max number of undo steps retained before the oldest is dropped. */
+const MAX_HISTORY_SIZE = 50;
+
+/**
+ * Calls made with coalesce=true (rapid Monaco keystrokes, bursts of AI
+ * canvas:patch/canvas:add-item HMR events) merge into the same history
+ * entry as long as consecutive calls land within this window. A gap
+ * larger than this — or any coalesce=false call — starts a fresh entry.
+ */
+const COALESCE_WINDOW_MS = 5000;
+
+export function useCanvasHistory() {
+  const stackRef = useRef<CanvasSnapshot[]>([]);
+  // Timestamp of the last coalesce=true push that extended the current
+  // batch; null when the last push was discrete (coalesce=false) or no
+  // batch is in progress.
+  const lastCoalescedAtRef = useRef<number | null>(null);
+  const [canUndo, setCanUndo] = useState(false);
+
+  const push = useCallback((snapshot: CanvasSnapshot, coalesce: boolean) => {
+    const now = Date.now();
+    const continuingBatch =
+      coalesce &&
+      lastCoalescedAtRef.current !== null &&
+      now - lastCoalescedAtRef.current < COALESCE_WINDOW_MS;
+
+    if (continuingBatch) {
+      // Still the same drag/typing/AI-turn batch — extend the window,
+      // don't push another entry.
+      lastCoalescedAtRef.current = now;
+      return;
+    }
+
+    stackRef.current.push(snapshot);
+    if (stackRef.current.length > MAX_HISTORY_SIZE) {
+      stackRef.current.shift();
+    }
+    lastCoalescedAtRef.current = coalesce ? now : null;
+    setCanUndo(true);
+  }, []);
+
+  const pop = useCallback((): CanvasSnapshot | undefined => {
+    const snapshot = stackRef.current.pop();
+    lastCoalescedAtRef.current = null;
+    setCanUndo(stackRef.current.length > 0);
+    return snapshot;
+  }, []);
+
+  const clear = useCallback(() => {
+    stackRef.current = [];
+    lastCoalescedAtRef.current = null;
+    setCanUndo(false);
+  }, []);
+
+  return { push, pop, clear, canUndo };
+}

package/package.json

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