@gadmin2n/schematics 0.0.136 → 0.0.137

package/dist/lib/application/files/gadmin2-game-angle-demo/web/ecosystem.dev.config.cjs

@@ -1,6 +1,11 @@
 // pm2 dev 场景专用配置：直接跑 vite CLI，不套 npm 壳。
 // 由 branch.service.ts 通过 pm2 CLI 传入 PM2_NAME / VITE_PORT / VITE_BRANCH_OWNER 等环境变量。
-// vite 自己会读 .env / .env.local，无需 dotenv-cli 层。
+const path = require('path');
+const dotenv = require('dotenv');
+
+const baseEnv = dotenv.config({ path: path.join(__dirname, '.env') }).parsed || {};
+const localEnv = dotenv.config({ path: path.join(__dirname, '.env.local') }).parsed || {};
+
 module.exports = {
   apps: [
     {
@@ -13,9 +18,15 @@ module.exports = {
       // NODE_OPTIONS 保留原 package.json 里的 4GB 上限设置。
       node_args: '--max-old-space-size=4096',
       env: {
+        ...baseEnv,
+        ...localEnv,
+        // branch.service.ts 注入的变量优先，覆盖 .env* 里的默认值
         ...(process.env.VITE_BRANCH_OWNER
           ? { VITE_BRANCH_OWNER: process.env.VITE_BRANCH_OWNER }
           : {}),
+        ...(process.env.VITE_PORT
+          ? { VITE_PORT: process.env.VITE_PORT }
+          : {}),
       },
     },
   ],

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

@@ -65,6 +65,7 @@
     "@typescript-eslint/parser": "^8.59.0",
     "@vitejs/plugin-react": "^4.3.4",
     "autoprefixer": "^10.4.24",
+    "dotenv": "^17.4.2",
     "eslint": "^8",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^4",

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

@@ -14,6 +14,7 @@ import { useTranslation } from 'react-i18next';
 import type { MenuProps } from 'antd';
 import { agentAttrs } from 'components/agentPanel/agentAttributes';
 import { HEADER_HEIGHT, Z_INDEX } from 'constants/layout';
+import { SUPPORTED_LANGUAGES } from '../../i18n';
 
 type IUser = {
   id: number;
@@ -37,7 +38,7 @@ export const Header: React.FC = () => {
   const langMenu = useMemo<MenuProps>(
     () => ({
       selectedKeys: currentLocale ? [currentLocale] : [],
-      items: [...(i18n.languages || [])].sort().map((lang: string) => ({
+      items: [...SUPPORTED_LANGUAGES].sort().map((lang: string) => ({
         key: lang,
         icon: (
           <span style={{ marginRight: 8, display: 'inline-flex' }}>
@@ -48,7 +49,7 @@ export const Header: React.FC = () => {
       })),
       onClick: ({ key: lang }) => changeLanguage(lang),
     }),
-    [i18n.languages, currentLocale, changeLanguage],
+    [currentLocale, changeLanguage],
   );
 
   const currentLanguageLabel = currentLocale === 'en' ? 'English' : '中文';

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

@@ -1,4 +1,5 @@
-import React, { lazy, Suspense } from 'react';
+import React, { Suspense } from 'react';
+import { lazyWithReload } from 'utilities/lazy-with-reload';
 import { Outlet, Route } from 'react-router-dom';
 import { Spin } from 'antd';
 import generatedResources from 'generated/resources';
@@ -184,7 +185,7 @@ export const routeRegistry: Record<string, RouteEntry> = {
           // 菜单指引 — sortOrder 1020, code: admin.permission.readme
           permission_readme: {
             path: 'readme',
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/permissionReadme').then((m) => ({
                 default: m.PermissionReadmePage,
               })),
@@ -193,14 +194,14 @@ export const routeRegistry: Record<string, RouteEntry> = {
           // 用户管理 — sortOrder 1030, code: admin.permission.user
           user: {
             path: 'user',
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/user').then((m) => ({ default: m.UserListPage })),
             ),
           },
           // 角色管理 — sortOrder 1040, code: admin.permission.role
           role: {
             path: 'role-list',
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/role').then((m) => ({
                 default: m.RoleManagementListPage,
               })),
@@ -209,7 +210,7 @@ export const routeRegistry: Record<string, RouteEntry> = {
           // 页面管理 — sortOrder 1050, code: admin.permission.page
           page: {
             path: 'page-list',
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/page/list').then((m) => ({
                 default: m.PageManagementListPage,
               })),
@@ -218,7 +219,7 @@ export const routeRegistry: Record<string, RouteEntry> = {
           // 资源管理 — sortOrder 1060, code: admin.permission.resource
           resource: {
             path: 'resource-list',
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/resource').then((m) => ({
                 default: m.ResourceManagementListPage,
               })),
@@ -237,7 +238,7 @@ export const routeRegistry: Record<string, RouteEntry> = {
           list: {
             path: '',
             index: true,
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/canvas').then((m) => ({
                 default: m.CanvasListPage,
               })),
@@ -245,7 +246,7 @@ export const routeRegistry: Record<string, RouteEntry> = {
           },
           edit: {
             path: 'edit/:id',
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/canvas').then((m) => ({
                 default: m.CanvasEditPage,
               })),
@@ -256,7 +257,7 @@ export const routeRegistry: Record<string, RouteEntry> = {
       // Canvas published pages (dynamic, DB-driven)
       'canvas-page': {
         path: 'p/:slug',
-        component: lazy(() => import('routes/canvas-page')),
+        component: lazyWithReload(() => import('routes/canvas-page')),
       },
       /*game: {
         path: 'game-list',
@@ -264,25 +265,25 @@ export const routeRegistry: Record<string, RouteEntry> = {
           list: {
             path: '',
             index: true,
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/game').then((m) => ({ default: m.GameList })),
             ),
           },
           show: {
             path: 'show/:id',
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/game').then((m) => ({ default: m.GameShow })),
             ),
           },
           edit: {
             path: 'edit/:id',
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/game').then((m) => ({ default: m.GameEdit })),
             ),
           },
           create: {
             path: 'create',
-            component: lazy(() =>
+            component: lazyWithReload(() =>
               import('routes/game').then((m) => ({ default: m.GameCreate })),
             ),
           },
@@ -295,11 +296,11 @@ export const routeRegistry: Record<string, RouteEntry> = {
           list: {
             path: '',
             index: true,
-            component: lazy(() => import('routes/agenda')),
+            component: lazyWithReload(() => import('routes/agenda')),
           },
           show: {
             path: 'show/:jobName',
-            component: lazy(() => import('routes/agenda/show')),
+            component: lazyWithReload(() => import('routes/agenda/show')),
           },
         },
       },
@@ -310,56 +311,68 @@ export const routeRegistry: Record<string, RouteEntry> = {
           workflow_list: {
             path: '',
             index: true,
-            component: lazy(() => import('routes/workflow')),
+            component: lazyWithReload(() => import('routes/workflow')),
           },
           editor_new: {
             path: 'create',
-            component: lazy(() => import('routes/workflow/editor')),
+            component: lazyWithReload(() => import('routes/workflow/editor')),
           },
           instances: {
             path: 'instances/show/:workflowId',
-            component: lazy(() => import('routes/workflow/instances')),
+            component: lazyWithReload(
+              () => import('routes/workflow/instances'),
+            ),
           },
           instanceDetail: {
             path: 'instance/show/:instanceId',
-            component: lazy(() => import('routes/workflow/instance-detail')),
+            component: lazyWithReload(
+              () => import('routes/workflow/instance-detail'),
+            ),
           },
           editor: {
             path: 'edit/:id',
-            component: lazy(() => import('routes/workflow/editor')),
+            component: lazyWithReload(() => import('routes/workflow/editor')),
           },
           show: {
             path: 'show/:id',
-            component: lazy(() => import('routes/workflow/show')),
+            component: lazyWithReload(() => import('routes/workflow/show')),
           },
           workflow_node_instance: {
             path: 'node-instances',
-            component: lazy(() => import('routes/workflow/node-instances')),
+            component: lazyWithReload(
+              () => import('routes/workflow/node-instances'),
+            ),
           },
           nodeInstanceCreate: {
             path: 'node-instances/create',
-            component: lazy(
+            component: lazyWithReload(
               () => import('routes/workflow/node-instances/create'),
             ),
           },
           nodeInstanceEdit: {
             path: 'node-instances/edit/:id',
-            component: lazy(
+            component: lazyWithReload(
               () => import('routes/workflow/node-instances/edit'),
             ),
           },
           nodeInstanceShow: {
             path: 'node-instances/show/:id',
-            component: lazy(
+            component: lazyWithReload(
               () => import('routes/workflow/node-instances/show'),
             ),
           },
+          workflow_temporal_tenant: {
+            path: 'temporal-tenant',
+            component: lazyWithReload(
+              () => import('routes/workflow/temporal-tenant'),
+            ),
+          },
         },
       },
       // 操作日志 — sortOrder 1070, code: admin.audit
       audits: {
         path: 'audit-log-list',
-        component: lazy(() =>
+        component: lazyWithReload(() =>
           import('routes/audit').then((m) => ({ default: m.AuditLogPage })),
         ),
       },

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

@@ -1,4 +1,6 @@
 import i18n from 'i18next';
+
+export const SUPPORTED_LANGUAGES = ['en', 'zh_CN'] as const;
 import { initReactI18next } from 'react-i18next';
 import detector from 'i18next-browser-languagedetector';
 import en from './locales/en/common.json';
@@ -8,7 +10,7 @@ i18n
   .use(detector)
   .use(initReactI18next)
   .init({
-    supportedLngs: ['en', 'zh_CN'],
+    supportedLngs: [...SUPPORTED_LANGUAGES],
     resources: {
       en: { common: en },
       zh_CN: { common: zh_CN },

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

@@ -147,6 +147,7 @@
     "componentLib": "Components",
     "backToList": "Back to list",
     "undo": "Undo",
+    "redo": "Redo",
     "save": "Save",
     "saveDirty": "Save •",
     "preview": "Preview",
@@ -295,6 +296,8 @@
       "myCanvases": "My Canvas",
       "othersCanvases": "Others' Canvas",
       "create": "New Canvas",
+      "import": "Import",
+      "export": "Export",
       "published": "Published",
       "unpublished": "Unpublished",
       "rename": "Rename",

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

@@ -149,6 +149,7 @@
     "componentLib": "组件库",
     "backToList": "返回列表",
     "undo": "撤销",
+    "redo": "重做",
     "save": "保存",
     "saveDirty": "保存 •",
     "preview": "预览",
@@ -297,6 +298,8 @@
       "myCanvases": "我的 Canvas",
       "othersCanvases": "其他人的 Canvas",
       "create": "新建 Canvas",
+      "import": "导入",
+      "export": "导出",
       "published": "已发布",
       "unpublished": "未发布",
       "rename": "重命名",

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

@@ -114,12 +114,28 @@ const CanvasEditPage: React.FC = () => {
     [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. ──
+  // ── Undo/Redo: move a snapshot between the two stacks and write it
+  // back directly, WITHOUT going through handleItemsChange/
+  // handleLayoutChange/handleBothChange — those push to history, which
+  // would corrupt the undo/redo chain (consecutive undos would toggle
+  // instead of walking further back, and redo would get cleared by its
+  // own undo). ──
   const handleUndo = useCallback(() => {
-    const snapshot = history.pop();
+    const snapshot = history.undo({
+      items: liveRef.current.canvasItems,
+      layout: liveRef.current.canvasLayout,
+    });
+    if (!snapshot) return;
+    setCanvasItems(snapshot.items);
+    setCanvasLayout(snapshot.layout);
+    setIsDirty(true);
+  }, [history]);
+
+  const handleRedo = useCallback(() => {
+    const snapshot = history.redo({
+      items: liveRef.current.canvasItems,
+      layout: liveRef.current.canvasLayout,
+    });
     if (!snapshot) return;
     setCanvasItems(snapshot.items);
     setCanvasLayout(snapshot.layout);
@@ -208,6 +224,8 @@ const CanvasEditPage: React.FC = () => {
         isPublished={!!canvas.publishedPageCode}
         canUndo={history.canUndo}
         onUndo={handleUndo}
+        canRedo={history.canRedo}
+        onRedo={handleRedo}
         onItemsChange={handleItemsChange}
         onLayoutChange={handleLayoutChange}
         onBothChange={handleBothChange}

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

@@ -9,8 +9,15 @@ import {
   Modal,
   Input,
   Typography,
+  Space,
 } from 'antd';
-import { PlusOutlined, DeleteOutlined, EditOutlined } from '@ant-design/icons';
+import {
+  PlusOutlined,
+  DeleteOutlined,
+  EditOutlined,
+  ExportOutlined,
+  ImportOutlined,
+} from '@ant-design/icons';
 import {
   fetchCanvases,
   createCanvas,
@@ -21,6 +28,8 @@ import {
 } from './canvasApi';
 import type { SavedCanvas } from './types';
 import IsolatedLivePreview from './IsolatedLivePreview';
+import { ExportModal } from './components/ExportModal';
+import { ImportModal } from './components/ImportModal';
 import { useTranslation } from 'react-i18next';
 import { useUserPageAccess } from 'hooks/useUserPageAccess';
 import { customRequest } from 'helpers/http';
@@ -196,6 +205,11 @@ const CanvasListPage: React.FC = () => {
     }
   }, [renameModal, renameValue]);
 
+  // ── 导出/导入 ──
+  const [exportModalOpen, setExportModalOpen] = useState(false);
+  const [exportCanvasId, setExportCanvasId] = useState<string | null>(null);
+  const [importModalOpen, setImportModalOpen] = useState(false);
+
   // ── 删除确认 ──
   const [deleteConfirm, setDeleteConfirm] = useState<SavedCanvas | null>(null);
 
@@ -233,15 +247,25 @@ const CanvasListPage: React.FC = () => {
           <Typography.Title level={4} style={{ margin: 0 }}>
             {t('canvas.list.title')}
           </Typography.Title>
-          {isAgentAllowed && (
-            <Button
-              type="primary"
-              icon={<PlusOutlined />}
-              onClick={handleCreate}
-            >
-              {t('canvas.list.create')}
-            </Button>
-          )}
+          <Space>
+            {isAgentAllowed && (
+              <Button
+                icon={<ImportOutlined />}
+                onClick={() => setImportModalOpen(true)}
+              >
+                {t('canvas.list.import')}
+              </Button>
+            )}
+            {isAgentAllowed && (
+              <Button
+                type="primary"
+                icon={<PlusOutlined />}
+                onClick={handleCreate}
+              >
+                {t('canvas.list.create')}
+              </Button>
+            )}
+          </Space>
         </div>
       </Card>
 
@@ -362,6 +386,19 @@ const CanvasListPage: React.FC = () => {
                     <div style={{ display: 'flex', gap: 4 }}>
                       {isAgentAllowed && (
                         <>
+                          <Button
+                            type="text"
+                            size="small"
+                            icon={<ExportOutlined />}
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              setExportCanvasId(canvas.id);
+                              setExportModalOpen(true);
+                            }}
+                            style={{ fontSize: 12, color: '#666' }}
+                          >
+                            {t('canvas.list.export')}
+                          </Button>
                           <Button
                             type="text"
                             size="small"
@@ -602,6 +639,25 @@ const CanvasListPage: React.FC = () => {
             : t('canvas.list.deleteConfirm')}
         </p>
       </Modal>
+
+      <ExportModal
+        open={exportModalOpen}
+        canvasId={exportCanvasId}
+        onClose={() => {
+          setExportModalOpen(false);
+          setExportCanvasId(null);
+        }}
+      />
+
+      <ImportModal
+        open={importModalOpen}
+        onClose={() => setImportModalOpen(false)}
+        onSuccess={() => {
+          fetchCanvases()
+            .then(setCanvases)
+            .catch(() => message.error(t('canvas.list.loadFailed')));
+        }}
+      />
     </div>
   );
 };

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

@@ -117,6 +117,8 @@ interface CanvasPageProps {
   isPublished: boolean;
   canUndo: boolean;
   onUndo: () => void;
+  canRedo: boolean;
+  onRedo: () => void;
   onItemsChange: (
     items: CanvasItemType[],
     opts?: { coalesce?: boolean },
@@ -143,6 +145,8 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
   isPublished,
   canUndo,
   onUndo,
+  canRedo,
+  onRedo,
   onItemsChange,
   onLayoutChange,
   onBothChange,
@@ -428,13 +432,12 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
     };
   }, []);
 
-  // ── 全局 Ctrl/Cmd+Z 撤销快捷键 — 焦点在代码编辑器或普通输入框内时，
-  // 交给它们自己处理本地撤销，不拦截 ──
+  // ── 全局 Ctrl/Cmd+Z 撤销 / Ctrl/Cmd+Shift+Z 重做快捷键 — 焦点在代码编辑器
+  // 或普通输入框内时，交给它们自己处理本地撤销/重做，不拦截 ──
   useEffect(() => {
     const handler = (e: KeyboardEvent) => {
-      const isUndoCombo =
-        (e.ctrlKey || e.metaKey) && !e.shiftKey && e.key.toLowerCase() === 'z';
-      if (!isUndoCombo) return;
+      const isZCombo = (e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'z';
+      if (!isZCombo) return;
       const active = document.activeElement as HTMLElement | null;
       if (active) {
         if (active.closest('.monaco-editor')) return;
@@ -447,11 +450,15 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
         }
       }
       e.preventDefault();
-      onUndo();
+      if (e.shiftKey) {
+        onRedo();
+      } else {
+        onUndo();
+      }
     };
     window.addEventListener('keydown', handler);
     return () => window.removeEventListener('keydown', handler);
-  }, [onUndo]);
+  }, [onUndo, onRedo]);
 
   // ── MultiChart 工具栏切换图表类型时，同步更新代码中的 defaultVariant ──
   useEffect(() => {
@@ -658,6 +665,8 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
           isPublished={isPublished}
           canUndo={canUndo}
           onUndo={onUndo}
+          canRedo={canRedo}
+          onRedo={onRedo}
           onSave={onSave}
           onBack={onBack}
           onPublish={onPublish}

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

@@ -8,6 +8,7 @@ import {
   EyeOutlined,
   RobotOutlined,
   UndoOutlined,
+  RedoOutlined,
 } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 
@@ -17,6 +18,8 @@ interface CanvasToolbarProps {
   isPublished: boolean;
   canUndo: boolean;
   onUndo: () => void;
+  canRedo: boolean;
+  onRedo: () => void;
   onSave: () => void;
   onBack: () => void;
   onPublish: () => void;
@@ -31,6 +34,8 @@ const CanvasToolbar: React.FC<CanvasToolbarProps> = ({
   isPublished,
   canUndo,
   onUndo,
+  canRedo,
+  onRedo,
   onSave,
   onBack,
   onPublish,
@@ -117,6 +122,22 @@ const CanvasToolbar: React.FC<CanvasToolbarProps> = ({
               }}
             />
           </Tooltip>
+          <Tooltip title={t('canvas.redo')}>
+            <Button
+              size="small"
+              icon={<RedoOutlined />}
+              onClick={onRedo}
+              disabled={!canRedo}
+              style={{
+                borderRadius: 8,
+                border: '1px solid #e0e0e0',
+                background: 'transparent',
+                color: canRedo ? '#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/canvasApi.ts

@@ -110,3 +110,33 @@ export async function fetchAllCanvases(): Promise<SavedCanvasWithOwner[]> {
   );
   return records.map(toSavedCanvasWithOwner);
 }
+
+// ── 导出/导入 ────────────────────────────────────────────────────────────
+
+export async function generateExportToken(
+  id: string,
+): Promise<{ url: string }> {
+  return customRequest<{ url: string }>(`canvas/${id}/export-token`, 'POST');
+}
+
+export async function importPreview(
+  payload: any,
+): Promise<{ current: any; incoming: any }> {
+  return customRequest<{ current: any; incoming: any }>(
+    'canvas/import-preview',
+    'POST',
+    { payload },
+  );
+}
+
+export async function importConfirm(payload: any): Promise<{
+  success: boolean;
+  canvasId: string;
+  canvasName: string;
+}> {
+  return customRequest<{
+    success: boolean;
+    canvasId: string;
+    canvasName: string;
+  }>('canvas/import-confirm', 'POST', { payload });
+}