@gadmin2n/schematics 0.0.68 → 0.0.70

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

@@ -1,12 +1,9 @@
-import { useMemo, useRef } from "react";
-import type { IResourceItem, ResourceProps } from "@refinedev/core";
-import {
-  DashboardOutlined,
-  SettingOutlined,
-} from "@ant-design/icons";
-import { getRoutePath } from "config/routeRegistry";
-import { useUserPageAccess } from "./useUserPageAccess";
-import generatedResources from "generated/resources";
+import { useMemo, useRef } from 'react';
+import type { IResourceItem, ResourceProps } from '@refinedev/core';
+import { DashboardOutlined, SettingOutlined } from '@ant-design/icons';
+import { getRoutePath } from 'config/routeRegistry';
+import { useUserPageAccess } from './useUserPageAccess';
+import generatedResources from 'generated/resources';
 
 /**
  * Dynamic Resources Hook for erp-backend/web
@@ -46,7 +43,8 @@ const PAGES_WITH_TABS: string[] = [];
 
 export const useDynamicResources = (): IResourceItem[] => {
   // Use shared page access data (single call, reused below)
-  const { accessiblePageIds, pagesData, pageMap, isLoading, roleNames } = useUserPageAccess();
+  const { accessiblePageIds, pagesData, pageMap, isLoading, roleNames } =
+    useUserPageAccess();
 
   // If we already have cached resources, return immediately
   if (cachedResources !== null) {
@@ -66,11 +64,13 @@ export const useDynamicResources = (): IResourceItem[] => {
   }
 
   // Filter accessible pages and build hierarchical sorted list
-  const accessiblePages = pagesData.filter(page => accessiblePageIds.has(page.id));
+  const accessiblePages = pagesData.filter((page) =>
+    accessiblePageIds.has(page.id),
+  );
 
   // Group pages by parentId
   const pagesByParent = new Map<number | null, typeof accessiblePages>();
-  accessiblePages.forEach(page => {
+  accessiblePages.forEach((page) => {
     const parentId = page.parentId ?? null;
     if (!pagesByParent.has(parentId)) {
       pagesByParent.set(parentId, []);
@@ -79,7 +79,7 @@ export const useDynamicResources = (): IResourceItem[] => {
   });
 
   // Sort each group by sortOrder
-  pagesByParent.forEach(pages => {
+  pagesByParent.forEach((pages) => {
     pages.sort((a, b) => (a.sortOrder ?? Infinity) - (b.sortOrder ?? Infinity));
   });
 
@@ -89,7 +89,7 @@ export const useDynamicResources = (): IResourceItem[] => {
 
   const addPageWithChildren = (parentId: number | null) => {
     const children = pagesByParent.get(parentId) || [];
-    children.forEach(page => {
+    children.forEach((page) => {
       if (visited.has(page.id)) return;
       visited.add(page.id);
       sortedAccessiblePages.push(page);
@@ -101,7 +101,7 @@ export const useDynamicResources = (): IResourceItem[] => {
   addPageWithChildren(null);
 
   // Add any orphaned pages
-  accessiblePages.forEach(page => {
+  accessiblePages.forEach((page) => {
     if (!visited.has(page.id)) {
       sortedAccessiblePages.push(page);
     }
@@ -111,7 +111,7 @@ export const useDynamicResources = (): IResourceItem[] => {
   // 这类父页面应作为纯分组节点（不注册 list 路径），否则 Refine 会优先选中父节点
   // 导致 "全部" 等 index 子菜单项无法高亮
   const parentIdsWithIndexChild = new Set<number>();
-  accessiblePages.forEach(childPage => {
+  accessiblePages.forEach((childPage) => {
     if (!childPage.parentId) return;
     const childPath = getRoutePath(childPage.code);
     if (!childPath) return;
@@ -127,7 +127,7 @@ export const useDynamicResources = (): IResourceItem[] => {
   const resultResources: IResourceItem[] = [];
   const addedResourceNames = new Set<string>();
 
-  sortedAccessiblePages.forEach(page => {
+  sortedAccessiblePages.forEach((page) => {
     if (!page) return;
 
     // Skip virtual pages
@@ -158,7 +158,9 @@ export const useDynamicResources = (): IResourceItem[] => {
     // fallback 到 page.path（用于 gadmin2 页面）
     const registryPath = getRoutePath(page.code);
     const dbPath = page.path
-      ? page.path.startsWith("/") ? page.path : `/${page.path}`
+      ? page.path.startsWith('/')
+        ? page.path
+        : `/${page.path}`
       : undefined;
     const normalizedPath = registryPath ?? dbPath;
 
@@ -170,17 +172,19 @@ export const useDynamicResources = (): IResourceItem[] => {
     // Store both zhLabel/enLabel in meta; Sider resolves at render time
     const resource: IResourceItem = {
       name: permissionRes,
-      ...(!isGroupParent && normalizedPath && {
-        list: normalizedPath,
-        show: `${normalizedPath}/show/:id`,
-        edit: `${normalizedPath}/edit/:id`,
-        create: `${normalizedPath}/create`,
-      }),
+      ...(!isGroupParent &&
+        normalizedPath && {
+          list: normalizedPath,
+          show: `${normalizedPath}/show/:id`,
+          edit: `${normalizedPath}/edit/:id`,
+          create: `${normalizedPath}/create`,
+          clone: `${normalizedPath}/clone/:id`,
+        }),
       meta: {
         label: page.enName || page.code,
         zhLabel: page.zhName || page.code,
         enLabel: page.enName || page.code,
-        icon: iconMapping[page.code] || "",
+        icon: iconMapping[page.code] || '',
         parent: parentPermissionRes,
         route: normalizedPath,
         pageCode: page.code,
@@ -203,8 +207,13 @@ export const useDynamicResources = (): IResourceItem[] => {
   isComputing = false;
 
   if (import.meta.env.DEV) {
-    console.log('[useDynamicResources] ✅ Resources cached. Count:', cachedResources.length);
-    console.log('[useDynamicResources] 📌 This reference will be reused for all future calls');
+    console.log(
+      '[useDynamicResources] ✅ Resources cached. Count:',
+      cachedResources.length,
+    );
+    console.log(
+      '[useDynamicResources] 📌 This reference will be reused for all future calls',
+    );
   }
 
   return cachedResources;

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

@@ -0,0 +1,144 @@
+import { useEffect, useLayoutEffect, useRef, useCallback } from 'react';
+import * as echarts from 'echarts';
+
+type UseEChartsOpts = {
+  option: echarts.EChartsCoreOption;
+  theme?: string;
+  renderer?: 'canvas' | 'svg';
+  onEvents?: Record<string, (params: any, chart: echarts.ECharts) => void>;
+  shouldUpdate?: (
+    prev: echarts.EChartsCoreOption,
+    next: echarts.EChartsCoreOption,
+  ) => boolean;
+};
+
+function hasSize(el: HTMLElement): boolean {
+  return el.clientWidth > 0 && el.clientHeight > 0;
+}
+
+export function useECharts<T extends HTMLDivElement>({
+  option,
+  theme,
+  renderer = 'canvas',
+  onEvents,
+  shouldUpdate,
+}: UseEChartsOpts) {
+  const domRef = useRef<T | null>(null);
+  const chartRef = useRef<echarts.ECharts | null>(null);
+  const lastOptionRef = useRef<echarts.EChartsCoreOption | null>(null);
+  const roRef = useRef<ResizeObserver | null>(null);
+  const pendingOptionRef = useRef<echarts.EChartsCoreOption | null>(null);
+  const mountedRef = useRef(true);
+
+  const applyOption = useCallback(
+    (chart: echarts.ECharts, opt: echarts.EChartsCoreOption) => {
+      const need =
+        !lastOptionRef.current ||
+        (shouldUpdate ? shouldUpdate(lastOptionRef.current, opt) : true);
+      if (need) {
+        chart.setOption(opt, { notMerge: false, lazyUpdate: true });
+        lastOptionRef.current = opt;
+      }
+    },
+    [shouldUpdate],
+  );
+
+  const initChart = useCallback(() => {
+    if (!domRef.current) return;
+    if (!hasSize(domRef.current)) return;
+
+    const existing = echarts.getInstanceByDom(domRef.current as any);
+    if (existing) {
+      chartRef.current = existing;
+      if (pendingOptionRef.current) {
+        applyOption(existing, pendingOptionRef.current);
+        pendingOptionRef.current = null;
+      }
+      return;
+    }
+
+    const chart = echarts.init(domRef.current, theme, { renderer });
+    chartRef.current = chart;
+
+    if (onEvents) {
+      Object.entries(onEvents).forEach(([evt, handler]) => {
+        chart.on(evt as any, (p: any) => handler(p, chart));
+      });
+    }
+
+    if (pendingOptionRef.current) {
+      applyOption(chart, pendingOptionRef.current);
+      pendingOptionRef.current = null;
+    }
+  }, [theme, renderer, onEvents, applyOption]);
+
+  useLayoutEffect(() => {
+    mountedRef.current = true;
+    if (chartRef.current) {
+      chartRef.current.dispose();
+      chartRef.current = null;
+    }
+
+    initChart();
+
+    if (!chartRef.current) {
+      const timers = [
+        window.setTimeout(() => {
+          if (mountedRef.current) initChart();
+        }, 50),
+        window.setTimeout(() => {
+          if (mountedRef.current) initChart();
+        }, 200),
+        window.setTimeout(() => {
+          if (mountedRef.current) initChart();
+        }, 500),
+      ];
+      return () => {
+        mountedRef.current = false;
+        timers.forEach(clearTimeout);
+        if (chartRef.current) {
+          chartRef.current.dispose();
+          chartRef.current = null;
+        }
+      };
+    }
+
+    return () => {
+      mountedRef.current = false;
+      if (chartRef.current) {
+        chartRef.current.dispose();
+        chartRef.current = null;
+      }
+    };
+  }, [initChart]);
+
+  useEffect(() => {
+    if (!domRef.current) return;
+
+    roRef.current = new ResizeObserver(() => {
+      requestAnimationFrame(() => {
+        if (!chartRef.current) {
+          initChart();
+        } else {
+          chartRef.current.resize();
+        }
+      });
+    });
+    roRef.current.observe(domRef.current);
+
+    return () => {
+      roRef.current?.disconnect();
+      roRef.current = null;
+    };
+  }, [initChart]);
+
+  useEffect(() => {
+    if (!chartRef.current) {
+      pendingOptionRef.current = option;
+      return;
+    }
+    applyOption(chartRef.current, option);
+  }, [option, applyOption]);
+
+  return { domRef, chartRef };
+}

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

@@ -1,13 +1,13 @@
-import { useEffect, useState } from "react";
+import { useEffect, useState } from 'react';
 
-import { customRequest } from "helpers/login";
+import { customRequest } from 'helpers/http';
 
 export const useFetchData = (
   url: string,
-  type: "post" | "get",
+  type: 'post' | 'get',
   defaultQuery?: any,
   disableReq?: any,
-  errorCallBack?: () => void
+  errorCallBack?: () => void,
 ) => {
   const [data, setData] = useState<any>();
   const [reqQuery, setReqQuery] = useState<any>(defaultQuery);

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

@@ -1,5 +1,5 @@
-import { useMemo, useCallback } from "react";
-import { useLocation } from "react-router-dom";
+import { useMemo, useCallback } from 'react';
+import { useLocation } from 'react-router-dom';
 import {
   CrudFilters,
   HttpError,
@@ -10,18 +10,18 @@ import {
   useUpdate,
   useApiUrl,
   BaseRecord,
-} from "@refinedev/core";
-import { useTable, useImport } from "@refinedev/antd";
-import dayjs from "dayjs";
-import { useBatchOperations } from "./useBatchOperations";
-import { ListPageConfig, UseListPageStateResult } from "./types";
+} from '@refinedev/core';
+import { useTable, useImport } from '@refinedev/antd';
+import dayjs from 'dayjs';
+import { useBatchOperations } from './useBatchOperations';
+import { ListPageConfig, UseListPageStateResult } from './types';
 import {
   ModelType,
   FieldDataType,
   produceModel,
   getColumns,
   tableSearchBar,
-} from "@gadmin2n/react-common";
+} from '@gadmin2n/react-common';
 
 export interface UseListPageStateConfig {
   resourceName: string;
@@ -29,16 +29,16 @@ export interface UseListPageStateConfig {
   rawModel: ModelType;
   /** Model customizations */
   modelOverrides?: Record<string, Partial<FieldDataType>>;
