@gadmin2n/schematics 0.0.107 → 0.0.109

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

@@ -9,19 +9,18 @@ import {
 } from '@refinedev/antd';
 import { RowAction } from '../hooks/types';
 import { whenIsTrue } from '@gadmin2n/react-common';
+import {
+  actionsToShowFlags,
+  interpolateActionUrl,
+  splitVisibleActions,
+} from '../helpers/list';
 
 export interface RowActionsRenderContext<T = any> {
-  /** Current record */
   record: T;
-  /** Record ID */
   recordId: number | string;
-  /** Translation function */
   t: (key: string, defaultValue?: string) => string;
-  /** Resource name */
   resourceName: string;
-  /** Update handler */
   onUpdate: (values: any) => void;
-  /** Is update loading */
   updateLoading: boolean;
 }
 
@@ -30,8 +29,13 @@ export interface RowActionsProps<T = any> {
   record: T;
   /** Record ID field name */
   idField?: keyof T;
-  /** Row actions from config */
+  /**
+   * 行操作的 actions 数组（来自 config 的 rowActions.actions）。
+   * actions 是按钮显示与否、按钮顺序的唯一真相源。
+   */
   actions?: RowAction[];
+  /** 主按钮可见数量；超出部分塞入 More dropdown */
+  visibleNum?: number;
   /** Handler for row update */
   onUpdate?: (id: number, values: any) => void;
   /** Is update loading */
@@ -40,15 +44,12 @@ export interface RowActionsProps<T = any> {
   t?: (key: string, defaultValue?: string) => string;
   /** Resource name for i18n keys */
   resourceName?: string;
-  /** Show edit button */
+  /** 强制显式覆盖：传 boolean 时优先于 actions 推导值 */
   showEdit?: boolean;
-  /** Show detail/show button */
   showDetail?: boolean;
-  /** Show clone button */
   showClone?: boolean;
-  /** Show delete button */
   showDelete?: boolean;
-  /** Show history/log button */
+  /** History/Log button —— actions 数组里没有，需要通过 LogButton 或显式 showHistory 开启 */
   showHistory?: boolean;
   /** Custom children - if provided, replaces entire default UI */
   children?:
@@ -56,17 +57,11 @@ export interface RowActionsProps<T = any> {
     | ((context: RowActionsRenderContext<T>) => React.ReactNode);
 
   // Render props for fine-grained customization
-  /** Custom render for edit button */
   renderEditButton?: (recordId: number | string) => React.ReactNode;
-  /** Custom render for detail/show button */
   renderDetailButton?: (recordId: number | string) => React.ReactNode;
-  /** Custom render for clone button */
   renderCloneButton?: (recordId: number | string) => React.ReactNode;
-  /** Custom render for delete button */
   renderDeleteButton?: (recordId: number | string) => React.ReactNode;
-  /** Custom render for history/log button */
   renderHistoryButton?: (recordId: number | string) => React.ReactNode;
-  /** Custom render for status action buttons */
   renderStatusAction?: (
     action: RowAction,
     record: T,
@@ -74,60 +69,32 @@ export interface RowActionsProps<T = any> {
     loading: boolean,
     disabled: boolean,
   ) => React.ReactNode;
-  /** Custom render for more dropdown trigger */
   renderMoreTrigger?: () => React.ReactNode;
-  /** Extra dropdown items to add */
+  /** 额外塞入 More dropdown 的菜单项 */
   extraDropdownItems?: Array<{ key: string; label: React.ReactNode }>;
-  /** Extra primary actions (rendered before More dropdown) */
+  /** 主按钮区追加的内容（在 More dropdown 之前） */
   extraPrimaryActions?: React.ReactNode;
-  /** Log button component (optional, for backward compatibility) */
+  /** Log button component */
   LogButton?: React.ComponentType<any>;
 }
 
 /**
- * Row actions component with edit, show, and more dropdown
- *
- * @example
- * // Basic usage
- * <RowActions
- *   record={record}
- *   actions={tableConfig.rowActions.actions}
- *   t={t}
- *   resourceName="audit"
- * />
- *
- * @example
- * // With custom render props
- * <RowActions
- *   {...props}
- *   renderEditButton={(id) => <MyEditButton id={id} />}
- *   renderDeleteButton={(id) => <MyDeleteButton id={id} />}
- * />
- *
- * @example
- * // Completely custom UI using children
- * <RowActions record={record}>
- *   {({ record, recordId, onUpdate }) => (
- *     <MyCustomActionsUI
- *       record={record}
- *       onEdit={() => navigate(`/edit/${recordId}`)}
- *       onUpdate={onUpdate}
- *     />
- *   )}
- * </RowActions>
+ * 行操作组件：按 config.rowActions.actions 数组顺序渲染按钮，
+ * 前 visibleNum 个为主按钮，其余进 More dropdown。
  */
 export function RowActions<T extends { id: number | string }>({
   record,
   idField = 'id' as keyof T,
   actions = [],
+  visibleNum,
   onUpdate,
   updateLoading = false,
   t = (key, defaultValue) => defaultValue || key,
   resourceName = '',
-  showEdit = true,
-  showDetail = true,
-  showClone = true,
-  showDelete = true,
+  showEdit,
+  showDetail,
+  showClone,
+  showDelete,
   showHistory = false,
   children,
   renderEditButton,
@@ -152,40 +119,35 @@ export function RowActions<T extends { id: number | string }>({
     updateLoading,
   };
 
-  // If children is a function, call it with context
   if (typeof children === 'function') {
     return <>{children(context)}</>;
   }
-
-  // If children is provided as ReactNode, render it directly
   if (children) {
     return <>{children}</>;
   }
 
-  // Default rendering
-  const statusActions = actions.filter(
-    (action) => action.action === 'CHANGE_STATUS',
-  );
+  // actions 是显示与否的唯一真相源；显式 show* 可强制覆盖
+  const flags = actionsToShowFlags(actions);
+  const resolvedShowEdit = showEdit ?? flags.showEdit;
+  const resolvedShowDetail = showDetail ?? flags.showDetail;
+  const resolvedShowClone = showClone ?? flags.showClone;
+  const resolvedShowDelete = showDelete ?? flags.showDelete;
 
-  // Default button renderers
+  // ---------- 默认按钮渲染器 ----------
   const defaultEditButton = (id: number | string) => (
     <EditButton icon={false} type="text" size="small" recordItemId={id} />
   );
-
   const defaultDetailButton = (id: number | string) => (
     <ShowButton icon={false} type="text" size="small" recordItemId={id}>
       {t('table.detail', 'Detail')}
     </ShowButton>
   );
-
   const defaultCloneButton = (id: number | string) => (
     <CloneButton icon={false} type="text" size="small" recordItemId={id} />
   );
-
   const defaultDeleteButton = (id: number | string) => (
     <DeleteButton icon={false} type="text" size="small" recordItemId={id} />
   );
-
   const defaultHistoryButton = (id: number | string) =>
     LogButton ? (
       <LogButton
@@ -196,7 +158,6 @@ export function RowActions<T extends { id: number | string }>({
         recordItemId={id}
       />
     ) : null;
-
   const defaultStatusAction = (
     action: RowAction,
     _record: T,
@@ -217,7 +178,6 @@ export function RowActions<T extends { id: number | string }>({
       </Button>
     </Popconfirm>
   );
-
   const defaultMoreTrigger = () => (
     <Button type="text" size="small">
       {t('table.more', 'More')}
@@ -225,87 +185,136 @@ export function RowActions<T extends { id: number | string }>({
     </Button>
   );
 
-  // Build dropdown items
-  const dropdownItems = [
-    // Status change actions
-    ...statusActions.map((action) => {
-      const disabled = !whenIsTrue(action.when, record);
-      const onConfirm = () => onUpdate?.(Number(recordId), action.values);
+  // ---------- 按 actions 顺序构造可渲染项 ----------
+  type Renderable = { key: string; node: React.ReactNode };
 
-      return {
-        key: action.desc,
-        label: renderStatusAction
-          ? renderStatusAction(
-              action,
-              record,
-              onConfirm,
-              updateLoading,
-              disabled,
-            )
-          : defaultStatusAction(
-              action,
-              record,
-              onConfirm,
-              updateLoading,
-              disabled,
-            ),
-      };
-    }),
-    // Clone button
-    ...(showClone
-      ? [
-          {
-            key: 'clone',
-            label: renderCloneButton
-              ? renderCloneButton(recordId)
-              : defaultCloneButton(recordId),
-          },
-        ]
-      : []),
-    // History/Log button
-    ...(showHistory || LogButton
-      ? [
-          {
-            key: 'history',
-            label: renderHistoryButton
-              ? renderHistoryButton(recordId)
-              : defaultHistoryButton(recordId),
-          },
-        ]
-      : []),
-    // Delete button
-    ...(showDelete
-      ? [
-          {
-            key: 'delete',
-            label: renderDeleteButton
-              ? renderDeleteButton(recordId)
-              : defaultDeleteButton(recordId),
-          },
-        ]
-      : []),
-    // Extra items
+  const renderAction = (action: RowAction, idx: number): Renderable | null => {
+    const whenOk = action.when == null ? true : whenIsTrue(action.when, record);
+    if (!whenOk) return null;
+
+    const key = `${action.action}-${action.desc}-${idx}`;
+    switch (action.action) {
+      case 'EDIT':
+        return resolvedShowEdit
+          ? {
+              key,
+              node: renderEditButton
+                ? renderEditButton(recordId)
+                : defaultEditButton(recordId),
+            }
+          : null;
+      case 'DETAIL':
+        return resolvedShowDetail
+          ? {
+              key,
+              node: renderDetailButton
+                ? renderDetailButton(recordId)
+                : defaultDetailButton(recordId),
+            }
+          : null;
+      case 'DELETE':
+        return resolvedShowDelete
+          ? {
+              key,
+              node: renderDeleteButton
+                ? renderDeleteButton(recordId)
+                : defaultDeleteButton(recordId),
+            }
+          : null;
+      case 'CHANGE_STATUS': {
+        const disabled = !whenIsTrue(action.when, record);
+        const onConfirm = () => onUpdate?.(Number(recordId), action.values);
+        return {
+          key,
+          node: renderStatusAction
+            ? renderStatusAction(
+                action,
+                record,
+                onConfirm,
+                updateLoading,
+                disabled,
+              )
+            : defaultStatusAction(
+                action,
+                record,
+                onConfirm,
+                updateLoading,
+                disabled,
+              ),
+        };
+      }
+      case 'JUMP': {
+        const url = interpolateActionUrl(
+          (action as any).url || '',
+          record as any,
+        );
+        const isExternal = /^https?:\/\//.test(url);
+        return {
+          key,
+          node: (
+            <Button
+              type="link"
+              size="small"
+              onClick={() => {
+                if (!url) return;
+                if (isExternal) {
+                  window.open(url, '_blank', 'noopener,noreferrer');
+                } else {
+                  window.location.href = url;
+                }
+              }}
+            >
+              {t(
+                `resources.${resourceName}.actions.${action.desc}`,
+                action.desc,
+              )}
+            </Button>
+          ),
+        };
+      }
+      default:
+        return null;
+    }
+  };
+
+  const renderables = actions
+    .map((a, i) => renderAction(a, i))
+    .filter((x): x is Renderable => x != null);
+
+  // 隐式按钮（actions 数组里通常没有）：CLONE 由显式 showClone 控制；HISTORY 由 showHistory 或 LogButton 触发
+  if (resolvedShowClone) {
+    renderables.push({
+      key: 'clone-implicit',
+      node: renderCloneButton
+        ? renderCloneButton(recordId)
+        : defaultCloneButton(recordId),
+    });
+  }
+  if (showHistory || LogButton) {
+    const node = renderHistoryButton
+      ? renderHistoryButton(recordId)
+      : defaultHistoryButton(recordId);
+    if (node != null) {
+      renderables.push({ key: 'history-implicit', node });
+    }
+  }
+
+  const { visible, overflow } = splitVisibleActions(
+    renderables,
+    visibleNum ?? renderables.length,
+  );
+
+  const dropdownItems = [
+    ...overflow.map((r) => ({ key: r.key, label: r.node })),
     ...extraDropdownItems,
   ].filter((item) => item.label != null);
 
   return (
     <Space>
-      {/* Edit button */}
-      {showEdit &&
-        (renderEditButton
-          ? renderEditButton(recordId)
-          : defaultEditButton(recordId))}
-
-      {/* Show/Detail button */}
-      {showDetail &&
-        (renderDetailButton
-          ? renderDetailButton(recordId)
-          : defaultDetailButton(recordId))}
-
-      {/* Extra primary actions */}
+      {visible.map((r) => (
+        <React.Fragment key={r.key}>{r.node}</React.Fragment>
+      ))}
       {extraPrimaryActions}
-
-      {/* More dropdown */}
       {dropdownItems.length > 0 && (
         <Dropdown menu={{ items: dropdownItems as any }} trigger={['click']}>
           {renderMoreTrigger ? renderMoreTrigger() : defaultMoreTrigger()}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/agentPanel/inspectorActions.ts

@@ -288,14 +288,14 @@ export function getInspectorActions(
         {
           label: '添加表头搜索',
           skill: 'ui-config-update',
-          promptTemplate: `为 ${col(r, f)} 添加搜索过滤`,
+          promptTemplate: `为 ${col(r, f)} 添加搜索过滤（修改 ui配置中的 header.filter）`,
           requiresConfirm: true,
           confirmDescription: `将为 ${r} 列表的 "${f}" 列添加表头搜索过滤。`,
         },
         {
           label: '移除表头搜索',
           skill: 'ui-config-update',
-          promptTemplate: `移除 ${col(r, f)} 的搜索过滤`,
+          promptTemplate: `移除 ${col(r, f)} 的搜索过滤（修改 ui配置中的 header.filter）`,
           requiresConfirm: true,
           confirmDescription: `将移除 ${r} 列表 "${f}" 列的表头搜索过滤。`,
         },
@@ -528,7 +528,7 @@ export function getInspectorActions(
         {
           label: '增加 模糊匹配 过滤',
           skill: 'list-search-filter',
-          promptTemplate: `为 ${r} 搜索栏添加模糊匹配过滤（通过修改ui配置）`,
+          promptTemplate: `为 ${r} 搜索栏添加模糊匹配过滤(修改 ui配置中的 toolbar.searchBar)`,
           promptPrefix: '要添加的字段：',
           requiresInput: true,
           inputPlaceholder: '请填写要添加模糊搜索的字段名，例如：name、title',

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

@@ -0,0 +1,35 @@
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { authProvider } from '../authProvider';
+import { isAgentEnabled } from './env';
+
+// Shared singleton promise — resolves to true only if the logged-in userid
+// matches VITE_BRANCH_OWNER. Both the React context and DevShell (separate root)
+// use this same promise so the fetch only happens once.
+const branchOwner = import.meta.env.VITE_BRANCH_OWNER;
+export const agentAllowedPromise: Promise<boolean> = isAgentEnabled
+  ? branchOwner
+    ? authProvider.getIdentity!().then(
+        (identity: any) => identity?.id === branchOwner,
+      )
+    : Promise.resolve(true)
+  : Promise.resolve(false);
+
+const AgentAllowedContext = createContext(false);
+
+export const AgentAllowedProvider: React.FC<{ children: React.ReactNode }> = ({
+  children,
+}) => {
+  const [allowed, setAllowed] = useState(false);
+
+  useEffect(() => {
+    agentAllowedPromise.then(setAllowed);
+  }, []);
+
+  return (
+    <AgentAllowedContext.Provider value={allowed}>
+      {children}
+    </AgentAllowedContext.Provider>
+  );
+};
+
+export const useIsAgentAllowed = () => useContext(AgentAllowedContext);

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

@@ -1,4 +1,4 @@
-// Agent panel is enabled in dev mode unless explicitly disabled via VITE_ENABLE_AGENT=false.
-// To disable: set VITE_ENABLE_AGENT=false in web/.env.local or pass it at startup.
+// Agent panel is enabled in dev mode unless VITE_ENABLE_AGENT=false.
+// If VITE_BRANCH_OWNER is set, only the matching user can use it.
 export const isAgentEnabled =
   import.meta.env.DEV && import.meta.env.VITE_ENABLE_AGENT !== 'false';

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

@@ -12,7 +12,7 @@ import DeleteDataConfirm from './DeleteDataConfirm';
 import EditDataModal from './EditDataModal';
 import { resolvePagePaths } from '../components/agentPanel/pagePathUtils';
 import SkillMenu from './SkillMenu';
-import { isAgentEnabled } from '../config/env';
+import { agentAllowedPromise } from '../config/agentAllowed';
 import './style.css';
 import UndoConfirm from './UndoConfirm';
 
@@ -61,7 +61,13 @@ export type ModalType =
   | null;
 
 export default function DevShell() {
-  if (!isAgentEnabled) return null;
+  const [allowed, setAllowed] = useState(false);
+
+  useEffect(() => {
+    agentAllowedPromise.then(setAllowed);
+  }, []);
+
+  if (!allowed) return null;
   return <DevShellInner />;
 }
 

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

@@ -1,10 +1,11 @@
 import axios from 'axios';
+import { Modal } from 'antd';
 import {
   GadminCrud as gadminDataProvider,
   applyErrorInterceptor,
   customRequest as baseCustomRequest,
 } from '@gadmin2n/react-common';
-import { login, requestHeaders } from './login';
+import { login, requestHeaders, isWoaDomain } from './login';
 import { getApiUrl } from 'config/http';
 // Re-export Prisma helpers from react-common for backward compatibility
 export { convertPrismaDecimal, isPrismaDecimal } from '@gadmin2n/react-common';
@@ -13,6 +14,8 @@ const apiUrl = getApiUrl();
 
 const axiosInstance = axios.create();
 
+let woaSessionExpiredModalShown = false;
+
 // 注入 auth header
 axiosInstance.interceptors.request.use(
   (config) => {
@@ -29,6 +32,22 @@ axiosInstance.interceptors.response.use(
   (response) => response,
   (error) => {
     if (error?.response?.status === 401) {
+      if (isWoaDomain()) {
+        if (!woaSessionExpiredModalShown) {
+          woaSessionExpiredModalShown = true;
+          Modal.confirm({
+            title: '登录态已过期',
+            content: '您的登录状态已失效，请刷新页面重新登录。',
+            okText: '刷新',
+            cancelText: '取消',
+            onOk: () => window.location.reload(),
+            onCancel: () => {
+              woaSessionExpiredModalShown = false;
+            },
+          });
+        }
+        return new Promise(() => {});
+      }
       console.log('login expired');
       login();
       // 返回pending状态的promise，以免后续代码出错

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

@@ -35,6 +35,54 @@ import { ModelConfig } from 'generated/types/config.types';
 import { agentAttrs } from '../components/agentPanel/agentAttributes';
 import dayjs from 'dayjs';
 
+/**
+ * 把 actions 数组解析成 show* 布尔标志集合。
+ * 用于让 config 中的 actions 数组成为「显示与否」的唯一真相源。
+ */
+export function actionsToShowFlags(
+  actions: ReadonlyArray<{ action: string }> = [],
+) {
+  const set = new Set(actions.map((a) => a.action));
+  return {
+    showInsert: set.has('INSERT'),
+    showEdit: set.has('EDIT'),
+    showDelete: set.has('DELETE'),
+    showExport: set.has('EXPORT'),
+    showDetail: set.has('DETAIL'),
+    showClone: set.has('CLONE'),
+    showImport: set.has('IMPORT'),
+    showRefresh: set.has('REFRESH'),
+  };
+}
+
+/**
+ * 按 visibleNum 把 actions 切成「主区直接显示」和「溢出 More dropdown」两组。
+ */
+export function splitVisibleActions<T>(
+  actions: ReadonlyArray<T> = [],
+  visibleNum = Number.POSITIVE_INFINITY,
+): { visible: T[]; overflow: T[] } {
+  const n = Number.isFinite(visibleNum)
+    ? Math.max(0, visibleNum)
+    : actions.length;
+  return {
+    visible: actions.slice(0, n),
+    overflow: actions.slice(n),
+  };
+}
+
+/**
+ * 用 record 字段值替换 `{{fieldName}}` 占位符（JUMP action 的 url）。
+ */
+export function interpolateActionUrl(
+  template: string,
+  record: Record<string, any>,
+): string {
+  return template.replace(/\{\{(\w+)\}\}/g, (_, key) =>
+    String(record?.[key] ?? ''),
+  );
+}
+
 export function getTableParams(filters: Record<string, string> = {}) {
   return stringifyTableParams({
     pagination: { pageSize: 10, current: 1 },

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

@@ -8,8 +8,9 @@ import type { Plugin } from 'vite';
  *
  * Features:
  * 1. POST /canvas-patch — agent pushes new component code to canvas via HMR
- * 2. "/" serves dev-shell-entry.html (agent panel outer shell)
- * 3. All other HTML navigation falls back to index.html (SPA router)
+ * 2. POST /canvas-add-item — agent adds a new component to canvas via HMR
+ * 3. "/" serves dev-shell-entry.html (agent panel outer shell)
+ * 4. All other HTML navigation falls back to index.html (SPA router)
  */
 export function devShellPlugin(): Plugin {
   return {
@@ -49,6 +50,43 @@ export function devShellPlugin(): Plugin {
           return;
         }
 
+        // POST /canvas-add-item — agent 新增一个组件到画布（item + layout）
+        if (req.method === 'POST' && url === '/canvas-add-item') {
+          let body = '';
+          req.on('data', (chunk: Buffer) => {
+            body += chunk.toString();
+          });
+          req.on('end', () => {
+            try {
+              const { item, layout } = JSON.parse(body) as {
+                item: { id: string; componentType: string; code: string };
+                layout: { x: number; y: number; w: number; h: number };
+              };
+              if (
+                item?.id &&
+                item?.componentType &&
+                item?.code !== undefined &&
+                layout
+              ) {
+                server.hot.send('canvas:add-item', { item, layout });
+                res.setHeader('Content-Type', 'application/json');
+                res.end(JSON.stringify({ ok: true }));
+              } else {
+                res.statusCode = 400;
+                res.end(
+                  JSON.stringify({
+                    error: 'item (id, componentType, code) and layout required',
+                  }),
+                );
+              }
+            } catch {
+              res.statusCode = 400;
+              res.end(JSON.stringify({ error: 'invalid JSON' }));
+            }
+          });
+          return;
+        }
+
         // "/" → dev-shell-entry.html（Agent 外壳），除非 agent 被禁用
         if (url === '/') {
           const agentDisabled = process.env.VITE_ENABLE_AGENT === 'false';