@gadmin2n/schematics 0.0.68 → 0.0.70

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

@@ -1,11 +1,11 @@
-import { useMemo, useState, useEffect, useRef, useCallback } from "react";
-import { customRequest } from "helpers/login";
-import type { Role } from "types/role";
+import { useMemo, useState, useEffect, useRef, useCallback } from 'react';
+import { customRequest } from 'helpers/http';
+import type { Role } from 'types/role';
 
-const RoleCacheKey = "oiterproles";
-const PagesCacheKey = "oiterpages";
-const RolePagesCacheKey = "oiterprolepages";
-const RolesDataCacheKey = "oiterprolesdatacache";
+const RoleCacheKey = 'oiterproles';
+const PagesCacheKey = 'oiterpages';
+const RolePagesCacheKey = 'oiterprolepages';
+const RolesDataCacheKey = 'oiterprolesdatacache';
 
 /**
  * Base Hook: User Page Access Data
@@ -84,30 +84,30 @@ function writeCache(key: string, value: unknown): void {
 export const useUserPageAccess = (): UseUserPageAccessResult => {
   // Role names — initialise from cache so first render is non-empty
   const [roleNames, setRoleNames] = useState<string[]>(
-    () => readCache<string[]>(RoleCacheKey) ?? []
+    () => readCache<string[]>(RoleCacheKey) ?? [],
   );
   // isRoleLoading only stays true while we wait for the live /userinfo response
   const [isRoleLoading, setIsRoleLoading] = useState(true);
 
   // Data states — initialise from cache for instant first render
-  const [rolesData, setRolesData] = useState<Role[] | null>(
-    () => readCache<Role[]>(RolesDataCacheKey)
+  const [rolesData, setRolesData] = useState<Role[] | null>(() =>
+    readCache<Role[]>(RolesDataCacheKey),
   );
-  const [rolePagesData, setRolePagesData] = useState<RolePage[] | null>(
-    () => readCache<RolePage[]>(RolePagesCacheKey)
+  const [rolePagesData, setRolePagesData] = useState<RolePage[] | null>(() =>
+    readCache<RolePage[]>(RolePagesCacheKey),
   );
-  const [pagesData, setPagesData] = useState<Page[] | null>(
-    () => readCache<Page[]>(PagesCacheKey)
+  const [pagesData, setPagesData] = useState<Page[] | null>(() =>
+    readCache<Page[]>(PagesCacheKey),
   );
 
   // Track previous roles to detect changes
-  const prevRolesRef = useRef<string>("");
+  const prevRolesRef = useRef<string>('');
 
   // Function to update roles in state and sessionStorage
   const updateRoles = useCallback((newRoles: string[]) => {
     const rolesKey = JSON.stringify(newRoles.sort());
     if (rolesKey !== prevRolesRef.current) {
-      console.log("[useUserPageAccess] Roles changed:", newRoles);
+      console.log('[useUserPageAccess] Roles changed:', newRoles);
       prevRolesRef.current = rolesKey;
       setRoleNames(newRoles);
       writeCache(RoleCacheKey, newRoles);
@@ -118,13 +118,16 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
   useEffect(() => {
     const fetchRolesFromBackend = async () => {
       try {
-        const res = await customRequest<any>("userinfo", "GET", {});
+        const res = await customRequest<any>('userinfo', 'GET', {});
         const roles = res?.configPerms?.roles;
         if (roles && Array.isArray(roles)) {
           updateRoles(roles as string[]);
         }
       } catch (error) {
-        console.error("[useUserPageAccess] Failed to fetch roles from backend:", error);
+        console.error(
+          '[useUserPageAccess] Failed to fetch roles from backend:',
+          error,
+        );
         // Fallback to sessionStorage if backend request fails
         try {
           const cached = readCache<string[]>(RoleCacheKey);
@@ -132,7 +135,7 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
             updateRoles(cached);
           }
         } catch (e) {
-          console.error("[useUserPageAccess] Failed to parse cached roles:", e);
+          console.error('[useUserPageAccess] Failed to parse cached roles:', e);
         }
       } finally {
         setIsRoleLoading(false);
@@ -146,21 +149,24 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
   useEffect(() => {
     const fetchPages = async () => {
       try {
-        const res = await customRequest<any>("page/findMany", "post", {});
+        const res = await customRequest<any>('page/findMany', 'post', {});
         const pages = res?.data as Page[];
         // Keep existing reference if page IDs haven't changed — prevents
         // downstream memos (accessiblePageIds, dynamicResources, allResources)
         // from rebuilding and giving Refine a new resources prop.
-        setPagesData(prev => {
-          if (prev && prev.length === pages.length &&
-              prev.every((p, i) => p.id === pages[i].id)) {
+        setPagesData((prev) => {
+          if (
+            prev &&
+            prev.length === pages.length &&
+            prev.every((p, i) => p.id === pages[i].id)
+          ) {
             return prev;
           }
           writeCache(PagesCacheKey, pages);
           return pages;
         });
       } catch (error) {
-        console.error("[useUserPageAccess] Failed to fetch pages:", error);
+        console.error('[useUserPageAccess] Failed to fetch pages:', error);
       }
     };
     fetchPages();
@@ -179,21 +185,21 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
           where: { name: { in: roleNames } },
           select: { id: true, name: true },
         };
-        const res = await customRequest<any>("role/findMany", "post", query);
+        const res = await customRequest<any>('role/findMany', 'post', query);
         const roles = res?.data as Role[];
         setRolesData(roles);
         writeCache(RolesDataCacheKey, roles);
       } catch (error) {
-        console.error("[useUserPageAccess] Failed to fetch roles:", error);
+        console.error('[useUserPageAccess] Failed to fetch roles:', error);
       }
     };
     fetchRoles();
-  }, [roleNames.join(",")]);
+  }, [roleNames.join(',')]);
 
   // Calculate roleIds
   const roleIds = useMemo(() => {
     if (!rolesData) return [];
-    return rolesData.map(role => role.id);
+    return rolesData.map((role) => role.id);
   }, [rolesData]);
 
   // Step 4: Fetch role-page relationships when roleIds are available
@@ -206,24 +212,31 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
     const fetchRolePages = async () => {
       try {
         const query = { where: { roleId: { in: roleIds } } };
-        const res = await customRequest<any>("rolePages/findMany", "post", query);
+        const res = await customRequest<any>(
+          'rolePages/findMany',
+          'post',
+          query,
+        );
         const rolePages = res?.data as RolePage[];
         // Same stable-reference trick: keep existing ref if content unchanged.
-        setRolePagesData(prev => {
-          if (prev && prev.length === rolePages.length &&
-              prev.every((rp, i) => rp.id === rolePages[i].id)) {
+        setRolePagesData((prev) => {
+          if (
+            prev &&
+            prev.length === rolePages.length &&
+            prev.every((rp, i) => rp.id === rolePages[i].id)
+          ) {
             return prev;
           }
           writeCache(RolePagesCacheKey, rolePages);
           return rolePages;
         });
       } catch (error) {
-        console.error("[useUserPageAccess] Failed to fetch rolePages:", error);
+        console.error('[useUserPageAccess] Failed to fetch rolePages:', error);
       }
     };
 
     fetchRolePages();
-  }, [roleIds.join(",")]);
+  }, [roleIds.join(',')]);
 
   // Build page maps
   const { pageMap, pageCodeMap } = useMemo(() => {
@@ -231,7 +244,7 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
     const codeMap = new Map<string, Page>();
 
     if (pagesData) {
-      pagesData.forEach(page => {
+      pagesData.forEach((page) => {
         idMap.set(page.id, page);
         codeMap.set(page.code, page);
       });
@@ -252,7 +265,7 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
     }
 
     // Add directly accessible pages
-    rolePagesData.forEach(rolePage => {
+    rolePagesData.forEach((rolePage) => {
       ids.add(rolePage.pageId);
     });
 
@@ -272,13 +285,13 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
 
     const originalIds = Array.from(ids);
     const visited = new Set<number>();
-    originalIds.forEach(pageId => {
+    originalIds.forEach((pageId) => {
       addAncestorPages(pageId, visited);
     });
 
     // Keep existing reference if IDs haven't changed
     const prev = prevAccessiblePageIdsRef.current;
-    if (prev.size === ids.size && Array.from(ids).every(id => prev.has(id))) {
+    if (prev.size === ids.size && Array.from(ids).every((id) => prev.has(id))) {
       return prev;
     }
 
@@ -290,7 +303,7 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
   const accessiblePageCodes = useMemo(() => {
     const codes = new Set<string>();
 
-    accessiblePageIds.forEach(pageId => {
+    accessiblePageIds.forEach((pageId) => {
       const page = pageMap.get(pageId);
       if (page) {
         codes.add(page.code);
@@ -312,7 +325,7 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
   const hasCache = useMemo(
     () => !!(readCache(PagesCacheKey) && readCache(RolePagesCacheKey)),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
+    [],
   );
 
   const isLoading = useMemo(() => {
@@ -320,7 +333,8 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
     if (hasCache && pagesData && rolePagesData) return false;
     if (isRoleLoading) return true;
     if (!pagesData) return true;
-    if (roleNames.length > 0 && roleIds.length > 0 && !rolePagesData) return true;
+    if (roleNames.length > 0 && roleIds.length > 0 && !rolePagesData)
+      return true;
     return false;
   }, [isRoleLoading, pagesData, roleNames, roleIds, rolePagesData, hasCache]);
 

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

@@ -1,20 +1,20 @@
-import i18n from "i18next";
-import { initReactI18next } from "react-i18next";
-import detector from "i18next-browser-languagedetector";
-import en from "./locales/en/common.json";
-import zh_CN from "./locales/zh_CN/common.json";
+import i18n from 'i18next';
+import { initReactI18next } from 'react-i18next';
+import detector from 'i18next-browser-languagedetector';
+import en from './locales/en/common.json';
+import zh_CN from './locales/zh_CN/common.json';
 
 i18n
   .use(detector)
   .use(initReactI18next)
   .init({
-    supportedLngs: ["en", "zh_CN"],
+    supportedLngs: ['en', 'zh_CN'],
     resources: {
       en: { common: en },
       zh_CN: { common: zh_CN },
     },
-    defaultNS: "common",
-    fallbackLng: ["en", "zh_CN"],
+    defaultNS: 'common',
+    fallbackLng: ['en', 'zh_CN'],
     react: {
       useSuspense: false,
     },

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

@@ -6,6 +6,13 @@ import './i18n';
 
 import { checkLogin, login } from './helpers/login';
 
+// 屏蔽 ECharts 在 RadarChart 多 Y 轴场景下的 alignTicks 噪音警告
+const _warn = console.warn.bind(console);
+console.warn = (...args: any[]) => {
+  if (typeof args[0] === 'string' && args[0].includes('alignTicks')) return;
+  _warn(...args);
+};
+
 if (!checkLogin()) {
   login();
 } else {
@@ -13,8 +20,8 @@ if (!checkLogin()) {
   const root = createRoot(container);
 
   root.render(
-    <React.Suspense fallback='loading'>
+    <React.Suspense fallback="loading">
       <App />
-    </React.Suspense>
+    </React.Suspense>,
   );
 }

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/locales/en/common.json

@@ -115,6 +115,18 @@
       "fields":{
         "timestamp": "OperateTime"
       }
+    },
+    "iTActivityDay": {
+      "fields": {
+        "tags": "标签"
+      }
+    },
+    "event": {
+      "fields": {
+        "eventType": "eventType",
+        "city": "City",
+        "country": "Country"
+      }
     }
   },
   "table": {
@@ -124,5 +136,186 @@
   },
   "form": {
     "uploadPlaceholder": "Drag & drop a file in this area"
+  },
+  "canvas": {
+    "componentLib": "Components",
+    "backToList": "Back to list",
+    "save": "Save",
+    "saveDirty": "Save •",
+    "preview": "Preview",
+    "publish": "Publish",
+    "published": "Published ✓",
+    "unpublish": "Unpublish",
+    "unpublishConfirm": "Unpublish this page? It will be removed from the navigation menu.",
+    "unpublishSuccess": "Unpublished",
+    "unpublishFailed": "Unpublish failed",
+    "clickToRename": "Click to rename",
+    "emptyHint": "Drag components from the library",
+    "exitPreview": "Exit Preview",
+    "config": "Configure",
+    "editCode": "Edit Code",
+    "duplicate": "Duplicate",
+    "delete": "Delete",
+    "custom": "Custom",
+    "customAction": "Custom Action",
+    "customPlaceholder": "Describe what you want to do with this component",
+    "components": {
+      "NumCard": "Metric Card",
+      "BarChart": "Bar Chart",
+      "LineChart": "Line Chart",
+      "PieChart": "Pie Chart",
+      "RadarChart": "Radar Chart",
+      "TreemapChart": "Treemap",
+      "Table": "Table",
+      "WorldMap": "World Map"
+    },
+    "variants": {
+      "default": "Default",
+      "bar": "Bar",
+      "stackBar": "Stacked Bar",
+      "stackBarPercent": "Percent Stack",
+      "pie": "Pie",
+      "ring": "Ring",
+      "sunburst": "Sunburst",
+      "heatmap": "Heatmap",
+      "demo": "Demo",
+      "card-grid": "Card Grid",
+      "inline": "Inline",
+      "inline-right": "Inline Right"
+    },
+    "dataSource": {
+      "api": "Data Source (API)",
+      "sql": "Data Source (SQL)",
+      "apiPlaceholder": "Describe the data, e.g.: daily active users over last 14 days",
+      "sqlPlaceholder": "Describe the data, e.g.: revenue comparison over last 30 days"
+    },
+    "dataSourceModal": {
+      "title": "Data Source",
+      "ok": "OK",
+      "cancel": "Cancel",
+      "add": "Add",
+      "descLabel": "Data description:",
+      "descPlaceholder": "Describe the data you need, e.g.: query daily active users from t_daily_stats",
+      "includeChart": "Include line chart",
+      "chartRange": "Range:",
+      "chartRangePlaceholder": "e.g.: Last 7 days, Last 30 days",
+      "includeComparisons": "Include comparisons",
+      "comparedTo": "vs",
+      "comparedToPlaceholder": "Enter comparison target",
+      "columns": "Columns",
+      "columnPlaceholder": "Column name",
+      "pagination": "Pagination",
+      "pageSize": "Page size",
+      "pageSizeUnit": "rows",
+      "barDirection": "Direction",
+      "barVertical": "Vertical",
+      "barHorizontal": "Horizontal",
+      "showGrid": "Show grid",
+      "showLabel": "Show labels",
+      "showLegend": "Show legend",
+      "showAxis": "Show axis",
+      "showDots": "Show dots",
+      "showDotsLabel": "Show dot values",
+      "stacked": "Stacked",
+      "area": "Area fill",
+      "smooth": "Smooth curve",
+      "dimensionCount": "Dimensions",
+      "dimensionCountPlaceholder": "e.g.: 5",
+      "tablePlaceholder": "Describe the data, e.g.: query last 30 days from t_daily_report",
+      "barPlaceholder": "Describe the data, e.g.: query daily device counts by type from t_daily_stats",
+      "linePlaceholder": "Describe the data, e.g.: query daily metric trends from t_daily_stats",
+      "radarPlaceholder": "Describe the data, e.g.: query employee skill scores from t_employee_skills"
+    },
+    "menu": {
+      "hideLegend": "Hide Legend",
+      "showLegend": "Show Legend",
+      "editTitle": "Edit Title",
+      "addTitle": "Add Title",
+      "editChartTitle": "Edit Chart Title",
+      "addChartTitle": "Add Chart Title",
+      "titlePlaceholder": "Enter title (leave empty to remove)",
+      "removeComparisons": "Remove Comparisons",
+      "addComparisons": "Add Comparisons",
+      "removeChart": "Remove Chart",
+      "addChart": "Add Chart",
+      "changePageSize": "Change Page Size",
+      "removePagination": "Remove Pagination",
+      "addPagination": "Add Pagination",
+      "direction": "Direction",
+      "vertical": "Vertical",
+      "horizontal": "Horizontal",
+      "hideGrid": "Hide Grid",
+      "showGrid": "Show Grid",
+      "hideLabel": "Hide Labels",
+      "showLabel": "Show Labels",
+      "switchVariant": "Switch Style",
+      "pie": "Pie",
+      "ring": "Ring",
+      "topN": "Top N Items",
+      "hideAxis": "Hide Axis",
+      "showAxis": "Show Axis",
+      "hideDots": "Hide Dots",
+      "showDots": "Show Dots",
+      "hideDotsLabel": "Hide Dot Values",
+      "showDotsLabel": "Show Dot Values",
+      "disableStacked": "Disable Stacking",
+      "enableStacked": "Enable Stacking",
+      "disableArea": "Disable Area Fill",
+      "enableArea": "Enable Area Fill",
+      "disableSmooth": "Disable Smooth",
+      "enableSmooth": "Enable Smooth"
+    },
+    "list": {
+      "title": "My Canvas",
+      "create": "New Canvas",
+      "published": "Published",
+      "unpublished": "Unpublished",
+      "rename": "Rename",
+      "renameTitle": "Rename Canvas",
+      "renamePlaceholder": "Enter new name",
+      "renameEmpty": "Name cannot be empty",
+      "renameDuplicate": "Name already exists",
+      "renamed": "Renamed",
+      "renamePublishedWarning": "This Canvas is published. Renaming will also update the page name in the navigation.",
+      "renameFailed": "Rename failed",
+      "deleteBtn": "Delete",
+      "deletePublishedConfirm": "This Canvas is published. Deleting it will also remove the published page. Continue?",
+      "deleteConfirm": "Delete this Canvas?",
+      "deleted": "Deleted",
+      "deleteFailed": "Delete failed",
+      "loadFailed": "Failed to load Canvas list",
+      "createFailed": "Failed to create Canvas",
+      "ok": "OK",
+      "cancel": "Cancel"
+    },
+    "publishModal": {
+      "title": "Publish Canvas",
+      "updateBtn": "Update Page",
+      "publishBtn": "Publish",
+      "cancel": "Cancel",
+      "overwriteOption": "Update existing page",
+      "newPageOption": "Publish as new page",
+      "overwriteDesc": "Replace the published page content with the current Canvas.",
+      "pageName": "Page Name",
+      "pageNameRequired": "Please enter a page name",
+      "pageNamePlaceholder": "e.g.: Game Dashboard",
+      "parentPage": "Parent Page",
+      "parentPageRequired": "Please select a parent page",
+      "parentPagePlaceholder": "Select parent page",
+      "description": "Description (optional)",
+      "descriptionPlaceholder": "e.g.: Data from /api/game, needs loading state",
+      "rootPage": "Root (top level)",
+      "success": "Published successfully",
+      "error": "Publish failed",
+      "agentSent": "Publish request sent, AI agent is processing...",
+      "loadPagesFailed": "Failed to load page list"
+    },
+    "edit": {
+      "saved": "Saved",
+      "saveFailed": "Save failed",
+      "renamed": "Renamed",
+      "renameDuplicate": "Name already exists",
+      "renameFailed": "Rename failed"
+    }
   }
 }