@gadmin2n/schematics 0.0.110 → 0.0.112

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/Event.ts

@@ -30,18 +30,11 @@ export const Event: ModelConfig = {
     fields: [
       "*",
       "!created_at",
-      "!businessRequester",
-      "!number",
-      "!additionalInfo",
-      "!snSysId",
-      "!oitOwner",
       "!createdAt",
       "!endDate",
       "!creator",
       "!updatedAt",
       "!startDate",
-      "!eventType",
-      "!country",
     ],
     rowSelection: {
       actions: [
@@ -86,11 +79,6 @@ export const Event: ModelConfig = {
     fields: [
       "*",
       "!created_at",
-      "!businessRequester",
-      "!number",
-      "!additionalInfo",
-      "!snSysId",
-      "!oitOwner",
       "!createdAt",
       "!endDate",
       "!creator",

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/ITActivityDay.ts

@@ -27,7 +27,7 @@ export const ITActivityDay: ModelConfig = {
       filter: [],
       sorter: ["id"],
     },
-    fields: ["*", "!createdAt", "!updatedAt", "!dateKey"],
+    fields: ["*", "!createdAt", "!updatedAt"],
     rowSelection: {
       actions: [
         { action: "DELETE", desc: "Delete" },

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/dev-shell/DevShell.tsx

@@ -10,12 +10,15 @@ import AddDataModal from './AddDataModal';
 import AddPageModal from './AddPageModal';
 import DeleteDataConfirm from './DeleteDataConfirm';
 import EditDataModal from './EditDataModal';
+import OnboardingModal from './OnboardingModal';
 import { resolvePagePaths } from '../components/agentPanel/pagePathUtils';
 import SkillMenu from './SkillMenu';
 import { agentAllowedPromise } from '../config/agentAllowed';
 import './style.css';
 import UndoConfirm from './UndoConfirm';
 
+const ONBOARDING_KEY = 'gadmin-onboarded';
+
 declare global {
   interface Window {
     ChatSDK: any;
@@ -82,6 +85,9 @@ function DevShellInner() {
   const [modal, setModal] = useState<ModalType>(null);
   const [isDataMngtPage, setIsDataMngtPage] = useState(false);
   const [pageType, setPageType] = useState<string>('');
+  const [showOnboarding, setShowOnboarding] = useState(
+    () => !localStorage.getItem(ONBOARDING_KEY),
+  );
   const pageContextRef = useRef<PageContext | null>(null);
   const inspectorSendDepthRef = useRef(0);
 
@@ -475,6 +481,19 @@ function DevShellInner() {
       />
 
       {/* Modals */}
+      {showOnboarding && (
+        <OnboardingModal
+          onAddData={() => {
+            localStorage.setItem(ONBOARDING_KEY, '1');
+            setShowOnboarding(false);
+            setModal('addData');
+          }}
+          onDismiss={() => {
+            localStorage.setItem(ONBOARDING_KEY, '1');
+            setShowOnboarding(false);
+          }}
+        />
+      )}
       {modal === 'undo' && (
         <UndoConfirm
           onConfirm={(prompt) => {

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/dev-shell/OnboardingModal.tsx

@@ -0,0 +1,101 @@
+import React, { useState } from 'react';
+
+interface Props {
+  onAddData: () => void;
+  onDismiss: () => void;
+}
+
+const CAPABILITIES = [
+  {
+    icon: '🗄️',
+    title: '管理数据表',
+    desc: '用自然语言描述业务数据，AI 自动生成数据库和完整的数据管理页面',
+  },
+  {
+    icon: '✏️',
+    title: '所见即所得定制',
+    desc: 'Inspector模式下，点击数据管理页面任意元素，告诉 AI 要改什么，立即生效',
+  },
+  {
+    icon: '📊',
+    title: '新建 Dashboard',
+    desc: '在 Canvas 画布上拖拽搭建数据可视化看板，完成后一键发布到导航菜单',
+  },
+];
+
+export default function OnboardingModal({ onAddData, onDismiss }: Props) {
+  const [step, setStep] = useState<1 | 2>(1);
+
+  return (
+    <div id="onboarding-overlay">
+      <div id="onboarding-card">
+        {step === 1 ? (
+          <>
+            <div className="onboarding-header">
+              <div className="onboarding-welcome-icon">👋</div>
+              <h2 className="onboarding-title">欢迎使用 AI+ Ops Admin</h2>
+              <p className="onboarding-subtitle">
+                这里是你的 AI 驱动开发环境，你可以做这些事：
+              </p>
+            </div>
+
+            <div className="onboarding-caps">
+              {CAPABILITIES.map((cap) => (
+                <div key={cap.title} className="onboarding-cap-card">
+                  <div className="onboarding-cap-icon">{cap.icon}</div>
+                  <div className="onboarding-cap-title">{cap.title}</div>
+                  <div className="onboarding-cap-desc">{cap.desc}</div>
+                </div>
+              ))}
+            </div>
+
+            <div className="onboarding-footer">
+              <button className="add-data-btn-cancel" onClick={onDismiss}>
+                我已了解，跳过
+              </button>
+              <button
+                className="add-data-btn-confirm"
+                onClick={() => setStep(2)}
+              >
+                下一步：如何开始 →
+              </button>
+            </div>
+          </>
+        ) : (
+          <>
+            <div className="onboarding-step2-body">
+              <div className="onboarding-step2-icon">🚀</div>
+              <h3 className="onboarding-step2-title">开始旅程：添加数据表</h3>
+              <p className="onboarding-step2-desc">
+                数据表是一切的基础。描述你要管理什么业务数据，AI
+                会自动设计数据库结构，并同步生成完整的管理页面。
+                <br />
+                <br />
+                有了数据表之后，你就可以用 Inspector 点击页面元素进行定制， 或在
+                Canvas 上搭建可视化看板。
+              </p>
+              <div className="onboarding-step2-hint">
+                💡 之后随时可以通过右下角菜单「添加数据表」重新触发
+              </div>
+            </div>
+
+            <div className="onboarding-footer">
+              <button
+                className="add-data-btn-cancel"
+                onClick={() => setStep(1)}
+              >
+                ← 返回
+              </button>
+              <button className="add-data-btn-cancel" onClick={onDismiss}>
+                先跳过
+              </button>
+              <button className="add-data-btn-confirm" onClick={onAddData}>
+                立即添加数据表
+              </button>
+            </div>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/dev-shell/style.css

@@ -833,3 +833,132 @@ div.chat-header {
   opacity: 1;
   transform: translateY(-50%) scale(1);
 }
+
+/* ── Onboarding Modal ────────────────────────────────────────────────────── */
+#onboarding-overlay {
+  position: fixed;
+  inset: 0;
+  z-index: 999999;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+#onboarding-card {
+  background: #fff;
+  border-radius: 16px;
+  width: 600px;
+  max-width: calc(100vw - 32px);
+  box-shadow: 0 12px 48px rgba(0, 0, 0, 0.22);
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.onboarding-header {
+  padding: 32px 32px 20px;
+  text-align: center;
+}
+
+.onboarding-welcome-icon {
+  font-size: 36px;
+  line-height: 1;
+  margin-bottom: 12px;
+}
+
+.onboarding-title {
+  font-size: 18px;
+  font-weight: 700;
+  color: #1a1a1a;
+  margin: 0 0 8px;
+}
+
+.onboarding-subtitle {
+  font-size: 13px;
+  color: #8c8c8c;
+  margin: 0;
+}
+
+.onboarding-caps {
+  display: flex;
+  gap: 12px;
+  padding: 0 32px 24px;
+}
+
+.onboarding-cap-card {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 6px;
+  padding: 20px 12px;
+  border: 1.5px solid #f0f0f0;
+  border-radius: 12px;
+  background: #fafafa;
+  text-align: center;
+}
+
+.onboarding-cap-icon {
+  font-size: 28px;
+  line-height: 1;
+}
+
+.onboarding-cap-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: #1a1a1a;
+}
+
+.onboarding-cap-desc {
+  font-size: 12px;
+  color: #8c8c8c;
+  line-height: 1.5;
+}
+
+.onboarding-footer {
+  display: flex;
+  gap: 8px;
+  justify-content: flex-end;
+  padding: 16px 32px 24px;
+  border-top: 1px solid #f0f0f0;
+}
+
+/* Step 2 */
+.onboarding-step2-body {
+  padding: 32px 40px 24px;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+}
+
+.onboarding-step2-icon {
+  font-size: 44px;
+  line-height: 1;
+}
+
+.onboarding-step2-title {
+  font-size: 17px;
+  font-weight: 700;
+  color: #1a1a1a;
+  margin: 0;
+}
+
+.onboarding-step2-desc {
+  font-size: 13px;
+  color: #595959;
+  line-height: 1.7;
+  margin: 0;
+  max-width: 440px;
+}
+
+.onboarding-step2-hint {
+  font-size: 12px;
+  color: #8c8c8c;
+  background: #f5f5f5;
+  border-radius: 8px;
+  padding: 10px 16px;
+  margin-top: 4px;
+}

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,13 @@ import { createRoot } from 'react-dom/client';
 import App from './App';
 import './i18n';
 
-import { checkLogin, login } from './helpers/login';
+import {
+  login,
+  GAdminTokenName,
+  setLoginCookie,
+  getUrlParams,
+} from './helpers/login';
+import Cookies from 'js-cookie';
 
 // 屏蔽 ECharts 在 RadarChart 多 Y 轴场景下的 alignTicks 噪音警告
 const _warn = console.warn.bind(console);
@@ -13,7 +19,14 @@ console.warn = (...args: any[]) => {
   _warn(...args);
 };
 
-if (!checkLogin()) {
+// DEV 模式下支持 URL 参数传 token（跨域开发用）
+if (import.meta.env.DEV) {
+  const params = getUrlParams();
+  const gadminToken = params[GAdminTokenName];
+  if (gadminToken) setLoginCookie({ gadminToken });
+}
+
+if (!Cookies.get(GAdminTokenName)) {
   login();
 } else {
   const container = document.getElementById('root') as HTMLElement;

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",