@gadmin2n/schematics 0.0.138 → 0.0.140

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

@@ -0,0 +1,149 @@
+import type { LayoutItem } from 'react-grid-layout';
+import { createSectionCompactor } from './sectionCompactor';
+import type { CanvasItem } from './types';
+
+const items: CanvasItem[] = [
+  { id: 'board', componentType: 'Whiteboard', code: '' },
+  {
+    id: 'chart',
+    componentType: 'MultiChart',
+    code: '',
+    parentId: 'board',
+  },
+];
+
+describe('Whiteboard compaction', () => {
+  it('keeps a nested component at its freely chosen y position', () => {
+    const compactor = createSectionCompactor(() => items);
+    const layout: LayoutItem[] = [
+      { i: 'board', x: 0, y: 0, w: 30, h: 30 },
+      { i: 'chart', x: 4, y: 10, w: 8, h: 6 },
+    ];
+
+    const compacted = compactor.compact(layout, 48);
+
+    expect(compacted.find((entry) => entry.i === 'chart')).toMatchObject({
+      x: 4,
+      y: 10,
+    });
+  });
+
+  it('restores normal canvas compaction while dragging a child outside its whiteboard', () => {
+    const compactor = createSectionCompactor(
+      () => items,
+      () => 'chart',
+      () => null,
+    );
+    const layout: LayoutItem[] = [
+      { i: 'board', x: 0, y: 0, w: 30, h: 30 },
+      { i: 'chart', x: 34, y: 35, w: 8, h: 6 },
+    ];
+
+    const compacted = compactor.compact(layout, 48);
+
+    expect(compacted.find((entry) => entry.i === 'chart')).toMatchObject({
+      x: 34,
+      y: 0,
+    });
+  });
+
+  it('prevents an outside child from partially overlapping its whiteboard', () => {
+    const compactor = createSectionCompactor(
+      () => items,
+      () => 'chart',
+      () => null,
+    );
+    const layout: LayoutItem[] = [
+      { i: 'board', x: 0, y: 0, w: 30, h: 30 },
+      { i: 'chart', x: 28, y: 5, w: 8, h: 6 },
+    ];
+
+    const compacted = compactor.compact(layout, 48);
+
+    expect(compacted.find((entry) => entry.i === 'chart')).toMatchObject({
+      x: 28,
+      y: 30,
+    });
+  });
+
+  it('keeps free positioning while dragging a child inside its whiteboard', () => {
+    const compactor = createSectionCompactor(
+      () => items,
+      () => 'chart',
+      () => 'board',
+    );
+    const layout: LayoutItem[] = [
+      { i: 'board', x: 0, y: 0, w: 30, h: 30 },
+      { i: 'chart', x: 4, y: 10, w: 8, h: 6 },
+    ];
+
+    const compacted = compactor.compact(layout, 48);
+
+    expect(compacted.find((entry) => entry.i === 'chart')).toMatchObject({
+      x: 4,
+      y: 10,
+    });
+  });
+
+  it('keeps existing children stable while another component enters the whiteboard', () => {
+    const boardItems: CanvasItem[] = [
+      { id: 'board', componentType: 'Whiteboard', code: '' },
+      {
+        id: 'existing-chart',
+        componentType: 'MultiChart',
+        code: '',
+        parentId: 'board',
+      },
+      { id: 'incoming-chart', componentType: 'MultiChart', code: '' },
+    ];
+    const originLayout: LayoutItem[] = [
+      { i: 'board', x: 0, y: 0, w: 30, h: 30 },
+      { i: 'existing-chart', x: 4, y: 10, w: 8, h: 6 },
+      { i: 'incoming-chart', x: 34, y: 0, w: 8, h: 6 },
+    ];
+    const compactor = createSectionCompactor(
+      () => boardItems,
+      () => 'incoming-chart',
+      () => 'board',
+      () => ({ id: 'incoming-chart', originLayout }),
+    );
+    const collisionLayout: LayoutItem[] = [
+      { i: 'board', x: 0, y: 0, w: 30, h: 30 },
+      { i: 'existing-chart', x: 4, y: 4, w: 8, h: 6 },
+      { i: 'incoming-chart', x: 4, y: 10, w: 8, h: 6 },
+    ];
+
+    const compacted = compactor.compact(collisionLayout, 48);
+
+    expect(
+      compacted.find((entry) => entry.i === 'existing-chart'),
+    ).toMatchObject({
+      x: 4,
+      y: 10,
+    });
+  });
+
+  it('moves nested components by the same offset while dragging their whiteboard', () => {
+    const originLayout: LayoutItem[] = [
+      { i: 'board', x: 0, y: 0, w: 30, h: 30 },
+      { i: 'chart', x: 2, y: 5, w: 8, h: 6 },
+    ];
+    const compactor = createSectionCompactor(
+      () => items,
+      () => 'board',
+      () => null,
+      () => ({ id: 'board', originLayout }),
+    );
+    const layout: LayoutItem[] = [
+      { i: 'board', x: 5, y: 0, w: 30, h: 30 },
+      { i: 'chart', x: 2, y: 5, w: 8, h: 6 },
+    ];
+
+    const compacted = compactor.compact(layout, 48);
+
+    expect(compacted.find((entry) => entry.i === 'chart')).toMatchObject({
+      x: 7,
+      y: 5,
+    });
+  });
+});

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

