@gadmin2n/schematics 0.0.138 → 0.0.140

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

@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { Plugin } from 'vite';
+import * as XLSX from 'xlsx';
 
 /**
  * Dev-only Vite plugin for Gadmin2 Dev Tools.
@@ -9,14 +10,87 @@ import type { Plugin } from 'vite';
  * Features:
  * 1. POST /canvas-patch — agent pushes new component code to canvas via HMR
  * 2. POST /canvas-add-item — agent adds a new component to canvas via HMR
- * 3. "/" serves dev-shell-entry.html (agent panel outer shell)
- * 4. All other HTML navigation falls back to index.html (SPA router)
+ * 3. POST /dev-shell/upload-reference — 接收"以文件为参考"的原始文件字节（csv/excel/图片），
+ *    写入 {projectRoot}/tmp/（xlsx/xls 转为 csv），返回文件系统绝对路径。
+ *    上传的文件不做持久化：dev server 退出时统一删除。
+ * 4. "/" serves dev-shell-entry.html (agent panel outer shell)
+ * 5. All other HTML navigation falls back to index.html (SPA router)
  */
+
+const UPLOAD_MAX_BYTES = 5 * 1024 * 1024; // 5MB
+const UPLOAD_ALLOWED_EXTS = [
+  '.csv',
+  '.xlsx',
+  '.xls',
+  '.png',
+  '.jpg',
+  '.jpeg',
+  '.webp',
+  '.gif',
+];
+const UPLOAD_EXCEL_EXTS = ['.xlsx', '.xls'];
+
+/** 清洗文件名：去路径分隔符、空白转 -、只保留安全字符 */
+function sanitizeFilename(name: string): string {
+  const base = name.split(/[\\/]/).pop() ?? 'file';
+  const safe = base.replace(/\s+/g, '-').replace(/[^\w.一-龥-]/g, '');
+  return safe || 'file';
+}
+
+/** xlsx/xls Buffer → csv 文本（第一个 sheet）；失败返回 null */
+function excelBufferToCsv(buf: Buffer): string | null {
+  try {
+    const wb = XLSX.read(buf, { type: 'buffer' });
+    const first = wb.SheetNames[0];
+    if (!first) return null;
+    return XLSX.utils.sheet_to_csv(wb.Sheets[first]);
+  } catch {
+    return null;
+  }
+}
+
+function writeJson(
+  res: ServerResponse,
+  status: number,
+  data: Record<string, unknown>,
+) {
+  res.statusCode = status;
+  res.setHeader('Content-Type', 'application/json');
+  res.end(JSON.stringify(data));
+}
 export function devShellPlugin(): Plugin {
   return {
     name: 'dev-shell',
     apply: 'serve',
     configureServer(server) {
+      // ── 参考文件上传：tmp/ 落盘 + 退出清理（不持久化）─────────────────────
+      // vite root = web/，项目根目录 = 上一级
+      const projectRoot = path.resolve(server.config.root, '..');
+      const tmpDir = path.join(projectRoot, 'tmp');
+      const uploadedFiles = new Set<string>();
+
+      const cleanupUploadedFiles = () => {
+        for (const p of uploadedFiles) {
+          try {
+            fs.unlinkSync(p);
+          } catch {
+            // 已被手动删除等情况，忽略
+          }
+        }
+        uploadedFiles.clear();
+      };
+      // vite 正常退出（SIGINT/SIGTERM）会关闭 httpServer；process exit 兜底。
+      // 信号监听采用"once + 重发"模式：清理完把信号重发给自己，此时监听已移除，
+      // 信号落到 vite 自己的处理器或 Node 默认终止行为上，不影响正常退出流程。
+      server.httpServer?.once('close', cleanupUploadedFiles);
+      process.once('exit', cleanupUploadedFiles);
+      const cleanupAndRethrow = (signal: 'SIGINT' | 'SIGTERM') => {
+        cleanupUploadedFiles();
+        process.kill(process.pid, signal);
+      };
+      process.once('SIGINT', () => cleanupAndRethrow('SIGINT'));
+      process.once('SIGTERM', () => cleanupAndRethrow('SIGTERM'));
+
       server.middlewares.use(async (rawReq, rawRes, next) => {
         const req = rawReq as IncomingMessage;
         const res = rawRes as ServerResponse;
@@ -87,6 +161,82 @@ export function devShellPlugin(): Plugin {
           return;
         }
 
+        // POST /dev-shell/upload-reference?filename=xxx.csv
+        // 接收原始文件字节（非 multipart），写 {projectRoot}/tmp/，返回绝对路径
+        if (req.method === 'POST' && url === '/dev-shell/upload-reference') {
+          const filename = new URL(
+            req.url ?? '',
+            'http://localhost',
+          ).searchParams.get('filename');
+          const ext = path.extname(filename ?? '').toLowerCase();
+          if (!filename || !UPLOAD_ALLOWED_EXTS.includes(ext)) {
+            writeJson(res, 400, {
+              error: `仅支持 ${UPLOAD_ALLOWED_EXTS.join('/')} 文件`,
+            });
+            return;
+          }
+
+          const chunks: Uint8Array[] = [];
+          let total = 0;
+          let tooLarge = false;
+          req.on('data', (chunk: Uint8Array) => {
+            total += chunk.length;
+            if (total > UPLOAD_MAX_BYTES) {
+              tooLarge = true;
+              req.destroy();
+              return;
+            }
+            chunks.push(chunk);
+          });
+          req.on('end', () => {
+            if (tooLarge) {
+              writeJson(res, 413, { error: '文件超过 5MB 上限' });
+              return;
+            }
+            try {
+              const buf = Buffer.concat(chunks);
+              const safe = sanitizeFilename(filename);
+              const stamp = `${Date.now()}-${Math.random()
+                .toString(36)
+                .slice(2, 8)}`;
+              fs.mkdirSync(tmpDir, { recursive: true });
+
+              let absPath: string;
+              if (UPLOAD_EXCEL_EXTS.includes(ext)) {
+                // xlsx/xls → csv，agent 可直接 Read
+                const csv = excelBufferToCsv(buf);
+                if (csv === null) {
+                  writeJson(res, 400, {
+                    error: 'Excel 解析失败，请检查文件或另存为 CSV 后上传',
+                  });
+                  return;
+                }
+                absPath = path.join(
+                  tmpDir,
+                  `${stamp}-${safe.slice(0, safe.length - ext.length)}.csv`,
+                );
+                fs.writeFileSync(absPath, csv, 'utf-8');
+              } else {
+                // csv / 图片 → 原始字节直接落盘
+                absPath = path.join(tmpDir, `${stamp}-${safe}`);
+                fs.writeFileSync(absPath, buf);
+              }
+              uploadedFiles.add(absPath);
+              writeJson(res, 200, { ok: true, path: absPath });
+            } catch (err) {
+              writeJson(res, 500, {
+                error: `写入失败: ${(err as Error).message}`,
+              });
+            }
+          });
+          req.on('error', () => {
+            if (!res.headersSent) {
+              writeJson(res, 500, { error: '读取上传数据失败' });
+            }
+          });
+          return;
+        }
+
         // "/" → dev-shell-entry.html（Agent 外壳），除非 agent 被禁用
         if (url === '/') {
           const agentDisabled = process.env.VITE_ENABLE_AGENT === 'false';

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

@@ -456,7 +456,12 @@ export default function AgendaJobsPage() {
   // ─── Render ────────────────────────────────────────────────────────────────
 
   return (
-    <div style={{ background: '#f0f2f5', minHeight: 'calc(100vh - 64px)' }}>
+    <div
+      style={{
+        background: 'var(--ant-color-bg-layout)',
+        minHeight: 'calc(100vh - 64px)',
+      }}
+    >
       {/* Header */}
       <Card style={{ marginBottom: 16 }}>
         <div

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

@@ -16,6 +16,7 @@ import {
   Tooltip,
   Typography,
   message,
+  theme,
 } from 'antd';
 import {
   ArrowLeftOutlined,
@@ -141,6 +142,8 @@ function DurationChart({
 }) {
   // 按时间正序（最早在左）
   const sorted = useMemo(() => [...logs].reverse(), [logs]);
+  // ECharts 画布不认 CSS var, 选中描边色需取解析后的 token 值
+  const { token } = theme.useToken();
 
   const option = useMemo(() => {
     return {
@@ -182,7 +185,7 @@ function DurationChart({
               value: l.durationMs,
               itemStyle: {
                 color: hasSel ? (isSelected ? baseColor : dimColor) : baseColor,
-                borderColor: isSelected ? '#000' : 'transparent',
+                borderColor: isSelected ? token.colorText : 'transparent',
                 borderWidth: isSelected ? 2 : 0,
               },
             };
@@ -192,7 +195,7 @@ function DurationChart({
         },
       ],
     };
-  }, [sorted, selectedIndex]);
+  }, [sorted, selectedIndex, token.colorText]);
 
   const onEvents = useMemo(
     () => ({
@@ -346,7 +349,12 @@ export default function AgendaJobShow() {
   const totalRuns = runs.success + runs.failed;
 
   return (
-    <div style={{ background: '#f0f2f5', minHeight: 'calc(100vh - 64px)' }}>
+    <div
+      style={{
+        background: 'var(--ant-color-bg-layout)',
+        minHeight: 'calc(100vh - 64px)',
+      }}
+    >
       {/* Header */}
       <Card style={{ marginBottom: 16 }}>
         <div
@@ -521,7 +529,13 @@ export default function AgendaJobShow() {
                     marginBottom: 12,
                   }}
                 >
-                  <Title level={5} style={{ margin: 0, color: '#595959' }}>
+                  <Title
+                    level={5}
+                    style={{
+                      margin: 0,
+                      color: 'var(--ant-color-text-secondary)',
+                    }}
+                  >
                     Run Detail
                   </Title>
                   <Button
@@ -560,7 +574,13 @@ export default function AgendaJobShow() {
                   )}
                 </Descriptions>
 
-                <Title level={5} style={{ marginTop: 16, color: '#595959' }}>
+                <Title
+                  level={5}
+                  style={{
+                    marginTop: 16,
+                    color: 'var(--ant-color-text-secondary)',
+                  }}
+                >
                   Handler Logs
                 </Title>
                 {selectedRun.logs ? (
@@ -568,8 +588,8 @@ export default function AgendaJobShow() {
                     style={{
                       margin: 0,
                       padding: 12,
-                      background: '#fafafa',
-                      border: '1px solid #f0f0f0',
+                      background: 'var(--ant-color-fill-quaternary)',
+                      border: '1px solid var(--ant-color-border-secondary)',
                       borderRadius: 4,
                       fontSize: 12,
                       lineHeight: 1.6,
@@ -587,7 +607,13 @@ export default function AgendaJobShow() {
               </>
             ) : (
               <>
-                <Title level={5} style={{ marginTop: 0, color: '#595959' }}>
+                <Title
+                  level={5}
+                  style={{
+                    marginTop: 0,
+                    color: 'var(--ant-color-text-secondary)',
+                  }}
+                >
                   Runs Summary
                 </Title>
                 <Descriptions column={2} size="small">
@@ -617,7 +643,13 @@ export default function AgendaJobShow() {
                   </Descriptions.Item>
                 </Descriptions>
 
-                <Title level={5} style={{ marginTop: 16, color: '#595959' }}>
+                <Title
+                  level={5}
+                  style={{
+                    marginTop: 16,
+                    color: 'var(--ant-color-text-secondary)',
+                  }}
+                >
                   Job Details
                 </Title>
                 <Descriptions column={2} size="small">

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

@@ -80,7 +80,7 @@ export const AgendaJobEdit: React.FC<IResourceComponentsProps> = () => {
       headerButtons={
         <>
           <ListButton />
-          <RefreshButton meta={{ select: formPrismaSelect }} />
+          <RefreshButton />
         </>
       }
     >

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

@@ -87,10 +87,10 @@ export const AgendaJobList: React.FC<IResourceComponentsProps> = () => {
   const {
     tableProps,
     sorters: sorter,
-    setCurrent,
+    setCurrentPage,
     setFilters,
     filters,
-    tableQueryResult,
+    tableQuery,
     searchFormProps,
   } = useTable<AgendaJob, HttpError>({
     meta: {
@@ -106,22 +106,24 @@ export const AgendaJobList: React.FC<IResourceComponentsProps> = () => {
   // onFinish: 将表单值转换为 CrudFilters 并更新筛选条件
   // 有 createdAt 字段的模型（默认）
   searchFormProps.initialValues = getSearchFormInitialValues(parsedFilters);
-  searchFormProps.onFinish = createSearchFormOnFinish(setCurrent, setFilters);
+  searchFormProps.onFinish = createSearchFormOnFinish(
+    setCurrentPage,
+    setFilters,
+  );
 
   // 没有 createdAt 字段的模型
   // searchFormProps.initialValues = getSearchFormInitialValues(parsedFilters, { dateField: null });
-  // searchFormProps.onFinish = createSearchFormOnFinish(setCurrent, setFilters, { dateField: null });
-
+  // searchFormProps.onFinish = createSearchFormOnFinish(setCurrentPage, setFilters, { dateField: null });
   // 使用其他日期字段（如 updatedAt）
   // searchFormProps.initialValues = getSearchFormInitialValues(parsedFilters, { dateField: 'updatedAt' });
-  // searchFormProps.onFinish = createSearchFormOnFinish(setCurrent, setFilters, { dateField: 'updatedAt' });
+  // searchFormProps.onFinish = createSearchFormOnFinish(setCurrentPage, setFilters, { dateField: 'updatedAt' });
 
   // Batch operations (selection, update, delete)
   const batchOps = useBatchOperations({
     resourceName,
     apiUrl,
     requestHeaders,
-    onSuccess: () => tableQueryResult.refetch(),
+    onSuccess: () => tableQuery.refetch(),
     t,
   });
 
@@ -192,7 +194,7 @@ export const AgendaJobList: React.FC<IResourceComponentsProps> = () => {
             importProps={importProps}
             onExport={triggerExport}
             exportLoading={exportLoading}
-            onRefresh={() => tableQueryResult.refetch()}
+            onRefresh={() => tableQuery.refetch()}
             resourceName={resourceName}
           />
         ),

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

@@ -20,10 +20,10 @@ export const AgendaJobShow: React.FC<IResourceComponentsProps> = () => {
   const resourceName = 'agendaJob';
   const t = useTranslate();
 
-  const { queryResult } = useShow<AgendaJob>({
+  const { query } = useShow<AgendaJob>({
     meta: { select: showPrismaSelect },
   });
-  const { data, isLoading } = queryResult;
+  const { data, isLoading } = query;
   const record = data?.data;
 
   const [[fields, model]] = useState(() => {
@@ -56,7 +56,7 @@ export const AgendaJobShow: React.FC<IResourceComponentsProps> = () => {
     >
       <div
         style={{
-          border: '1px solid #f0f0f0',
+          border: '1px solid var(--ant-color-border-secondary)',
           borderRadius: 8,
           overflow: 'hidden',
         }}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/audit/components/action-cell.css

@@ -1,3 +1,3 @@
 .highlight-changed-row {
-  background-color: #fff2f0;
+  background-color: var(--ant-color-error-bg);
 } 

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

@@ -77,7 +77,7 @@ export const AuditEdit: React.FC<IResourceComponentsProps> = () => {
       headerButtons={
         <>
           <ListButton />
-          <RefreshButton meta={{ select: formPrismaSelect }} />
+          <RefreshButton />
         </>
       }
     >

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

@@ -27,10 +27,10 @@ export const AuditShow: React.FC<IResourceComponentsProps> = () => {
   const resourceName = 'audit';
   const t = useTranslate();
 
-  const { queryResult } = useShow<Audit>({
+  const { query } = useShow<Audit>({
     meta: { select: showPrismaSelect },
   });
-  const { data, isLoading } = queryResult;
+  const { data, isLoading } = query;
   const record = data?.data;
 
   const [[fields, model]] = useState(() => {
@@ -59,10 +59,7 @@ export const AuditShow: React.FC<IResourceComponentsProps> = () => {
           <EditButton recordItemId={record?.id} />
           <CloneButton recordItemId={record?.id} />
           <DeleteButton recordItemId={record?.id} />
-          <RefreshButton
-            recordItemId={record?.id}
-            meta={{ select: showPrismaSelect }}
-          />
+          <RefreshButton recordItemId={record?.id} />
         </div>
       }
     >

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

@@ -0,0 +1,3 @@
+.canvas-cell--whiteboard-numcard .ant-card {
+  border-color: transparent !important;
+}

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

@@ -3,12 +3,16 @@ import { Tooltip } from 'antd';
 import { CopyOutlined, DeleteOutlined, MoreOutlined } from '@ant-design/icons';
 import IsolatedLivePreview from './IsolatedLivePreview';
 import { useIsAgentAllowed } from 'config/agentAllowed';
+import { normalizeLegacyWhiteboardName } from './whiteboardLayout';
+import './CanvasCell.css';
 
 interface CanvasCellProps extends React.HTMLAttributes<HTMLDivElement> {
   code: string;
   selected: boolean;
   componentType?: string;
   isPreview?: boolean;
+  isDropTarget?: boolean;
+  isWhiteboardChild?: boolean;
   onClick: (e: React.MouseEvent) => void;
   onDoubleClick: (e: React.MouseEvent) => void;
   onContextMenu: (e: React.MouseEvent) => void;
@@ -28,6 +32,8 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
       selected,
       componentType,
       isPreview,
+      isDropTarget,
+      isWhiteboardChild,
       onClick,
       onDoubleClick,
       onContextMenu,
@@ -41,21 +47,44 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
     },
     ref,
   ) => {
-    const isSection = componentType === 'Section';
+    const isBackgroundContainer =
+      componentType === 'Section' || componentType === 'Whiteboard';
     const isAgentAllowed = useIsAgentAllowed();
     const showToolbar = !isPreview && isAgentAllowed && selected;
+    const displayCode =
+      componentType === 'Whiteboard'
+        ? normalizeLegacyWhiteboardName(code)
+        : code;
+    const cellClassName = [
+      className,
+      componentType === 'NumCard' && isWhiteboardChild
+        ? 'canvas-cell--whiteboard-numcard'
+        : '',
+    ]
+      .filter(Boolean)
+      .join(' ');
 
     return (
       <div
         ref={ref}
-        className={className}
+        className={cellClassName}
         style={{
-          background: isSection ? 'transparent' : '#fff',
-          borderRadius: isSection ? 0 : 8,
+          background: isBackgroundContainer
+            ? 'transparent'
+            : 'var(--ant-color-bg-container)',
+          borderRadius: isBackgroundContainer ? 0 : 8,
           overflow: 'hidden',
-          outline: !isPreview && selected ? '2px solid #087ea4' : 'none',
-          outlineOffset: 2,
+          outline: isDropTarget
+            ? '3px solid #4361ee'
+            : !isPreview && selected
+              ? '2px solid #087ea4'
+              : 'none',
+          outlineOffset: isDropTarget ? 4 : 2,
+          boxShadow: isDropTarget
+            ? '0 0 0 8px rgba(67, 97, 238, 0.10)'
+            : 'none',
           cursor: isPreview ? 'default' : 'pointer',
+          transition: 'outline 120ms ease, box-shadow 120ms ease',
           ...style,
         }}
         onClick={(e) => {
@@ -84,7 +113,7 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
             overflow: 'hidden',
           }}
         >
-          <IsolatedLivePreview code={code} />
+          <IsolatedLivePreview code={displayCode} />
         </div>
 
         {/* 选中态悬浮工具栏 */}
@@ -101,8 +130,8 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
               alignItems: 'center',
               gap: 2,
               padding: 2,
-              background: '#fff',
-              border: '1px solid #d6e4ff',
+              background: 'var(--ant-color-bg-elevated)',
+              border: '1px solid var(--ant-color-primary-border)',
               borderRadius: 6,
               boxShadow: '0 2px 8px rgba(0,0,0,0.08)',
             }}
@@ -116,7 +145,8 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
                 }}
                 style={toolbarBtnStyle}
                 onMouseEnter={(e) =>
-                  (e.currentTarget.style.background = '#f0f5ff')
+                  (e.currentTarget.style.background =
+                    'var(--ant-color-primary-bg)')
                 }
                 onMouseLeave={(e) =>
                   (e.currentTarget.style.background = 'transparent')
@@ -134,7 +164,8 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
                 }}
                 style={toolbarBtnStyle}
                 onMouseEnter={(e) =>
-                  (e.currentTarget.style.background = '#f0f5ff')
+                  (e.currentTarget.style.background =
+                    'var(--ant-color-primary-bg)')
                 }
                 onMouseLeave={(e) =>
                   (e.currentTarget.style.background = 'transparent')
@@ -152,7 +183,8 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
                 }}
                 style={{ ...toolbarBtnStyle, color: '#ff4d4f' }}
                 onMouseEnter={(e) =>
-                  (e.currentTarget.style.background = '#fff1f0')
+                  (e.currentTarget.style.background =
+                    'var(--ant-color-error-bg)')
                 }
                 onMouseLeave={(e) =>
                   (e.currentTarget.style.background = 'transparent')
@@ -182,7 +214,7 @@ const toolbarBtnStyle: React.CSSProperties = {
   alignItems: 'center',
   justifyContent: 'center',
   fontSize: 14,
-  color: '#555',
+  color: 'var(--ant-color-text-secondary)',
   padding: 0,
   transition: 'background 120ms ease',
 };