@gadmin2n/schematics 0.0.139 → 0.0.141

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

@@ -13,13 +13,13 @@
     "@gadmin2n/charts": "0.0.10",
     "@gadmin2n/react-common": "^0.0.71",
     "@monaco-editor/react": "^4.7.0",
-    "@refinedev/antd": "^5.47.0",
-    "@refinedev/cli": "^2.16.51",
-    "@refinedev/core": "^4.58.0",
-    "@refinedev/inferencer": "^4.7.1",
-    "@refinedev/kbar": "^1.3.17",
-    "@refinedev/react-router-v6": "^4.6.0",
-    "@tanstack/react-query": "^4.36.1",
+    "@refinedev/antd": "^6.0.3",
+    "@refinedev/cli": "^2.16.52",
+    "@refinedev/core": "^5.0.12",
+    "@refinedev/inferencer": "^7.0.0",
+    "@refinedev/kbar": "^2.0.1",
+    "@refinedev/react-router": "^2.0.4",
+    "@tanstack/react-query": "^5.81.5",
     "@uiw/react-md-editor": "^3.19.5",
     "@xyflow/react": "^12.10.2",
     "antd": "^5.24.6",
@@ -41,7 +41,7 @@
     "react-dom": "^18.2.0",
     "react-grid-layout": "^2.2.3",
     "react-i18next": "^15.4.1",
-    "react-router-dom": "^6.8.1",
+    "react-router-dom": "^7.9.4",
     "reflect-metadata": "^0.1.13",
     "sucrase": "^3.35.1",
     "vanilla-jsoneditor": "^0.23.7"
@@ -70,18 +70,22 @@
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^4",
     "husky": "^8.0.0",
+    "jsdom": "^26.1.0",
     "lint-staged": "^13.0.0",
     "postcss": "^8.5.6",
     "postcss-nesting": "^14.0.0",
     "prettier": "^3.8.3",
     "typescript": "^5.4.2",
     "vite": "^6.2.0",
-    "vite-tsconfig-paths": "^5.1.4"
+    "vite-tsconfig-paths": "^5.1.4",
+    "vitest": "^3.2.4",
+    "xlsx": "^0.18.5"
   },
   "scripts": {
     "dev": "NODE_OPTIONS='--max-old-space-size=4096' vite --port 3000",
     "build": "tsc && vite build",
     "preview": "vite preview",
+    "test": "vitest run",
     "typecheck": "tsc --noEmit",
     "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx}\"",
     "lint": "eslint \"src/**/*.{ts,tsx}\"",

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

@@ -1,11 +1,11 @@
 import React from 'react';
 import { Refine } from '@refinedev/core';
-import { notificationProvider, ErrorComponent } from '@refinedev/antd';
+import { useNotificationProvider, ErrorComponent } from '@refinedev/antd';
 import { RefineKbar, RefineKbarProvider } from '@refinedev/kbar';
 import routerProvider, {
   NavigateToResource,
   UnsavedChangesNotifier,
-} from '@refinedev/react-router-v6';
+} from '@refinedev/react-router';
 import { BrowserRouter, Outlet, Route, Routes } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useMemo } from 'react';
@@ -20,6 +20,8 @@ import '@gadmin2n/charts/style.css';
 import './styles/antd.css';
 import './styles/fc.css';
 import './styles/index.css';
+import './styles/antd-theme-vars.css';
+import './styles/theme-styles.css';
 import { auditLogProvider } from 'auditLogProvider';
 import { gadminCrudProvider as dataProvider } from './helpers/http';
 import { useDynamicResources } from 'hooks/useDynamicResources';