@@ -1,22 +1,29 @@
 import { verticalCompactor } from 'react-grid-layout';
-import type { Compactor } from 'react-grid-layout';
+import type { Compactor, LayoutItem } from 'react-grid-layout';
 import type { CanvasItem } from './types';
+import { WHITEBOARD_COMPONENT_TYPE } from './whiteboardLayout';
+
+interface DragSnapshot {
+  id: string;
+  originLayout: LayoutItem[];
+}
 
 /**
- * 创建支持 Section 分层重叠的自定义 compactor。
+ * 创建支持 Section / Whiteboard 分层重叠的自定义 compactor。
  *
  * 碰撞规则：
- * - Section 与 Section：正常碰撞（不能重叠）
+ * - 背景容器之间：正常碰撞（不能重叠）
  * - 普通组件与普通组件：正常碰撞（不能重叠）
  * - Section 与普通组件：允许重叠
  *
- * 实现：将 layout 分为两层分别 compact，然后合并。
- * - Section 层：只包含 Section item，独立 compact
- * - 普通层：只包含普通 item，独立 compact
- * 由于两层独立 compact，它们之间自然不会互相推挤。
+ * 实现：只压缩背景容器和处于 Canvas 模式的组件。
+ * Whiteboard 子组件以及仍在白板内拖拽的组件保持用户选择的自由坐标。
  */
 export function createSectionCompactor(
   getItems: () => CanvasItem[],
+  getDraggingItemId: () => string | null = () => null,
+  getActiveWhiteboardId: () => string | null = () => null,
+  getDragSnapshot: () => DragSnapshot | null = () => null,
 ): Compactor {
   return {
     type: 'vertical',
@@ -24,22 +31,109 @@ export function createSectionCompactor(
 
     compact(layout, cols) {
       const items = getItems();
-      const sectionIds = new Set(
+      const draggingItemId = getDraggingItemId();
+      const dragSnapshot = getDragSnapshot();
+      const keepDraggingPosition = !!getActiveWhiteboardId();
+      const dragOriginLayout =
+        draggingItemId && dragSnapshot?.id === draggingItemId
+          ? dragSnapshot.originLayout
+          : null;
+      const whiteboardIds = new Set(
+        items
+          .filter((item) => item.componentType === WHITEBOARD_COMPONENT_TYPE)
+          .map((item) => item.id),
+      );
+      const backgroundIds = new Set(
+        items
+          .filter(
+            (item) =>
+              item.componentType === 'Section' ||
+              item.componentType === WHITEBOARD_COMPONENT_TYPE,
+          )
+          .map((item) => item.id),
+      );
+      const nestedIds = new Set(
         items
-          .filter((item) => item.componentType === 'Section')
+          .filter(
+            (item) =>
+              !!item.parentId &&
+              item.componentType !== WHITEBOARD_COMPONENT_TYPE &&
+              item.id !== draggingItemId,
+          )
           .map((item) => item.id),
       );
 
-      // 分两层
-      const sectionLayout = layout.filter((l) => sectionIds.has(l.i));
-      const normalLayout = layout.filter((l) => !sectionIds.has(l.i));
+      const backgroundLayout = layout.filter((entry) =>
+        backgroundIds.has(entry.i),
+      );
+      const freeLayout = layout.filter(
+        (entry) =>
+          !backgroundIds.has(entry.i) &&
+          !nestedIds.has(entry.i) &&
+          (entry.i !== draggingItemId || !keepDraggingPosition) &&
+          entry.i !== '__dropping-elem__',
+      );
+      const interactiveLayout = layout.filter(
+        (entry) =>
+          !backgroundIds.has(entry.i) &&
+          ((entry.i === draggingItemId && keepDraggingPosition) ||
+            entry.i === '__dropping-elem__'),
+      );
+
+      const compactedBackgrounds = verticalCompactor.compact(
+        backgroundLayout,
+        cols,
+      );
+      const whiteboardObstacles = compactedBackgrounds
+        .filter((entry) => whiteboardIds.has(entry.i))
+        .map((entry) => ({ ...entry, static: true }));
+      const compactedFreeItems = verticalCompactor
+        .compact([...whiteboardObstacles, ...freeLayout], cols)
+        .filter((entry) => !whiteboardIds.has(entry.i));
+      const compactedNestedItems = items
+        .filter((item) => item.componentType === WHITEBOARD_COMPONENT_TYPE)
+        .flatMap((whiteboard) => {
+          const whiteboardLayout = compactedBackgrounds.find(
+            (entry) => entry.i === whiteboard.id,
+          );
+          const previousWhiteboardLayout = layout.find(
+            (entry) => entry.i === whiteboard.id,
+          );
+          if (!whiteboardLayout || !previousWhiteboardLayout) return [];
+
+          const originWhiteboardLayout = dragOriginLayout
+            ? dragOriginLayout.find((entry) => entry.i === whiteboard.id)
+            : previousWhiteboardLayout;
+          if (!originWhiteboardLayout) return [];
 
-      // 各自独立 compact
-      const compactedSections = verticalCompactor.compact(sectionLayout, cols);
-      const compactedNormals = verticalCompactor.compact(normalLayout, cols);
+          const childIds = new Set(
+            items
+              .filter(
+                (item) =>
+                  item.parentId === whiteboard.id &&
+                  item.componentType !== WHITEBOARD_COMPONENT_TYPE &&
+                  item.id !== draggingItemId,
+              )
+              .map((item) => item.id),
+          );
+          const offsetX = whiteboardLayout.x - originWhiteboardLayout.x;
+          const offsetY = whiteboardLayout.y - originWhiteboardLayout.y;
+          const childLayout = dragOriginLayout ?? layout;
+          return childLayout
+            .filter((entry) => childIds.has(entry.i))
+            .map((entry) => ({
+              ...entry,
+              x: entry.x + offsetX,
+              y: entry.y + offsetY,
+            }));
+        });
 
-      // 合并
-      return [...compactedSections, ...compactedNormals];
+      return [
+        ...compactedBackgrounds,
+        ...compactedFreeItems,
+        ...compactedNestedItems,
+        ...interactiveLayout,
+      ];
     },
   };
 }

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

@@ -29,6 +29,7 @@ export interface CanvasItem {
   id: string; // nanoid 生成的唯一 ID
   componentType: string; // "PieChart" | "BarChart" | "NumCard" | ...
   code: string; // 当前 TSX 代码
+  parentId?: string; // 所属 Whiteboard；Whiteboard 自身永远没有 parentId
 }
 
 // ─── Multi-Canvas ────────────────────────────────────────────────────────

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

@@ -0,0 +1,83 @@
+import type { LayoutItem } from 'react-grid-layout';
+import type { CanvasItem } from './types';
+import {
+  findContainingWhiteboard,
+  moveWhiteboardChildren,
+} from './whiteboardLayout';
+
+const items: CanvasItem[] = [
+  { id: 'outer', componentType: 'Whiteboard', code: '' },
+  { id: 'inner-board', componentType: 'Whiteboard', code: '' },
+  { id: 'chart', componentType: 'MultiChart', code: '' },
+];
+
+const layout: LayoutItem[] = [
+  { i: 'outer', x: 0, y: 0, w: 30, h: 30 },
+  { i: 'inner-board', x: 2, y: 2, w: 12, h: 12 },
+  { i: 'chart', x: 20, y: 4, w: 8, h: 8 },
+];
+
+describe('findContainingWhiteboard', () => {
+  it('assigns a regular component fully inside a whiteboard', () => {
+    expect(findContainingWhiteboard('chart', items, layout)).toBe('outer');
+  });
+
+  it('keeps a component inside when it is flush with the whiteboard edges', () => {
+    const edgeAlignedLayout: LayoutItem[] = [
+      { i: 'outer', x: 0, y: 0, w: 30, h: 30 },
+      { i: 'inner-board', x: 32, y: 0, w: 12, h: 12 },
+      { i: 'chart', x: 0, y: 0, w: 30, h: 30 },
+    ];
+
+    expect(findContainingWhiteboard('chart', items, edgeAlignedLayout)).toBe(
+      'outer',
+    );
+  });
+
+  it('never assigns a whiteboard to another whiteboard', () => {
+    expect(findContainingWhiteboard('inner-board', items, layout)).toBe(
+      undefined,
+    );
+  });
+});
+
+describe('moveWhiteboardChildren', () => {
+  it('moves direct children by the same grid offset as their whiteboard', () => {
+    const nestedItems = [
+      { id: 'board', componentType: 'Whiteboard', code: '' },
+      {
+        id: 'nested-chart',
+        componentType: 'MultiChart',
+        code: '',
+        parentId: 'board',
+      },
+      { id: 'free-chart', componentType: 'MultiChart', code: '' },
+    ] as CanvasItem[];
+    const previousLayout: LayoutItem[] = [
+      { i: 'board', x: 0, y: 0, w: 24, h: 20 },
+      { i: 'nested-chart', x: 2, y: 3, w: 8, h: 6 },
+      { i: 'free-chart', x: 30, y: 3, w: 8, h: 6 },
+    ];
+    const draggedLayout: LayoutItem[] = [
+      { i: 'board', x: 5, y: 7, w: 24, h: 20 },
+      { i: 'nested-chart', x: 2, y: 3, w: 8, h: 6 },
+      { i: 'free-chart', x: 30, y: 3, w: 8, h: 6 },
+    ];
+
+    const moved = moveWhiteboardChildren(
+      'board',
+      previousLayout,
+      draggedLayout,
+      nestedItems,
+    );
+
+    expect(moved.find((entry) => entry.i === 'nested-chart')).toMatchObject({
+      x: 7,
+      y: 10,
+    });
+    expect(moved.find((entry) => entry.i === 'free-chart')).toMatchObject({
+      x: 30,
+      y: 3,
+    });
+  });
+});

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

@@ -0,0 +1,118 @@
+import type { LayoutItem } from 'react-grid-layout';
+import type { CanvasItem } from './types';
+
+export const WHITEBOARD_COMPONENT_TYPE = 'Whiteboard';
+export const WHITEBOARD_INSET_X = 0;
+export const WHITEBOARD_INSET_Y = 0;
+
+const WHITEBOARD_TITLE_EXPRESSION = /title\s*=\s*\{\s*("(?:\\.|[^"\\])*")\s*\}/;
+const WHITEBOARD_TITLE_LITERAL = /title\s*=\s*"([^"]*)"/;
+
+export function readWhiteboardName(code: string): string {
+  const expressionMatch = code.match(WHITEBOARD_TITLE_EXPRESSION);
+  if (expressionMatch) {
+    try {
+      return JSON.parse(expressionMatch[1]);
+    } catch {
+      return '白板';
+    }
+  }
+
+  return code.match(WHITEBOARD_TITLE_LITERAL)?.[1] ?? '白板';
+}
+
+export function writeWhiteboardName(code: string, name: string): string {
+  const titleProp = `title={${JSON.stringify(name)}}`;
+  if (WHITEBOARD_TITLE_EXPRESSION.test(code)) {
+    return code.replace(WHITEBOARD_TITLE_EXPRESSION, titleProp);
+  }
+  if (WHITEBOARD_TITLE_LITERAL.test(code)) {
+    return code.replace(WHITEBOARD_TITLE_LITERAL, titleProp);
+  }
+  if (/testId\s*=/.test(code)) {
+    return code.replace(/([ \t]*)(testId\s*=)/, `$1${titleProp}\n$1$2`);
+  }
+  return code.replace(/\/>/, `  ${titleProp}\n/>`);
+}
+
+export function normalizeLegacyWhiteboardName(code: string): string {
+  return readWhiteboardName(code) === '大白板'
+    ? writeWhiteboardName(code, '白板')
+    : code;
+}
+
+export function findContainingWhiteboard(
+  itemId: string,
+  items: CanvasItem[],
+  layout: readonly LayoutItem[],
+): string | undefined {
+  const item = items.find((candidate) => candidate.id === itemId);
+  const itemLayout = layout.find((candidate) => candidate.i === itemId);
+  if (
+    !item ||
+    !itemLayout ||
+    item.componentType === WHITEBOARD_COMPONENT_TYPE
+  ) {
+    return undefined;
+  }
+
+  return items
+    .filter(
+      (candidate) => candidate.componentType === WHITEBOARD_COMPONENT_TYPE,
+    )
+    .map((candidate) => layout.find((entry) => entry.i === candidate.id))
+    .filter(
+      (candidate): candidate is LayoutItem =>
+        !!candidate &&
+        itemLayout.x >= candidate.x + WHITEBOARD_INSET_X &&
+        itemLayout.y >= candidate.y + WHITEBOARD_INSET_Y &&
+        itemLayout.x + itemLayout.w <=
+          candidate.x + candidate.w - WHITEBOARD_INSET_X &&
+        itemLayout.y + itemLayout.h <= candidate.y + candidate.h,
+    )
+    .sort((a, b) => a.w * a.h - b.w * b.h)[0]?.i;
+}
+
+export function moveWhiteboardChildren(
+  whiteboardId: string,
+  previousLayout: readonly LayoutItem[],
+  nextLayout: readonly LayoutItem[],
+  items: CanvasItem[],
+): LayoutItem[] {
+  const previousWhiteboard = previousLayout.find(
+    (entry) => entry.i === whiteboardId,
+  );
+  const nextWhiteboard = nextLayout.find((entry) => entry.i === whiteboardId);
+  if (!previousWhiteboard || !nextWhiteboard) {
+    return nextLayout.map((entry) => ({ ...entry }));
+  }
+
+  const offsetX = nextWhiteboard.x - previousWhiteboard.x;
+  const offsetY = nextWhiteboard.y - previousWhiteboard.y;
+  if (offsetX === 0 && offsetY === 0) {
+    return nextLayout.map((entry) => ({ ...entry }));
+  }
+
+  const childIds = new Set(
+    items
+      .filter((item) => item.parentId === whiteboardId)
+      .map((item) => item.id),
+  );
+
+  return nextLayout.map((entry) =>
+    childIds.has(entry.i)
+      ? { ...entry, x: entry.x + offsetX, y: entry.y + offsetY }
+      : entry,
+  );
+}
+
+export function updateWhiteboardParent(
+  itemId: string,
+  items: CanvasItem[],
+  layout: readonly LayoutItem[],
+): CanvasItem[] {
+  const parentId = findContainingWhiteboard(itemId, items, layout);
+  return items.map((item) =>
+    item.id === itemId ? { ...item, parentId } : item,
+  );
+}

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

