@gadmin2n/schematics 0.0.111 → 0.0.113

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/lib/taihu.ts

@@ -31,6 +31,12 @@ export default class TaiHuId {
   static config = {
     clientId: process.env.TAIHU_ODC_CLIENT_ID,
     clientSecret: process.env.TAIHU_ODC_APP_TOKEN || 'gadmin-default-secret',
+    // JWT secret 与 portal 共享，独立于太湖 client_secret；
+    // 分支只用它 verify portal 签发的 token，不 sign。
+    jwtSecret:
+      process.env.GADMIN_JWT_SECRET ||
+      process.env.TAIHU_ODC_APP_TOKEN ||
+      'gadmin-default-secret',
     apiBase: process.env.TAIHU_BASE,
     callback: process.env.TAIHU_CALLBACK,
     logout: process.env.TAIHU_LOGOUT,
@@ -138,7 +144,7 @@ export default class TaiHuId {
     return new Promise<string>((resolve, reject) => {
       jwt.sign(
         payload,
-        TaiHuId.config.clientSecret,
+        TaiHuId.config.jwtSecret,
         { expiresIn },
         (err, token) => {
           if (err) {
@@ -163,7 +169,7 @@ export default class TaiHuId {
         return;
       }
 
-      jwt.verify(token, TaiHuId.config.clientSecret, {}, (err, decoded) => {
+      jwt.verify(token, TaiHuId.config.jwtSecret, {}, (err, decoded) => {
         if (err) {
           reject(err);
           return;

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

@@ -1,29 +1,19 @@
 import { AuthBindings } from '@refinedev/core';
 import { getApiUrl } from 'config/http';
-import { requestHeaders, GAdminTokenName, checkLogin } from 'helpers';
+import { requestHeaders, GAdminTokenName } from 'helpers';
+import { login as taihuLogin, logout as taihuLogout } from './helpers/login';
 import Cookies from 'js-cookie';
 import memoize from 'lodash.memoize';
 
-const getUserInfoOnce = memoize(async () => {
+export const getUserInfoOnce = memoize(async () => {
   const headers = requestHeaders();
-
-  if (import.meta.env.DEV) {
-    console.log('[getUserInfoOnce] Fetching /userinfo');
-    console.log('[getUserInfoOnce] Request headers:', headers);
-    console.log('[getUserInfoOnce] Hostname:', window.location.hostname);
-  }
-
   const res = await fetch(`${getApiUrl()}/userinfo`, { headers });
 
   if (!res.ok) {
-    console.error(`[getUserInfoOnce] Got ${res.status} response`);
-    if (res.status === 401) {
-      console.error('[getUserInfoOnce] 401 - Missing or invalid credentials');
-    }
+    throw new Error(`userinfo ${res.status}`);
   }
 
-  const user = await res.json();
-  return user;
+  return res.json();
 });
 
 export const authProvider: AuthBindings = {
@@ -107,9 +97,12 @@ export const authProvider: AuthBindings = {
   },
   logout: async () => {
     localStorage.removeItem('email');
+    // taihuLogout() 通过 window.location.href 跳转后端 /logout，
+    // 后端清 cookie 后再 302 到太湖 IDP 退出 SSO，最后回到首页重新触发 OAuth。
+    // 因此这里不需要再返回 redirectTo——页面已经在跳走了。
+    taihuLogout();
     return {
       success: true,
-      redirectTo: '/',
     };
   },
   onError: async (error) => {
@@ -117,19 +110,25 @@ export const authProvider: AuthBindings = {
     return { error };
   },
   check: async () => {
-    // checkLogin() 会处理：URL 参数中的 token 写入 cookie、cookie 检查
-    if (checkLogin()) {
+    try {
+      await getUserInfoOnce();
+      sessionStorage.removeItem('gadmin-relogin-inflight');
       return { authenticated: true };
+    } catch {
+      // 清掉本地缓存，让 helpers/login.ts 的 login() 重新走一遍 OAuth。
+      // 不要 redirectTo: '/login' —— 前端没有这个路由，会进死路。
+      // 防重入：避免 401 拦截器和 check() 同时跳登录。
+      if (!sessionStorage.getItem('gadmin-relogin-inflight')) {
+        sessionStorage.setItem('gadmin-relogin-inflight', '1');
+        getUserInfoOnce.cache.clear?.();
+        taihuLogin();
+      }
+      return {
+        authenticated: false,
+        logout: true,
+        error: { message: 'Check failed', name: 'Not authenticated' },
+      };
     }
-
-    return {
-      authenticated: false,
-      redirectTo: '/login',
-      error: {
-        message: 'Check failed',
-        name: 'Not authenticated',
-      },
-    };
   },
   getPermissions: async () => ['admin'],
   getIdentity: async () => {

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

@@ -42,30 +42,6 @@ export function isWoaDomain(): boolean {
   return hostname === 'woa.com' || hostname.endsWith('.woa.com');
 }
 
-/**
- * 通过cookie检测是否登录及参数转cookie(for dev)
- */
-export function checkLogin(): boolean {
-  // 优先处理 URL 参数中的 token，确保 token 被写入 cookie（任何域名下都需要）
-  const params = getUrlParams();
-  const gadminToken = params[GAdminTokenName];
-  if (gadminToken) {
-    setLoginCookie({ gadminToken });
-    return true;
-  }
-
-  if (Cookies.get(GAdminTokenName)) {
-    return true;
-  }
-
-  // woa.com 域名下 SmartGate 保证进入页面时已有登录态，无需跳转 Taihu
-  if (isWoaDomain()) {
-    return true;
-  }
-
-  return false;
-}
-
 export function setLoginCookie({ gadminToken }: Required<LoginCookie>) {
   const expires = 1; // 本地登录态缓存1天
   Cookies.set(GAdminTokenName, gadminToken, { expires });

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

@@ -1,5 +1,6 @@
 import { useMemo, useState, useEffect, useRef, useCallback } from 'react';
 import { customRequest } from 'helpers/http';
+import { getUserInfoOnce } from 'authProvider';
 import type { Role } from 'types/role';
 
 const RoleCacheKey = 'oiterproles';
@@ -82,12 +83,12 @@ function writeCache(key: string, value: unknown): void {
 }
 
 export const useUserPageAccess = (): UseUserPageAccessResult => {
+  const [isIdentityLoading, setIsIdentityLoading] = useState(true);
+
   // Role names — initialise from cache so first render is non-empty
   const [roleNames, setRoleNames] = useState<string[]>(
     () => 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>(() =>
@@ -114,35 +115,23 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
     }
   }, []);
 
-  // Step 1: Fetch roles directly from backend to ensure fresh data
+  // Step 1: 从 getUserInfoOnce 提取角色（复用缓存，不额外发请求）
   useEffect(() => {
-    const fetchRolesFromBackend = async () => {
-      try {
-        const res = await customRequest<any>('userinfo', 'GET', {});
-        const roles = res?.configPerms?.roles;
+    getUserInfoOnce()
+      .then((identity) => {
+        const roles = identity?.configPerms?.roles;
         if (roles && Array.isArray(roles)) {
           updateRoles(roles as string[]);
-        }
-      } catch (error) {
-        console.error(
-          '[useUserPageAccess] Failed to fetch roles from backend:',
-          error,
-        );
-        // Fallback to sessionStorage if backend request fails
-        try {
+        } else {
           const cached = readCache<string[]>(RoleCacheKey);
-          if (cached) {
-            updateRoles(cached);
-          }
-        } catch (e) {
-          console.error('[useUserPageAccess] Failed to parse cached roles:', e);
+          if (cached) updateRoles(cached);
         }
-      } finally {
-        setIsRoleLoading(false);
-      }
-    };
-
-    fetchRolesFromBackend();
+      })
+      .catch(() => {
+        const cached = readCache<string[]>(RoleCacheKey);
+        if (cached) updateRoles(cached);
+      })
+      .finally(() => setIsIdentityLoading(false));
   }, [updateRoles]);
 
   // Step 2: Fetch all page definitions
@@ -331,7 +320,7 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
   const isLoading = useMemo(() => {
     // If cache was available on mount, never block rendering
     if (hasCache && pagesData && rolePagesData) return false;
-    if (isRoleLoading) return true;
+    if (isIdentityLoading) return true;
     if (!pagesData) return true;
     // 等待 /role/findMany 返回（roleNames 已拿到但 rolesData 还在路上）
     if (roleNames.length > 0 && !rolesData) return true;
@@ -339,7 +328,7 @@ export const useUserPageAccess = (): UseUserPageAccessResult => {
     if (roleIds.length > 0 && !rolePagesData) return true;
     return false;
   }, [
-    isRoleLoading,
+    isIdentityLoading,
     pagesData,
     roleNames,
     rolesData,

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

@@ -4,7 +4,7 @@ import { createRoot } from 'react-dom/client';
 import App from './App';
 import './i18n';
 
-import { checkLogin, login } from './helpers/login';
+import { GAdminTokenName, setLoginCookie, getUrlParams } from './helpers/login';
 
 // 屏蔽 ECharts 在 RadarChart 多 Y 轴场景下的 alignTicks 噪音警告
 const _warn = console.warn.bind(console);
@@ -13,15 +13,24 @@ console.warn = (...args: any[]) => {
   _warn(...args);
 };
 
-if (!checkLogin()) {
-  login();
-} else {
-  const container = document.getElementById('root') as HTMLElement;
-  const root = createRoot(container);
-
-  root.render(
-    <React.Suspense fallback="loading">
-      <App />
-    </React.Suspense>,
-  );
+// DEV 模式下支持 URL 参数传 token（真跨 host 部署用，例如 portal 子域跳回到分支独立域名）。
+// 同 host 部署时 portal 已通过 httpOnly cookie 完成认证，此处 setLoginCookie 写入会被
+// 浏览器静默拒绝（RFC 6265 §5.3：JS 不可覆盖同名 httpOnly cookie），属于 no-op，无副作用。
+if (import.meta.env.DEV) {
+  const params = getUrlParams();
+  const gadminToken = params[GAdminTokenName];
+  if (gadminToken) setLoginCookie({ gadminToken });
 }
+
+// 不再用 `Cookies.get(GAdminTokenName)` 探测：portal 现在用 httpOnly cookie，js 端永远读不到，
+// 否则会陷入"探测失败 → login → callback → 探测仍失败"的死循环。
+// 认证统一交给 authProvider.check()——发 /api/userinfo（同源会自动带 httpOnly cookie），
+// 401 时由 check() 内部的防重入逻辑触发 taihuLogin。
+const container = document.getElementById('root') as HTMLElement;
+const root = createRoot(container);
+
+root.render(
+  <React.Suspense fallback="loading">
+    <App />
+  </React.Suspense>,
+);

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

@@ -159,7 +159,7 @@
     "emptyHint": "Drag components from the library",
     "exitPreview": "Exit Preview",
     "config": "Configure",
-    "configCharts": "Configure Charts & Order",
+    "configCharts": "Configure switchable chart types",
     "editCode": "Edit Code",
     "duplicate": "Duplicate",
     "delete": "Delete",
@@ -245,14 +245,14 @@
       "changePageSize": "Change Page Size",
       "removePagination": "Remove Pagination",
       "addPagination": "Add Pagination",
-      "direction": "Direction",
+      "direction": "Chart Direction",
       "vertical": "Vertical",
       "horizontal": "Horizontal",
       "hideGrid": "Hide Grid",
       "showGrid": "Show Grid",
       "hideLabel": "Hide Labels",
       "showLabel": "Show Labels",
-      "switchVariant": "Switch Style",
+      "switchVariant": "Switch Display Style",
       "pie": "Pie",
       "ring": "Ring",
       "topN": "Top N Items",
@@ -262,22 +262,23 @@
       "showDots": "Show Dots",
       "hideDotsLabel": "Hide Dot Values",
       "showDotsLabel": "Show Dot Values",
-      "disableStacked": "Disable Stacking",
-      "enableStacked": "Enable Stacking",
-      "disablePercent": "Disable Percent",
-      "enablePercent": "Enable Percent",
+      "disableStacked": "Disable Data Stacking",
+      "enableStacked": "Enable Data Stacking",
+      "disablePercent": "Disable Percent Stacking",
+      "enablePercent": "Enable Percent Stacking",
       "disableArea": "Disable Area Fill",
       "enableArea": "Enable Area Fill",
       "disableSmooth": "Disable Smooth",
       "enableSmooth": "Enable Smooth",
-      "switchTo": "Switch to",
+      "switchTo": "Switch Chart Type",
       "showDownload": "Show Download",
       "hideDownload": "Hide Download",
       "enableSorting": "Enable Sorting",
       "disableSorting": "Disable Sorting",
       "enableFiltering": "Enable Filtering",
       "disableFiltering": "Disable Filtering",
-      "configColumns": "Configure Columns"
+      "configColumns": "Configure Columns",
+      "visibilityGroup": "Display Elements"
     },
     "modal": {
       "columnConfigTitle": "Column Settings",

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

@@ -161,7 +161,7 @@
     "emptyHint": "从组件库拖拽组件到此处",
     "exitPreview": "退出预览",
     "config": "配置",
-    "configCharts": "配置显示图表与顺序",
+    "configCharts": "配置可切换的图表类型",
     "editCode": "编辑代码",
     "duplicate": "复制",
     "delete": "删除",
@@ -247,14 +247,14 @@
       "changePageSize": "修改分页数量",
       "removePagination": "移除分页",
       "addPagination": "添加分页",
-      "direction": "方向",
+      "direction": "图表方向",
       "vertical": "纵向",
       "horizontal": "横向",
       "hideGrid": "隐藏网格",
       "showGrid": "显示网格",
       "hideLabel": "隐藏数据标签",
       "showLabel": "显示数据标签",
-      "switchVariant": "切换样式",
+      "switchVariant": "切换显示样式",
       "pie": "饼图",
       "ring": "环形图",
       "topN": "显示项数",
@@ -264,22 +264,23 @@
       "showDots": "显示坐标点",
       "hideDotsLabel": "隐藏坐标点数据",
       "showDotsLabel": "显示坐标点数据",
-      "disableStacked": "关闭堆叠",
-      "enableStacked": "开启堆叠",
-      "disablePercent": "关闭百分比",
-      "enablePercent": "开启百分比",
-      "disableArea": "关闭面积",
-      "enableArea": "开启面积",
+      "disableStacked": "关闭数据堆叠",
+      "enableStacked": "开启数据堆叠",
+      "disablePercent": "关闭百分比堆叠",
+      "enablePercent": "开启百分比堆叠",
+      "disableArea": "关闭面积填充",
+      "enableArea": "开启面积填充",
       "disableSmooth": "关闭拟合曲线",
       "enableSmooth": "开启拟合曲线",
-      "switchTo": "切换到",
+      "switchTo": "切换图表类型",
       "showDownload": "显示下载按钮",
       "hideDownload": "隐藏下载按钮",
       "enableSorting": "启用排序",
       "disableSorting": "禁用排序",
       "enableFiltering": "启用过滤",
       "disableFiltering": "禁用过滤",
-      "configColumns": "配置列"
+      "configColumns": "配置列",
+      "visibilityGroup": "显示元素"
     },
     "modal": {
       "columnConfigTitle": "列配置",

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

@@ -1,4 +1,6 @@
 import React from 'react';
+import { Tooltip } from 'antd';
+import { CopyOutlined, DeleteOutlined, MoreOutlined } from '@ant-design/icons';
 import IsolatedLivePreview from './IsolatedLivePreview';
 import { useIsAgentAllowed } from 'config/agentAllowed';
 
@@ -10,6 +12,9 @@ interface CanvasCellProps extends React.HTMLAttributes<HTMLDivElement> {
   onClick: (e: React.MouseEvent) => void;
   onDoubleClick: (e: React.MouseEvent) => void;
   onContextMenu: (e: React.MouseEvent) => void;
+  onDuplicate?: () => void;
+  onDelete?: () => void;
+  onMore?: (e: React.MouseEvent) => void;
   className?: string;
   style?: React.CSSProperties;
   children?: React.ReactNode; // react-grid-layout injects resize handles here
@@ -26,6 +31,9 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
       onClick,
       onDoubleClick,
       onContextMenu,
+      onDuplicate,
+      onDelete,
+      onMore,
       className,
       style,
       children,
@@ -35,6 +43,7 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
   ) => {
     const isSection = componentType === 'Section';
     const isAgentAllowed = useIsAgentAllowed();
+    const showToolbar = !isPreview && isAgentAllowed && selected;
 
     return (
       <div
@@ -77,6 +86,84 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
         >
           <IsolatedLivePreview code={code} />
         </div>
+
+        {/* 选中态悬浮工具栏 */}
+        {showToolbar && (
+          <div
+            onMouseDown={(e) => e.stopPropagation()}
+            onClick={(e) => e.stopPropagation()}
+            style={{
+              position: 'absolute',
+              top: 6,
+              right: 6,
+              zIndex: 10,
+              display: 'flex',
+              alignItems: 'center',
+              gap: 2,
+              padding: 2,
+              background: '#fff',
+              border: '1px solid #d6e4ff',
+              borderRadius: 6,
+              boxShadow: '0 2px 8px rgba(0,0,0,0.08)',
+            }}
+          >
+            <Tooltip title="复制">
+              <button
+                type="button"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  onDuplicate?.();
+                }}
+                style={toolbarBtnStyle}
+                onMouseEnter={(e) =>
+                  (e.currentTarget.style.background = '#f0f5ff')
+                }
+                onMouseLeave={(e) =>
+                  (e.currentTarget.style.background = 'transparent')
+                }
+              >
+                <CopyOutlined />
+              </button>
+            </Tooltip>
+            <Tooltip title="更多">
+              <button
+                type="button"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  onMore?.(e);
+                }}
+                style={toolbarBtnStyle}
+                onMouseEnter={(e) =>
+                  (e.currentTarget.style.background = '#f0f5ff')
+                }
+                onMouseLeave={(e) =>
+                  (e.currentTarget.style.background = 'transparent')
+                }
+              >
+                <MoreOutlined />
+              </button>
+            </Tooltip>
+            <Tooltip title="删除">
+              <button
+                type="button"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  onDelete?.();
+                }}
+                style={{ ...toolbarBtnStyle, color: '#ff4d4f' }}
+                onMouseEnter={(e) =>
+                  (e.currentTarget.style.background = '#fff1f0')
+                }
+                onMouseLeave={(e) =>
+                  (e.currentTarget.style.background = 'transparent')
+                }
+              >
+                <DeleteOutlined />
+              </button>
+            </Tooltip>
+          </div>
+        )}
+
         {/* Resize handles injected by react-grid-layout */}
         {children}
       </div>
@@ -84,6 +171,22 @@ const CanvasCell = React.forwardRef<HTMLDivElement, CanvasCellProps>(
   },
 );
 
+const toolbarBtnStyle: React.CSSProperties = {
+  border: 'none',
+  background: 'transparent',
+  width: 24,
+  height: 24,
+  borderRadius: 4,
+  cursor: 'pointer',
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+  fontSize: 14,
+  color: '#555',
+  padding: 0,
+  transition: 'background 120ms ease',
+};
+
 CanvasCell.displayName = 'CanvasCell';
 
 export default CanvasCell;