@@ -43,6 +45,7 @@ const DevAgentWrapper: React.FC<{ children: React.ReactNode }> = ({
 
 function App() {
   const { i18n } = useTranslation();
+  const notificationProvider = useNotificationProvider();
 
   // Stable reference — i18n object identity never changes, so this memo runs once.
   // i18n.t / i18n.language are called at invocation time, always returning fresh values.

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

@@ -1,4 +1,4 @@
-import { AuthBindings } from '@refinedev/core';
+import { AuthProvider } from '@refinedev/core';
 import { getApiUrl } from 'config/http';
 import { requestHeaders, GAdminTokenName } from 'helpers';
 import { login as taihuLogin, logout as taihuLogout } from './helpers/login';
@@ -16,7 +16,7 @@ export const getUserInfoOnce = memoize(async () => {
   return res.json();
 });
 
-export const authProvider: AuthBindings = {
+export const authProvider: AuthProvider = {
   login: async ({ providerName, email }) => {
     if (providerName === 'google') {
       window.location.href = 'https://accounts.google.com/o/oauth2/v2/auth';

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

@@ -264,21 +264,18 @@ export const BulkActions: React.FC<BulkActionsProps> = ({
               updateLoading,
             ),
       )}
-
       {/* Export selected */}
       {resolvedShowExport &&
         onExportSelected &&
         (renderExportButton
           ? renderExportButton(onExportSelected, exportLoading)
           : defaultExportButton(onExportSelected, exportLoading))}
-
       {/* Delete selected */}
       {resolvedShowDelete &&
         onDeleteSelected &&
         (renderDeleteButton
           ? renderDeleteButton(onDeleteSelected, deleteLoading)
           : defaultDeleteButton(onDeleteSelected, deleteLoading))}
-
       {/* JUMP actions */}
       {jumpActions.map((action) => {
         const url = interpolateActionUrl((action as any).url || '', {
@@ -302,10 +299,8 @@ export const BulkActions: React.FC<BulkActionsProps> = ({
           </Button>
         );
       })}
-
       {/* Extra actions */}
       {extraActions}
-
       {/* Selection count */}
       {renderSelectionCount
         ? renderSelectionCount(selectedRowKeys.length)

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

@@ -0,0 +1,46 @@
+import React from 'react';
+import { Card, Typography } from 'antd';
+import { HEADER_CARD_PROPS } from 'constants/layout';
+
+interface PageHeaderProps {
+  /** 页面标题（Title level 4） */
+  title: React.ReactNode;
+  /** 标题下方 12px 辅助说明，可选 */
+  subtitle?: React.ReactNode;
+  /** 右侧操作区（按钮组），可选 */
+  extra?: React.ReactNode;
+}
+
+/**
+ * 自定义页面统一的头部卡片：标题 + 副标题 + 右侧操作按钮。
+ * 样式规范见 page-create-new skill（Header Card 压扁、Title level 4、副标题 12px）。
+ */
+export const PageHeader: React.FC<PageHeaderProps> = ({
+  title,
+  subtitle,
+  extra,
+}) => (
+  <Card {...HEADER_CARD_PROPS}>
+    <div
+      style={{
+        display: 'flex',
+        justifyContent: 'space-between',
+        alignItems: 'center',
+        flexWrap: 'wrap',
+        gap: 8,
+      }}
+    >
+      <div>
+        <Typography.Title level={4} style={{ margin: 0 }}>
+          {title}
+        </Typography.Title>
+        {subtitle && (
+          <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+            {subtitle}
+          </Typography.Text>
+        )}
+      </div>
+      {extra}
+    </div>
+  </Card>
+);

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import { SearchOutlined } from '@ant-design/icons';
 import { Button, DatePicker, Form, FormProps, Input, Space } from 'antd';
 import { agentAttrs } from './agentPanel/agentAttributes';
 
@@ -128,6 +127,19 @@ export const SearchBar: React.FC<SearchBarProps> = ({
   showSubmitButton = true,
   noFormWrapper = false,
 }) => {
+  // Label rendered inside the input as prefix (instead of external Form.Item label)
+  const renderPrefixLabel = (label: React.ReactNode) => (
+    <span
+      style={{
+        color: 'var(--ant-color-text)',
+        marginRight: 4,
+        whiteSpace: 'nowrap',
+      }}
+    >
+      {label}
+    </span>
+  );
+
   // Default fields if none provided
   const defaultFields: SearchBarField[] = [
     {
@@ -186,16 +198,18 @@ export const SearchBar: React.FC<SearchBarProps> = ({
     }
 
     if (field.type === 'dateRange') {
-      const defaultPicker = <RangePicker />;
-      const picker = renderDateRangePicker
-        ? renderDateRangePicker(field, defaultPicker)
-        : defaultPicker;
-
       const defaultLabel =
         field.label ||
         t(`resources.${resourceName}.fields.${field.name}`, field.name);
       const defaultStyle = field.style || { width: '100%', maxWidth: '400px' };
 
+      const defaultPicker = (
+        <RangePicker prefix={renderPrefixLabel(defaultLabel)} />
+      );
+      const picker = renderDateRangePicker
+        ? renderDateRangePicker(field, defaultPicker)
+        : defaultPicker;
+
       if (renderFieldWrapper) {
         return (
           <React.Fragment key={field.name}>
@@ -211,11 +225,7 @@ export const SearchBar: React.FC<SearchBarProps> = ({
       return (
         <React.Fragment key={field.name}>
           &nbsp;
-          <Form.Item
-            label={defaultLabel}
-            name={field.name}
-            style={defaultStyle}
-          >
+          <Form.Item name={field.name} style={defaultStyle}>
             {picker}
           </Form.Item>
         </React.Fragment>
@@ -235,7 +245,10 @@ export const SearchBar: React.FC<SearchBarProps> = ({
     const defaultStyle = field.style || { width: '100%', maxWidth: '300px' };
 
     const defaultInput = (
-      <Input placeholder={defaultPlaceholder} prefix={<SearchOutlined />} />
+      <Input
+        placeholder={defaultPlaceholder}
+        prefix={renderPrefixLabel(defaultLabel)}
+      />
     );
 
     const input = renderKeywordInput
@@ -257,12 +270,7 @@ export const SearchBar: React.FC<SearchBarProps> = ({
     }
 
     return (
-      <Form.Item
-        key={field.name}
-        label={defaultLabel}
-        name={field.name}
-        style={defaultStyle}
-      >
+      <Form.Item key={field.name} name={field.name} style={defaultStyle}>
         {input}
       </Form.Item>
     );

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/auditLog/components/eventList/index.tsx

@@ -1,13 +1,13 @@
 import React from 'react';
 import { UseQueryResult } from '@tanstack/react-query';
 import { List as AntdList, Button, Badge, Typography } from 'antd';
-import { ILog, ILogData } from '@refinedev/core';
+import { HttpError, ILog, ILogData } from '@refinedev/core';
 import dayjs from 'dayjs';
 
 const { Text } = Typography;
 
 interface EventListProps {
-  logQueryResult?: UseQueryResult<ILogData>;
+  logQueryResult?: UseQueryResult<ILogData, HttpError>;
   showModal: () => void;
   setSelectedLog: React.Dispatch<React.SetStateAction<ILog | undefined>>;
   selectedLog: ILog | undefined;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/auditLog/components/logButton/index.tsx

@@ -1,17 +1,16 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useModal } from '@refinedev/antd';
 import { Button, ButtonProps, ModalProps, message } from 'antd';
 import * as Icons from '@ant-design/icons';
 import {
-  useRouterContext,
   useTranslate,
-  ResourceRouterParams,
   BaseKey,
   useLogList,
   ILog,
   ILogData,
-  useResource,
+  useResourceParams,
 } from '@refinedev/core';
+import { useParams } from 'react-router-dom';
 import { ReactDiffViewerProps } from 'react-diff-viewer';
 import { ModalDiffViewer } from '../modalDiffViewer';
 
@@ -39,10 +38,9 @@ export const LogButton: React.FC<LogButtonProps> = ({
   const { modalProps, show } = useModal();
   const [messageApi, contextHolder] = message.useMessage();
 
-  const { useParams } = useRouterContext();
-  const { id: idFromRoute } = useParams<ResourceRouterParams>();
+  const { id: idFromRoute } = useParams<{ id?: string }>();
 
-  const resourceWithRoute = useResource();
+  const resourceWithRoute = useResourceParams();
 
   const resourceName =
     propResourceName ?? resourceWithRoute?.resource?.name ?? '';
@@ -53,19 +51,28 @@ export const LogButton: React.FC<LogButtonProps> = ({
     meta: { id },
     queryOptions: {
       enabled: modalProps.open,
-      onSuccess: (result) => {
-        if (result?.length) {
-          setSelectedLog(result[0]);
-        } else {
-          messageApi.open({
-            type: 'warning',
-            content: 'There is no history.',
-          });
-        }
-      },
     },
   });
 
+  // react-query v5 移除了 useQuery 的 onSuccess 回调，改为 effect 响应数据到达。
+  useEffect(() => {
+    if (!modalProps.open || !logQueryResult.isSuccess) return;
+    const result = logQueryResult.data;
+    if (result?.length) {
+      setSelectedLog(result[0]);
+    } else {
+      messageApi.open({
+        type: 'warning',
+        content: 'There is no history.',
+      });
+    }
+  }, [
+    modalProps.open,
+    logQueryResult.isSuccess,
+    logQueryResult.data,
+    messageApi,
+  ]);
+
   return (
     <>
       <Button

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/auditLog/components/logList/index.tsx

@@ -1,16 +1,8 @@
 import React, { useState } from 'react';
 import { useModal } from '@refinedev/antd';
 import { Card, ModalProps } from 'antd';
-import {
-  BaseKey,
-  ILog,
-  ILogData,
-  pickNotDeprecated,
-  ResourceRouterParams,
-  useLogList,
-  useResourceWithRoute,
-  useRouterContext,
-} from '@refinedev/core';
+import { BaseKey, ILog, ILogData, useLogList } from '@refinedev/core';
+import { useParams } from 'react-router-dom';
 import { ReactDiffViewerProps } from 'react-diff-viewer';
 
 import { ModalDiffViewer } from '../modalDiffViewer';
@@ -33,20 +25,17 @@ export const LogList: React.FC<LogListProps> = ({
 
   const { modalProps, show } = useModal();
 
-  const { useParams } = useRouterContext();
-  const { resource: routeResourceName, id: idFromRoute } =
-    useParams<ResourceRouterParams>();
+  const { resource: routeResourceName, id: idFromRoute } = useParams<{
+    resource?: string;
+    id?: string;
+  }>();
 
-  const resourceWithRoute = useResourceWithRoute();
-  const resource = resourceWithRoute(routeResourceName);
-
-  const resourceName = propResourceName ?? resource.name;
+  const resourceName = propResourceName ?? routeResourceName ?? '';
   const id = recordItemId ?? idFromRoute;
 
   const logQueryResult = useLogList<ILogData>({
     resource: resourceName,
     meta: { id },
-    metaData: pickNotDeprecated(resource.meta, resource.options),
   });
 
   return (

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/auditLog/components/modalDiffViewer/index.tsx

@@ -12,7 +12,7 @@ import {
   Space,
 } from 'antd';
 
-import { ILogData, ILog } from '@refinedev/core';
+import { ILogData, ILog, HttpError } from '@refinedev/core';
 import ReactDiffViewer, {
   DiffMethod,
   ReactDiffViewerProps,
@@ -22,7 +22,7 @@ import stableStringify from 'json-stable-stringify';
 import { EventList } from '../eventList';
 
 export interface ModalDiffViewerProps {
-  logQueryResult?: UseQueryResult<ILogData>;
+  logQueryResult?: UseQueryResult<ILogData, HttpError>;
   reactDiffViewerProps?: ReactDiffViewerProps;
   modalProps?: ModalProps;
   selectedLog?: ILog;