@@ -0,0 +1,26 @@
+import {
+  normalizeLegacyWhiteboardName,
+  readWhiteboardName,
+  writeWhiteboardName,
+} from './whiteboardLayout';
+
+describe('whiteboard name', () => {
+  it('writes names with quotes without breaking the component code', () => {
+    const code = '<Section title="白板" testId="canvas-whiteboard" />';
+
+    const renamed = writeWhiteboardName(code, '销售 "白板"');
+
+    expect(renamed).toBe(
+      '<Section title={"销售 \\"白板\\""} testId="canvas-whiteboard" />',
+    );
+    expect(readWhiteboardName(renamed)).toBe('销售 "白板"');
+  });
+
+  it('displays the legacy default name as 白板', () => {
+    const code = '<Section title="大白板" testId="canvas-whiteboard" />';
+
+    expect(normalizeLegacyWhiteboardName(code)).toBe(
+      '<Section title={"白板"} testId="canvas-whiteboard" />',
+    );
+  });
+});

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

@@ -50,7 +50,7 @@ export default function CanvasViewPage() {
           flex: 1,
           overflow: 'visible',
           position: 'relative',
-          background: '#f0f2f5',
+          background: 'var(--ant-color-bg-layout)',
         }}
       >
         {loading ? (
@@ -86,8 +86,16 @@ export default function CanvasViewPage() {
                 {data.items.map((item) => (
                   <CanvasCell
                     key={item.id}
+                    style={{
+                      zIndex:
+                        item.componentType === 'Section' ||
+                        item.componentType === 'Whiteboard'
+                          ? 0
+                          : 1,
+                    }}
                     code={item.code}
                     componentType={item.componentType}
+                    isWhiteboardChild={!!item.parentId}
                     selected={false}
                     isPreview={true}
                     onClick={() => {}}

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

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

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

@@ -87,10 +87,10 @@ export const GameList: React.FC<IResourceComponentsProps> = () => {
   const {
     tableProps,
     sorters: sorter,
-    setCurrent,
+    setCurrentPage,
     setFilters,
     filters,
-    tableQueryResult,
+    tableQuery,
     searchFormProps,
   } = useTable<Game, HttpError>({
     meta: { transformQFn: getSearchFilters, select: prismaSelect },
@@ -102,22 +102,24 @@ export const GameList: 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,
   });
 
@@ -187,7 +189,7 @@ export const GameList: 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/game/show.tsx

@@ -27,10 +27,10 @@ export const GameShow: React.FC<IResourceComponentsProps> = () => {
   const resourceName = 'game';
   const t = useTranslate();
 
-  const { queryResult } = useShow<Game>({
+  const { query } = useShow<Game>({
     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 GameShow: 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>
       }
     >