-  tableConfig: ListPageConfig["tableConfig"];
+  tableConfig: ListPageConfig['tableConfig'];
   prismaSelect?: any;
-  modelsMap: ListPageConfig["modelsMap"];
-  modelsEnum: ListPageConfig["modelsEnum"];
+  modelsMap: ListPageConfig['modelsMap'];
+  modelsEnum: ListPageConfig['modelsEnum'];
   /** API URL, will use useApiUrl() if not provided */
   apiUrl?: string;
   /** Function to get request headers for batch operations */
   requestHeaders?: () => Record<string, string>;
   /** Hook to get relation select props */
-  useRelation?: (modelsMap: ListPageConfig["modelsMap"]) => Record<string, any>;
+  useRelation?: (modelsMap: ListPageConfig['modelsMap']) => Record<string, any>;
   /** Search fields configuration */
   searchFields?: {
     keyword?: string;
@@ -60,7 +60,7 @@ export function useListPageState<T extends BaseRecord = any>({
   apiUrl: customApiUrl,
   requestHeaders,
   useRelation,
-  searchFields = { keyword: "q", dateRange: ["createdAt"] },
+  searchFields = { keyword: 'q', dateRange: ['createdAt'] },
 }: UseListPageStateConfig): UseListPageStateResult {
   const t = useTranslate();
   const defaultApiUrl = useApiUrl();
@@ -87,7 +87,7 @@ export function useListPageState<T extends BaseRecord = any>({
   // Get search bar configuration
   const { placeholder: searchPlaceholder, getSearchFilters } = useMemo(
     () => tableSearchBar(tableConfig.toolbar.searchBar, rawModel),
-    [tableConfig.toolbar.searchBar, rawModel]
+    [tableConfig.toolbar.searchBar, rawModel],
   );
 
   // Table hook
@@ -106,7 +106,7 @@ export function useListPageState<T extends BaseRecord = any>({
     },
     filters: {
       initial: parsedFilters,
-      defaultBehavior: "merge",
+      defaultBehavior: 'merge',
     },
     sorters: {
       initial: parsedSorter,
@@ -114,59 +114,59 @@ export function useListPageState<T extends BaseRecord = any>({
   });
 
   // Initialize search form values
-  const keywordField = searchFields.keyword || "q";
-  const dateRangeField = searchFields.dateRange?.[0] || "createdAt";
+  const keywordField = searchFields.keyword || 'q';
+  const dateRangeField = searchFields.dateRange?.[0] || 'createdAt';
 
   searchFormProps.initialValues = useMemo(
     () => ({
       [keywordField]: parsedFilters.find((f: any) => f.field === keywordField)
         ?.value,
       [dateRangeField]: parsedFilters.find(
-        (f: any) => f.field === dateRangeField && f.operator === "gte"
+        (f: any) => f.field === dateRangeField && f.operator === 'gte',
       )
         ? [
             dayjs(
               parsedFilters.find(
-                (f: any) => f.field === dateRangeField && f.operator === "gte"
-              )?.value
+                (f: any) => f.field === dateRangeField && f.operator === 'gte',
+              )?.value,
             ),
             dayjs(
               parsedFilters.find(
-                (f: any) => f.field === dateRangeField && f.operator === "lte"
-              )?.value
+                (f: any) => f.field === dateRangeField && f.operator === 'lte',
+              )?.value,
             ),
           ]
         : [undefined, undefined],
     }),
-    [parsedFilters, keywordField, dateRangeField]
+    [parsedFilters, keywordField, dateRangeField],
   );
 
   // Search form submit handler
   searchFormProps.onFinish = useCallback(
     (values: any) => {
       const fs: CrudFilters = [];
-      const keyword = (values[keywordField] || "").trim();
+      const keyword = (values[keywordField] || '').trim();
       const dateRange = values[dateRangeField];
 
       if (dateRange && dateRange[0]) {
         fs.push(
           {
             field: dateRangeField,
-            operator: "gte",
+            operator: 'gte',
             value: dateRange[0]?.toISOString?.(),
           },
           {
             field: dateRangeField,
-            operator: "lte",
+            operator: 'lte',
             value: dateRange[1]?.toISOString?.(),
-          }
+          },
         );
       }
 
       if (keyword) {
         fs.push({
           field: keywordField,
-          operator: "eq",
+          operator: 'eq',
           value: keyword,
         });
       }
@@ -177,12 +177,12 @@ export function useListPageState<T extends BaseRecord = any>({
           [],
           fs,
           prevFilters.filter(
-            (item: any) => ![keywordField, dateRangeField].includes(item.field)
-          )
-        )
+            (item: any) => ![keywordField, dateRangeField].includes(item.field),
+          ),
+        ),
       );
     },
-    [keywordField, dateRangeField, setCurrent, setFilters]
+    [keywordField, dateRangeField, setCurrent, setFilters],
   );
 
   // Batch operations
@@ -227,7 +227,7 @@ export function useListPageState<T extends BaseRecord = any>({
         values,
       });
     },
