@gadmin2n/schematics 0.0.139 → 0.0.141

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

@@ -8,25 +8,14 @@ import React, {
 } from 'react';
 
 import { useThemedLayoutContext } from '@refinedev/antd';
-import {
-  type ITreeMenu,
-  pickNotDeprecated,
-  useLink,
-  useMenu,
-  useNavigation,
-  useGo,
-} from '@refinedev/core';
+import { useLink, useMenu, useGo } from '@refinedev/core';
 import { useTranslation } from 'react-i18next';
 import { useLocation } from 'react-router-dom';
 
-import {
-  BarsOutlined,
-  LeftOutlined,
-  RightOutlined,
-  UnorderedListOutlined,
-} from '@ant-design/icons';
+import { BarsOutlined, LeftOutlined, RightOutlined } from '@ant-design/icons';
 import {
   Button,
+  ConfigProvider,
   Drawer,
   Grid,
   Layout,
@@ -35,7 +24,9 @@ import {
   type MenuProps,
 } from 'antd';
 import { Title } from './title';
+import { getParentKeysFromMenuTree, renderMenuTree } from './menuRenderer';
 import { agentAttrs } from 'components/agentPanel/agentAttributes';
+import { useAppearance } from 'components/contexts/color-mode';
 import {
   HEADER_HEIGHT,
   SIDER_WIDTH,
@@ -43,8 +34,6 @@ import {
   Z_INDEX,
 } from 'constants/layout';
 
-const { SubMenu: _SubMenu } = Menu; // eslint silencer; preserved for future use
-void _SubMenu;
 const { useToken } = theme;
 
 /**
@@ -56,45 +45,20 @@ const MAX_AUTO_REDIRECTS = 5;
 /** Auto-redirect 触发延迟, 让 selectedKey / items 在同一帧内尘埃落定 */
 const AUTO_REDIRECT_DEBOUNCE_MS = 300;
 
-const getParentKeysFromMenuTree = (
-  items: ITreeMenu[],
-  targetKey: string,
-  parentKeys: string[] = [],
-): string[] | null => {
-  for (const item of items) {
-    const currentKey = item.key || '';
-
-    if (currentKey === targetKey) {
-      return parentKeys;
-    }
-
-    if (item.children && item.children.length > 0) {
-      const found = getParentKeysFromMenuTree(item.children, targetKey, [
-        ...parentKeys,
-        currentKey,
-      ]);
-      if (found) {
-        return found;
-      }
-    }
-  }
-  return null;
-};
-
-const getMenuLabel = (
-  name: string,
-  meta: Record<string, any>,
-  locale: string,
-): string => {
-  const isZh = locale === 'zh_CN' || locale === 'zh';
-  if (isZh && meta?.zhLabel) return meta.zhLabel;
-  if (!isZh && meta?.enLabel) return meta.enLabel;
-  return meta?.label || name;
-};
+/** 侧边栏配色方案。auto 跟随全局 token；dark/light 用固定值脱离全局明暗。 */
+interface SiderChrome {
+  bg: string;
+  borderColor: string;
+  triggerBg: string;
+  triggerColor: string;
+  menuTheme?: 'dark' | 'light';
+}
 
 /** 共用的标题栏（移动端 Drawer 与桌面 Sider 头部都用） */
-const SiderTitleBar: React.FC<{ collapsed: boolean }> = ({ collapsed }) => {
-  const { token } = useToken();
+const SiderTitleBar: React.FC<{ collapsed: boolean; chrome: SiderChrome }> = ({
+  collapsed,
+  chrome,
+}) => {
   return (
     <div
       {...agentAttrs({ type: 'app-title' })}
@@ -105,8 +69,8 @@ const SiderTitleBar: React.FC<{ collapsed: boolean }> = ({ collapsed }) => {
         justifyContent: collapsed ? 'center' : 'flex-start',
         alignItems: 'center',
         height: HEADER_HEIGHT,
-        backgroundColor: token.colorBgElevated,
-        borderBottom: `1px solid ${token.colorBorderSecondary}`,
+        backgroundColor: chrome.bg,
+        borderBottom: `1px solid ${chrome.borderColor}`,
       }}
     >
       <Title collapsed={collapsed} />
@@ -120,6 +84,59 @@ export const Sider: React.FC = () => {
   const { pathname: currentPathname } = useLocation();
   const { i18n } = useTranslation();
   const currentLocale = i18n.language;
+  const { siderTheme, menuLayout, menuExpand, mode } = useAppearance();
+
+  // 侧边栏配色：auto 沿用全局 token (现状)；dark 是经典 admin 深色栏
+  // (antd Menu theme="dark" 自包含 #001529 配色)；light 用于暗色全局下强制浅栏。
+  const chrome = useMemo<SiderChrome>(() => {
+    if (siderTheme === 'dark') {
+      return {
+        bg: '#001529',
+        borderColor: 'rgba(255,255,255,0.15)',
+        triggerBg: '#002140',
+        triggerColor: 'rgba(255,255,255,0.65)',
+        menuTheme: 'dark',
+      };
+    }
+    if (siderTheme === 'light') {
+      return {
+        bg: '#ffffff',
+        borderColor: '#f0f0f0',
+        triggerBg: '#fafafa',
+        triggerColor: token.colorTextSecondary,
+        menuTheme: 'light',
+      };
+    }
+    return {
+      bg: token.colorBgContainer,
+      borderColor: token.colorBorderBg,
+      triggerBg: token.colorBgElevated,
+      triggerColor: token.colorTextSecondary,
+    };
+  }, [siderTheme, token]);
+
+  // 强制深/浅色与全局明暗不一致时，嵌套 ConfigProvider 翻转子树算法，
+  // 让 Logo 文字、Menu theme="light" 的文字色等派生值跟上侧边栏底色。
+  const invertAlgorithm =
+    (siderTheme === 'dark' && mode === 'light') ||
+    (siderTheme === 'light' && mode === 'dark');
+  const withSiderAlgorithm = (node: React.ReactNode) =>
+    invertAlgorithm ? (
+      <ConfigProvider
+        theme={{
+          algorithm:
+            siderTheme === 'dark'
+              ? theme.darkAlgorithm
+              : theme.defaultAlgorithm,
+        }}
+      >
+        {node}
+      </ConfigProvider>
+    ) : (
+      node
+    );
+
+  const sourceMenu = menuItems;
 
   const [openKeys, setOpenKeys] = useState<string[]>(defaultOpenKeys);
 
@@ -132,17 +149,17 @@ export const Sider: React.FC = () => {
     if (
       selectedKey &&
       selectedKey !== lastSelectedKeyRef.current &&
-      menuItems.length > 0
+      sourceMenu.length > 0
     ) {
       lastSelectedKeyRef.current = selectedKey;
 
-      const parentKeys = getParentKeysFromMenuTree(menuItems, selectedKey);
+      const parentKeys = getParentKeysFromMenuTree(sourceMenu, selectedKey);
 
       if (parentKeys !== null) {
         setOpenKeys(parentKeys);
       }
     }
-  }, [selectedKey, menuItems]);
+  }, [selectedKey, sourceMenu]);
 
   const {
     siderCollapsed,
@@ -155,68 +172,23 @@ export const Sider: React.FC = () => {
   const go = useGo();
 
   const breakpoint = Grid.useBreakpoint();
-  const { listUrl } = useNavigation();
 
   const isMobile =
     typeof breakpoint.lg === 'undefined' ? false : !breakpoint.lg;
 
-  const renderTreeView = useCallback(
-    (tree: ITreeMenu[], currentSelectedKey?: string): MenuProps['items'] => {
-      return tree
-        .map((item: ITreeMenu, index: number) => {
-          const { key, name, children, meta = {}, list } = item;
-          const { icon, parent: parentName } = meta;
-
-          const route = typeof list === 'string' ? list : listUrl(name);
-
-          // 优先用 item.key, 退而求其次用 name (永远存在), 最后才用稳定的 path-index.
-          // 之前用 Math.random() 作为 fallback —— 那是 React 反模式, 每次渲染都换 key
-          // 会让整棵子树 unmount/mount, 破坏滚动位置和动画状态.
-          const stableKey = key || name || `fallback-${index}`;
-
-          if (children.length > 0) {
-            return {
-              key: stableKey,
-              label: (
-                <span style={{ fontWeight: 600 }}>
-                  {getMenuLabel(name, meta, currentLocale)}
-                </span>
-              ),
-              icon: icon ?? <UnorderedListOutlined />,
-              children: renderTreeView(children, currentSelectedKey),
-            };
-          }
-
-          const isSelected = stableKey === currentSelectedKey;
-          const isRoute = !(
-            pickNotDeprecated(meta?.parent, meta?.parent, parentName) !==
-              undefined && children.length === 0
-          );
-
-          return {
-            key: stableKey,
-            label: (
-              <>
-                <Link to={route ?? ''}>
-                  {getMenuLabel(name, meta, currentLocale)}
-                </Link>
-                {!siderCollapsed && isSelected && (
-                  <div className="ant-menu-tree-arrow" />
-                )}
-              </>
-            ),
-            icon: icon ?? (isRoute && <UnorderedListOutlined />),
-          };
-        })
-        .filter(Boolean);
-    },
-    [listUrl, Link, siderCollapsed, currentLocale],
+  // 纵向 Sider：展开态才渲染选中箭头装饰 (折叠态没有空间显示)。
+  const items = useMemo(
+    () =>
+      renderMenuTree(sourceMenu, {
+        selectedKey,
+        locale: currentLocale,
+        Link,
+        showTreeArrow: !siderCollapsed,
+        flatGroups: menuLayout === 'grouped',
+      })?.filter(Boolean),
+    [sourceMenu, selectedKey, currentLocale, Link, siderCollapsed, menuLayout],
   );
 
-  const items = useMemo(() => {
-    return renderTreeView(menuItems, selectedKey)?.filter(Boolean);
-  }, [menuItems, selectedKey, renderTreeView]);
-
   // Auto-redirect to first available menu item if current selectedKey is not in the menu.
   // 触发条件: items / selectedKey / pathname 变化.
   useEffect(() => {
@@ -302,28 +274,33 @@ export const Sider: React.FC = () => {
 
   const handleOpenChange = useCallback(
     (keys: string[]) => {
+      // 多组同开：直接采用 antd 算好的 keys，不做手风琴裁剪。
+      if (menuExpand === 'multiple') {
+        setOpenKeys(keys);
+        return;
+      }
       const latestOpenKey = keys.find((key) => !openKeys.includes(key));
 
       if (latestOpenKey) {
         const parentKeys =
-          getParentKeysFromMenuTree(menuItems, latestOpenKey) || [];
+          getParentKeysFromMenuTree(sourceMenu, latestOpenKey) || [];
         setOpenKeys([...parentKeys, latestOpenKey]);
       } else {
         setOpenKeys(keys);
       }
     },
-    [openKeys, menuItems],
+    [openKeys, sourceMenu, menuExpand],
   );
 
   const handleMenuClick = useCallback(
     ({ key }: { key: string }) => {
-      const clickedItem = menuItems.find((item) => item.key === key);
+      const clickedItem = sourceMenu.find((item) => item.key === key);
       if (clickedItem && clickedItem.children.length === 0) {
         setOpenKeys([]);
       }
       setMobileSiderOpen(false);
     },
-    [menuItems, setMobileSiderOpen],
+    [sourceMenu, setMobileSiderOpen],
   );
 
   const renderMenu = useCallback(
@@ -335,6 +312,7 @@ export const Sider: React.FC = () => {
           openKeys={openKeys}
           onOpenChange={handleOpenChange}
           mode="inline"
+          theme={chrome.menuTheme}
           // Layout.Sider 的 collapsed 只压宽度, 不会自动让 Menu 切到 collapsed 模式.
           // 必须显式 inlineCollapsed, 否则 SubMenu 的 label 仍渲染, 折叠时溢出 80px 容器
           // (常见症状: 中文 label 被截成 "系统管", active 项还是蓝字)
@@ -359,6 +337,7 @@ export const Sider: React.FC = () => {
       handleOpenChange,
       items,
       handleMenuClick,
+      chrome.menuTheme,
     ],
   );
 
@@ -387,13 +366,20 @@ export const Sider: React.FC = () => {
               width={SIDER_WIDTH}
               style={{
                 height: '100vh',
-                backgroundColor: token.colorBgContainer,
-                borderRight: `1px solid ${token.colorBorderBg}`,
+                backgroundColor: chrome.bg,
+                borderRight:
+                  siderTheme === 'dark'
+                    ? 'none'
+                    : `1px solid ${chrome.borderColor}`,
               }}
             >
-              <SiderTitleBar collapsed={false} />
               {/* 移动端 Drawer 打开时给的是全宽容器, Menu 永远展开. */}
-              {renderMenu(false)}
+              {withSiderAlgorithm(
+                <>
+                  <SiderTitleBar collapsed={false} chrome={chrome} />
+                  {renderMenu(false)}
+                </>,
+              )}
             </Layout.Sider>
           </Layout>
         </Drawer>
@@ -409,8 +395,9 @@ export const Sider: React.FC = () => {
   }
 
   const siderStyles: React.CSSProperties = {
-    backgroundColor: token.colorBgContainer,
-    borderRight: `1px solid ${token.colorBorderBg}`,
+    backgroundColor: chrome.bg,
+    borderRight:
+      siderTheme === 'dark' ? 'none' : `1px solid ${chrome.borderColor}`,
     position: 'sticky',
     top: 0,
     left: 0,
@@ -444,19 +431,26 @@ export const Sider: React.FC = () => {
             borderRadius: 0,
             height: '100%',
             width: '100%',
-            backgroundColor: token.colorBgElevated,
-            borderRight: `1px solid ${token.colorBorderBg}`,
+            backgroundColor: chrome.triggerBg,
+            borderRight:
+              siderTheme === 'dark'
+                ? 'none'
+                : `1px solid ${chrome.borderColor}`,
             // 之前用 colorPrimary 给 chrome 控件上色, 与 One Voice Rule 冲突.
             // chrome 收纳器不需要抢眼, 用次级文本色即可.
-            color: token.colorTextSecondary,
+            color: chrome.triggerColor,
           }}
         >
           {siderCollapsed ? <RightOutlined /> : <LeftOutlined />}
         </Button>
       }
     >
-      <SiderTitleBar collapsed={siderCollapsed} />
-      {renderMenu(siderCollapsed)}
+      {withSiderAlgorithm(
+        <>
+          <SiderTitleBar collapsed={siderCollapsed} chrome={chrome} />
+          {renderMenu(siderCollapsed)}
+        </>,
+      )}
     </Layout.Sider>
   );
 };

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

@@ -0,0 +1,10 @@
+import { describe, expect, it } from 'vitest';
+import { getRoutePath } from './routeRegistry';
+
+describe('workflow route placement', () => {
+  it('places approval tasks inside Workflow', () => {
+    expect(getRoutePath('approval_tasks')).toBe(
+      '/admin/workflow/approval-tasks',
+    );
+  });
+});

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

@@ -367,6 +367,24 @@ export const routeRegistry: Record<string, RouteEntry> = {
               () => import('routes/workflow/temporal-tenant'),
             ),
           },
+          workflow_connections: {
+            path: 'connections',
+            component: lazyWithReload(
+              () => import('routes/workflow/connections'),
+            ),
+          },
+          workflow_approval_channels: {
+            path: 'approval-channels',
+            component: lazyWithReload(
+              () => import('routes/workflow/approval-channels'),
+            ),
+          },
+          approval_tasks: {
+            path: 'approval-tasks',
+            component: lazyWithReload(
+              () => import('routes/human-approval/inbox'),
+            ),
+          },
         },
       },
       // 操作日志 — sortOrder 1070, code: admin.audit

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

@@ -22,15 +22,16 @@ export const Z_INDEX = {
   OVERLAY: 800,
 } as const;
 
-/** List / Create 页面顶层组件的内容区样式 */
+/** List / Create 页面顶层组件的内容区样式（页头卡自带 marginBottom: 16，内容区不再加 marginTop） */
 export const LIST_CONTENT_PROPS = {
-  style: { marginTop: '1rem' },
+  style: { marginTop: 0 },
 } as const;
 
 /** Show 页面顶层组件的内容区样式 */
 export const SHOW_CONTENT_PROPS = {
   style: {
-    backgroundColor: '#f5f5f5',
+    // 跟随主题的布局底色，暗色下自动派生 (勿写死浅色)。
+    backgroundColor: 'var(--ant-color-bg-layout)',
     padding: 0,
     marginTop: '1rem',
   },
@@ -38,3 +39,31 @@ export const SHOW_CONTENT_PROPS = {
     padding: 0,
   },
 } as const;
+
+/** 自定义页面最外层容器：灰底 + 撑满视口（四边 padding 由外层 layout 承担，页面不写） */
+export const PAGE_WRAPPER_STYLE = {
+  background: 'var(--ant-color-bg-layout)',
+  minHeight: 'calc(100vh - 64px)',
+} as const;
+
+/** 卡片纵向间距：每张内容卡自带 marginBottom: 16 */
+export const CARD_GAP_STYLE = { marginBottom: 16 } as const;
+
+/** Header Card：压扁的页面头部卡（配合 PageHeader 使用） */
+export const HEADER_CARD_PROPS = {
+  style: { marginBottom: 16 },
+  styles: { body: { padding: '12px 24px' } },
+} as const;
+
+/** Search Card：压扁的搜索条卡（只有一行输入/筛选，不需要默认 24px 上下留白） */
+export const SEARCH_CARD_PROPS = {
+  className: 'card-search-bar',
+  style: { marginBottom: 16 },
+  styles: { body: { padding: '12px 24px' } },
+} as const;
+
+/** 嵌套在内容卡里的子卡片：去边框 + 浅灰底色，避免双层边框 */
+export const NESTED_CARD_PROPS = {
+  variant: 'borderless',
+  style: { background: 'var(--ant-color-fill-quaternary)' },
+} as const;

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

@@ -58,9 +58,41 @@ const GUIDED_QUESTIONS = [
 ];
 
 export default function AddDataModal({ onConfirm, onCancel }: Props) {
-  const [activeTab, setActiveTab] = useState<'free' | 'guided'>('free');
+  const [activeTab, setActiveTab] = useState<'free' | 'file' | 'guided'>(
+    'free',
+  );
   const [freeText, setFreeText] = useState('');
   const [answers, setAnswers] = useState<Record<string, string>>({});
+  // ── 以文件为参考 ──
+  const [refFile, setRefFile] = useState<File | null>(null);
+  const [uploadedPath, setUploadedPath] = useState<string | null>(null);
+  const [uploading, setUploading] = useState(false);
+  const [uploadError, setUploadError] = useState<string | null>(null);
+  const [extraInfo, setExtraInfo] = useState('');
+
+  async function handleUpload() {
+    if (!refFile || uploading) return;
+    setUploading(true);
+    setUploadError(null);
+    try {
+      const resp = await fetch(
+        `/dev-shell/upload-reference?filename=${encodeURIComponent(
+          refFile.name,
+        )}`,
+        { method: 'POST', body: refFile },
+      );
+      const data = await resp.json().catch(() => ({}));
+      if (!resp.ok || !data?.path) {
+        throw new Error(data?.error || `上传失败（${resp.status}）`);
+      }
+      setUploadedPath(data.path);
+    } catch (err: any) {
+      setUploadedPath(null);
+      setUploadError(err?.message || '上传失败，请重试');
+    } finally {
+      setUploading(false);
+    }
+  }
 
   function handleConfirm() {
     if (activeTab === 'free') {
@@ -73,6 +105,22 @@ export default function AddDataModal({ onConfirm, onCancel }: Props) {
         '请帮我使用 prisma-schema-update skill 添加一个新的prisma model。\n\n以下是关于这个业务数据的描述：\n' +
           text,
       );
+    } else if (activeTab === 'file') {
+      if (!refFile) {
+        alert('请选择参考文件');
+        return;
+      }
+      if (!uploadedPath) {
+        alert('请先点击"上传"，待上传成功后再开始生成');
+        return;
+      }
+      onConfirm(
+        '请帮我使用 prisma-schema-update skill 添加一个新的prisma model。\n\n' +
+          '我提供了一份参考文件（CSV 格式），请读取它的列结构和示例数据，以此为基础设计数据表：\n' +
+          uploadedPath +
+          '\n\n补充说明：\n' +
+          (extraInfo.trim() || '（无）'),
+      );
     } else {
       if (!answers.purpose?.trim()) {
         alert('请至少填写"这个表是用来做什么的"');
@@ -110,7 +158,7 @@ export default function AddDataModal({ onConfirm, onCancel }: Props) {
         </div>
 
         <div className="add-data-modal-tabs">
-          {(['free', 'guided'] as const).map((tab) => (
+          {(['free', 'file', 'guided'] as const).map((tab) => (
             <button
               key={tab}
               className={
@@ -118,7 +166,11 @@ export default function AddDataModal({ onConfirm, onCancel }: Props) {
               }
               onClick={() => setActiveTab(tab)}
             >
-              {tab === 'free' ? '自由描述' : '引导式填写'}
+              {tab === 'free'
+                ? '自由描述'
+                : tab === 'file'
+                  ? '以文件为参考'
+                  : '引导式填写'}
             </button>
           ))}
         </div>
@@ -139,6 +191,49 @@ export default function AddDataModal({ onConfirm, onCancel }: Props) {
               />
             </div>
           )}
+          {activeTab === 'file' && (
+            <div className="add-data-tab-panel active">
+              <p className="add-data-hint">
+                上传一份 CSV 或 Excel 文件（如现有数据导出、字段清单），AI
+                会读取它的列结构作为建表参考。仅支持单个文件，不超过 5MB。
+              </p>
+              <div className="add-data-upload-row">
+                <input
+                  type="file"
+                  accept=".csv,.xlsx,.xls"
+                  className="add-data-file-input"
+                  onChange={(e) => {
+                    setRefFile(e.target.files?.[0] ?? null);
+                    setUploadedPath(null);
+                    setUploadError(null);
+                  }}
+                />
+                <button
+                  className="add-data-btn-upload"
+                  disabled={!refFile || uploading}
+                  onClick={handleUpload}
+                >
+                  {uploading ? '上传中…' : '上传'}
+                </button>
+              </div>
+              {uploadedPath && (
+                <p className="add-data-upload-status ok">
+                  ✓ 已上传：{refFile?.name}
+                </p>
+              )}
+              {uploadError && (
+                <p className="add-data-upload-status error">{uploadError}</p>
+              )}
+              <textarea
+                className="add-data-free-textarea add-data-extra-textarea"
+                value={extraInfo}
+                onChange={(e) => setExtraInfo(e.target.value)}
+                placeholder={
+                  '附加信息（可选）：\n比如：这是一个订单表；金额字段要精确到分；需要按用户查询'
+                }
+              />
+            </div>
+          )}
           {activeTab === 'guided' && (
             <div className="add-data-tab-panel active">
               <p className="add-data-hint">