-    [updateRow, resourceName]
+    [updateRow, resourceName],
   );
 
   // Get relation select props
@@ -257,7 +257,7 @@ export function useListPageState<T extends BaseRecord = any>({
       apiUrl,
       relationSelectProps,
       searchPlaceholder,
-    ]
+    ],
   );
 
   return {

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

@@ -1,6 +1,6 @@
-import { useEffect, useState } from "react";
+import { useEffect, useState } from 'react';
 
-import { useFetchData } from "./useFetchData";
+import { useFetchData } from './useFetchData';
 
 export interface RoleOption {
   label: string;
@@ -8,14 +8,18 @@ export interface RoleOption {
 }
 
 export const useRoles = () => {
-  const { data: rolesData, loading } = useFetchData("role/findMany", "post", {});
+  const { data: rolesData, loading } = useFetchData(
+    'role/findMany',
+    'post',
+    {},
+  );
   const [roleOptions, setRoleOptions] = useState<RoleOption[]>([]);
 
   useEffect(() => {
     if (rolesData?.data) {
       const roles = Array.isArray(rolesData.data) ? rolesData.data : [];
       const options = roles.map((role: any) => ({
-        label: `${role.name} (${role.description || ""})`,
+        label: `${role.name} (${role.description || ''})`,
         value: role.name,
       }));
       setRoleOptions(options);

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

@@ -1,4 +1,4 @@
-import { useState, useCallback } from "react";
+import { useState, useCallback } from 'react';
 
 export interface UseRowSelectionResult {
   selectedRowKeys: React.Key[];