@gadmin2n/schematics 0.0.69 → 0.0.70

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

@@ -4,7 +4,7 @@ import {
   I18N_T,
   ModelsFieldsTypeMap,
   convertPrismaDecimal,
-} from "@gadmin2n/react-common";
+} from '@gadmin2n/react-common';
 import {
   TextField,
   DateField,
@@ -17,10 +17,10 @@ import {
   UrlField,
   ShowButton,
   TagField,
-} from "@refinedev/antd";
-import { CheckCircleTwoTone, CloseCircleTwoTone } from "@ant-design/icons";
-import { FilterDropdownProps } from "antd/lib/table/interface";
-import { Select, Table, Space, SelectProps } from "antd";
+} from '@refinedev/antd';
+import { CheckCircleTwoTone, CloseCircleTwoTone } from '@ant-design/icons';
+import { FilterDropdownProps } from 'antd/lib/table/interface';
+import { Select, Table, Space, SelectProps } from 'antd';
 import {
   CrudSorting,
   CrudFilters,
@@ -28,10 +28,10 @@ import {
   getDefaultSortOrder,
   getDefaultFilter,
   stringifyTableParams,
-} from "@refinedev/core";
-import { DefaultOptionType } from "antd/es/select";
-import { ModelConfig } from "generated/types/config.types";
-import { agentAttrs } from "../components/agentPanel/agentAttributes";
+} from '@refinedev/core';
+import { DefaultOptionType } from 'antd/es/select';
+import { ModelConfig } from 'generated/types/config.types';
+import { agentAttrs } from '../components/agentPanel/agentAttributes';
 import dayjs from 'dayjs';
 
 export function getTableParams(filters: Record<string, string> = {}) {
@@ -40,7 +40,7 @@ export function getTableParams(filters: Record<string, string> = {}) {
     sorters: [],
     filters: Object.entries(filters).map(([field, value]) => ({
       field,
-      operator: "eq",
+      operator: 'eq',
       value: encodeURIComponent(value),
     })),
   });
@@ -55,7 +55,7 @@ export interface TableColumnContext {
   model: ModelType;
   modelsEnum: Record<string, Record<string, string>>;
   modelsMap: ModelsFieldsTypeMap;
-  tableConfig: ModelConfig["table"];
+  tableConfig: ModelConfig['table'];
   sorter: CrudSorting | undefined;
   filters: CrudFilters | undefined;
   relationSelectProps: Record<
@@ -83,13 +83,13 @@ export function getTableColumn(
   model: ModelType,
   modelsEnum: Record<string, Record<string, string>>,
   modelsMap: ModelsFieldsTypeMap,
-  tableConfig: ModelConfig["table"],
+  tableConfig: ModelConfig['table'],
   sorter: CrudSorting | undefined,
   filters: CrudFilters | undefined,
   relationSelectProps: Record<
     string,
     SelectProps<{ value: string; label: string }, DefaultOptionType>
-  >
+  >,
 ) {
   return getTableColumnV2({
     col,
@@ -126,19 +126,19 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
   const { type: fieldType, args } = col.uiType.formItem;
   const fieldName = col.name;
   const props: any = {
-    dataIndex: fieldName.includes(".") ? fieldName.split(".") : fieldName,
+    dataIndex: fieldName.includes('.') ? fieldName.split('.') : fieldName,
     key: fieldName,
     title: t(`resources.${resourceName}.fields.${fieldName}`, fieldName),
     render: (value: any) => <TextField value={value} />,
   };
 
-  if (col.kind === "object" && !col.isList && !fieldName.includes(".")) {
-    const entityName = model[fieldName]?.type || "";
-    props.dataIndex = [fieldName, "id"];
+  if (col.kind === 'object' && !col.isList && !fieldName.includes('.')) {
+    const entityName = model[fieldName]?.type || '';
+    props.dataIndex = [fieldName, 'id'];
     props.key = `${fieldName}.id`;
     props.title = t(
       `resources.${resourceName}.fields.${fieldName}`,
-      t(`resources.${entityName.toLowerCase()}.name`, entityName)
+      t(`resources.${entityName.toLowerCase()}.name`, entityName),
     );
     props.render = (_: any, record: any) =>
       record?.[fieldName]?.id !== undefined ? (
@@ -149,43 +149,47 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
           resource={entityName.toLowerCase()}
           recordItemId={record[fieldName].id}
         >
-          {record[fieldName][modelsMap[entityName]?.meta?.nameKeys?.[0] || "id"]}
+          {
+            record[fieldName][
+              modelsMap[entityName]?.meta?.nameKeys?.[0] || 'id'
+            ]
+          }
         </ShowButton>
       ) : null;
-  } else if (fieldName.startsWith("_count.")) {
-    const entityName = model[fieldName.split(".")[1]]?.type || "";
+  } else if (fieldName.startsWith('_count.')) {
+    const entityName = model[fieldName.split('.')[1]]?.type || '';
     props.title = t(
       `resources.${resourceName}.fields.${fieldName}`,
-      "Count " + t(`resources.${entityName.toLowerCase()}.name`, entityName)
+      'Count ' + t(`resources.${entityName.toLowerCase()}.name`, entityName),
     );
-  } else if (fieldType === "DateTime") {
+  } else if (fieldType === 'DateTime') {
     props.render = (value: any) => {
       return <DateField value={value} format="YYYY-MM-DD HH:mm:ss" />;
     };
-  } else if (["Int", "BigInt", "Float", "Decimal"].includes(fieldType)) {
+  } else if (['Int', 'BigInt', 'Float', 'Decimal'].includes(fieldType)) {
     props.render = (value: any) => {
       // Handle Prisma Decimal objects (which have {s, e, d} keys from decimal.js)
       const displayValue = convertPrismaDecimal(value);
       if (
-        fieldName !== "id" &&
+        fieldName !== 'id' &&
         displayValue !== undefined &&
         displayValue !== null &&
         !isNaN(Number(displayValue))
       ) {
-        return <NumberField value={displayValue ?? ""} />;
+        return <NumberField value={displayValue ?? ''} />;
       } else {
         return <TextField value={displayValue} />;
       }
     };
-  } else if (fieldType === "Url") {
+  } else if (fieldType === 'Url') {
     props.render = (value: any) => {
       return <UrlField value={value} />;
     };
-  } else if (fieldType === "Email") {
+  } else if (fieldType === 'Email') {
     props.render = (value: any) => {
       return <EmailField value={value} />;
     };
-  } else if (fieldType === "Boolean") {
+  } else if (fieldType === 'Boolean') {
     props.render = (value: any) => {
       return (
         <BooleanField
@@ -195,44 +199,44 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
         />
       );
     };
-  } else if (fieldType === "Radio" || col.kind === "enum") {
+  } else if (fieldType === 'Radio' || col.kind === 'enum') {
     props.render = (value: any) => {
       return (
         <TagField
           value={t(
             `resources.${resourceName}.enums.${fieldName}.${value}`,
-            String(value)
+            String(value),
           )}
         />
       );
     };
-  } else if (fieldType === "CheckBox") {
+  } else if (fieldType === 'CheckBox') {
     props.render = (value: any) => {
       return (
         <Space>
-          {JSON.parse(value || "[]")?.map?.((v: string, index: number) => (
+          {JSON.parse(value || '[]')?.map?.((v: string, index: number) => (
             <TagField
               key={index}
               value={t(
                 `resources.${resourceName}.enums.${fieldName}.${v}`,
-                String(v)
+                String(v),
               )}
             />
           ))}
         </Space>
       );
     };
-  } else if (fieldType === "Select") {
-    if (["multiple", "tags"].includes((args as any).mode)) {
+  } else if (fieldType === 'Select') {
+    if (['multiple', 'tags'].includes((args as any).mode)) {
       props.render = (value: any) => {
         return (
           <Space>
-            {JSON.parse(value || "[]")?.map?.((v: string, index: number) => (
+            {JSON.parse(value || '[]')?.map?.((v: string, index: number) => (
               <TagField
                 key={index}
                 value={t(
                   `resources.${resourceName}.enums.${fieldName}.${v}`,
-                  String(v)
+                  String(v),
                 )}
               />
             ))}
@@ -245,17 +249,17 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
           <TagField
             value={t(
               `resources.${resourceName}.enums.${fieldName}.${value}`,
-              String(value)
+              String(value),
             )}
           />
         );
       };
     }
-  } else if (fieldType === "Image") {
+  } else if (fieldType === 'Image') {
     props.render = (value: any) => {
       return (
         <Space wrap>
-          {JSON.parse(value || "[]")?.map?.((img: any) => (
+          {JSON.parse(value || '[]')?.map?.((img: any) => (
             <ImageField
               key={img?.response?.name}
               value={img?.thumbUrl}
@@ -266,11 +270,11 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
         </Space>
       );
     };
-  } else if (fieldType === "File") {
+  } else if (fieldType === 'File') {
     props.render = (value: any) => {
       return (
         <Space wrap>
-          {JSON.parse((value as any) || "[]")?.map?.((file: any) => (
+          {JSON.parse((value as any) || '[]')?.map?.((file: any) => (
             <FileField
               key={file?.response?.name}
               src={file?.thumbUrl}
@@ -292,11 +296,11 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
     const { type: fieldType, args } = col.uiType.formItem;
 
     if (
-      field.kind === "enum" ||
-      ["Radio", "Select", "CheckBox"].includes(fieldType)
+      field.kind === 'enum' ||
+      ['Radio', 'Select', 'CheckBox'].includes(fieldType)
     ) {
       let options = {};
-      if (field.kind === "enum") {
+      if (field.kind === 'enum') {
         options = (modelsEnum as any)[field.type];
       } else {
         options = (args as any).options.reduce(
@@ -304,7 +308,7 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
             acc[cur] = cur;
             return acc;
           },
-          {}
+          {},
         );
       }
       props.filterDropdown = (p: FilterDropdownProps) => {
@@ -322,21 +326,21 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
               mode="multiple"
               placeholder={t(
                 `resources.${resourceName}.filters.${fieldName}`,
-                "Select value"
+                'Select value',
               )}
               options={Object.entries(options).map(([k, v]) => ({
                 value: v,
                 label: t(
                   `resources.${resourceName}.enums.${fieldName}.${k}`,
-                  String(k)
+                  String(k),
                 ),
               }))}
             />
           </FilterDropdown>
         );
       };
-      props.defaultFilteredValue = getDefaultFilter(fieldName, filters, "in");
-    } else if (field.kind === "object") {
+      props.defaultFilteredValue = getDefaultFilter(fieldName, filters, 'in');
+    } else if (field.kind === 'object') {
       props.filterDropdown = (p: FilterDropdownProps) => {
         const { setSelectedKeys, confirm } = p;
         return (
@@ -355,7 +359,7 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
               mode="multiple"
               placeholder={t(
                 `resources.${field.type.toLowerCase()}.name`,
-                String(field.type)
+                String(field.type),
               )}
               {...relationSelectProps[field.name]}
             />
@@ -365,13 +369,13 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
       props.defaultFilteredValue = getDefaultFilter(
         `${field.name}.id`,
         filters,
-        "in"
+        'in',
       );
     }
   }
 
   const agentHeaderAttrs = agentAttrs({
-    type: 'table-column',
+    type: 'list-column',
     field: fieldName,
     resource: resourceName,
     meta: {
@@ -381,27 +385,29 @@ export function getTableColumnV2({ col, context }: GetTableColumnParams) {
     },
   });
 
+  const { key: colKey, ...restProps } = props;
+
   return (
     <Table.Column
-      {...props}
+      key={colKey}
+      {...restProps}
       {...col}
       onHeaderCell={() => agentHeaderAttrs}
     />
   );
 }
 
-
 interface SearchFormOptions {
   /** 日期字段名，设为 null 则不使用日期筛选，默认 'createdAt' */
   dateField?: string | null;
 }
 
-/**                                                                                                                                    
- * 从 parsedFilters 生成搜索表单的 initialValues                                                                                       
+/**
+ * 从 parsedFilters 生成搜索表单的 initialValues
  */
 export function getSearchFormInitialValues(
   parsedFilters: any[],
-  options: SearchFormOptions = {}
+  options: SearchFormOptions = {},
 ) {
   const { dateField = 'createdAt' } = options;
 
@@ -409,30 +415,38 @@ export function getSearchFormInitialValues(
     q: parsedFilters.find((f: any) => f.field === 'q')?.value,
   };
 
-  // 仅当 dateField 存在时才处理日期筛选                                                                                               
+  // 仅当 dateField 存在时才处理日期筛选
   if (dateField) {
     const hasDateFilter = parsedFilters.find(
-      (f: any) => f.field === dateField && f.operator === 'gte'
+      (f: any) => f.field === dateField && f.operator === 'gte',
     );
 
     initialValues[dateField] = hasDateFilter
       ? [
-        dayjs(parsedFilters.find((f: any) => f.field === dateField && f.operator === 'gte')?.value),
-        dayjs(parsedFilters.find((f: any) => f.field === dateField && f.operator === 'lte')?.value),
-      ]
+          dayjs(
+            parsedFilters.find(
+              (f: any) => f.field === dateField && f.operator === 'gte',
+            )?.value,
+          ),
+          dayjs(
+            parsedFilters.find(
+              (f: any) => f.field === dateField && f.operator === 'lte',
+            )?.value,
+          ),
+        ]
       : [undefined, undefined];
   }
 
   return initialValues;
 }
 
-/**                                                                                                                                    
- * 创建搜索表单的 onFinish 处理函数                                                                                                    
+/**
+ * 创建搜索表单的 onFinish 处理函数
  */
 export function createSearchFormOnFinish(
   setCurrent: (page: number) => void,
   setFilters: (fn: (prev: CrudFilters) => CrudFilters) => void,
-  options: SearchFormOptions = {}
+  options: SearchFormOptions = {},
 ) {
   const { dateField = 'createdAt' } = options;
   const filterFields = dateField ? ['q', dateField] : ['q'];
@@ -441,25 +455,37 @@ export function createSearchFormOnFinish(
     const fs: CrudFilters = [];
     const trimedQ = (values.q || '').trim();
 
-    // 处理日期筛选                                                                                                                    
+    // 处理日期筛选
     if (dateField) {
       const dateValue = values[dateField];
       if (dateValue && dateValue[0]) {
         fs.push(
-          { field: dateField, operator: 'gte', value: dateValue[0]?.toISOString?.() },
-          { field: dateField, operator: 'lte', value: dateValue[1]?.toISOString?.() }
+          {
+            field: dateField,
+            operator: 'gte',
+            value: dateValue[0]?.toISOString?.(),
+          },
+          {
+            field: dateField,
+            operator: 'lte',
+            value: dateValue[1]?.toISOString?.(),
+          },
         );
       }
     }
 
-    // 处理关键词筛选                                                                                                                  
+    // 处理关键词筛选
     if (trimedQ) {
       fs.push({ field: 'q', operator: 'eq', value: trimedQ });
     }
 
     setCurrent(1);
     setFilters((prevFilters) =>
-      unionFilters([], fs, prevFilters.filter((item: any) => !filterFields.includes(item.field)))
+      unionFilters(
+        [],
+        fs,
+        prevFilters.filter((item: any) => !filterFields.includes(item.field)),
+      ),
     );
   };
-}
+}

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

@@ -1,15 +1,18 @@
-import Cookies from "js-cookie";
-import { getApiUrl } from "config/http";
+import Cookies from 'js-cookie';
+import { getApiUrl } from 'config/http';
 
-export const GAdminTokenName = "gadmin-token";
+export const GAdminTokenName = 'gadmin-token';
 
 export function getUrlParams(search = window.location.search) {
-  const hashes = search.slice(search.indexOf("?") + 1).split("&");
-  return hashes.reduce((acc, hash) => {
-    const [key, val] = hash.split("=");
-    if (val) acc[key] = decodeURIComponent(val);
-    return acc;
-  }, {} as Record<string, string>);
+  const hashes = search.slice(search.indexOf('?') + 1).split('&');
+  return hashes.reduce(
+    (acc, hash) => {
+      const [key, val] = hash.split('=');
+      if (val) acc[key] = decodeURIComponent(val);
+      return acc;
+    },
+    {} as Record<string, string>,
+  );
 }
 
 type LoginCookie = {
@@ -19,15 +22,10 @@ type LoginCookie = {
 // ─── 认证 / 会话 ──────────────────────────────────────────────────────────────
 
 export function login() {
-  // woa域名直接刷新页面
-  if (window.location.hostname.endsWith(".woa.com")) {
-    window.location.reload();
-    return;
-  }
   clearLoginCookie();
   const apiUrl = getApiUrl();
   window.location.href = `${apiUrl}/login?redirect_url=${encodeURIComponent(
-    window.location.href
+    window.location.href,
   )}`;
 }
 
@@ -35,7 +33,7 @@ export function logout() {
   clearLoginCookie();
   const apiUrl = getApiUrl();
   window.location.href = `${apiUrl}/logout?redirect_url=${encodeURIComponent(
-    window.location.origin
+    window.location.origin,
   )}`;
 }
 
@@ -43,14 +41,7 @@ export function logout() {
  * 通过cookie检测是否登录及参数转cookie(for dev)
  */
 export function checkLogin(): boolean {
-  if (window.location.hostname.endsWith(".woa.com")) {
-    return true;
-  }
-
-  if (Cookies.get(GAdminTokenName)) {
-    return true;
-  }
-
+  // 优先处理 URL 参数中的 token，确保 token 被写入 cookie（任何域名下都需要）
   const params = getUrlParams();
   const gadminToken = params[GAdminTokenName];
   if (gadminToken) {
@@ -58,6 +49,10 @@ export function checkLogin(): boolean {
     return true;
   }
 
+  if (Cookies.get(GAdminTokenName)) {
+    return true;
+  }
+
   return false;
 }
 
@@ -72,12 +67,12 @@ export function clearLoginCookie() {
 
 export function requestHeaders() {
   const gadminToken = Cookies.get(GAdminTokenName);
-  const business = JSON.parse(Cookies.get("Business") || "{}");
+  const business = JSON.parse(Cookies.get('Business') || '{}');
   return {
-    "X-Requested-With": "XMLHttpRequest",
+    'X-Requested-With': 'XMLHttpRequest',
     // 防止 business.name 含中文等非 ASCII 字符导致 HTTP header 500
     ...(Object.keys(business).length > 0 && {
-      "X-Gadmin-Business": JSON.stringify({
+      'X-Gadmin-Business': JSON.stringify({
         ...business,
         name: encodeURIComponent(business.name),
       }),

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

@@ -0,0 +1,74 @@
+export interface PageTreeNode {
+  title: string;
+  value: string;
+  key: string;
+  children?: PageTreeNode[];
+}
+
+interface RawPage {
+  id: number | string;
+  parentId?: number | string | null;
+  sortOrder?: number | null;
+  [key: string]: any;
+}
+
+/**
+ * 将平铺的 page 列表构建成 TreeSelect 所需的树结构。
+ *
+ * @param pages     后端返回的平铺 page 数组
+ * @param getTitle  从单条 page 记录提取显示文本的函数（支持多语言/自定义逻辑）
+ */
+export function buildPageTree(
+  pages: RawPage[],
+  getTitle: (page: RawPage) => string,
+): PageTreeNode[] {
+  const nodeMap = new Map<
+    string,
+    { node: PageTreeNode; parentId: string | null; sortOrder: number | null }
+  >();
+
+  pages.forEach((page) => {
+    const id = String(page.id);
+    const parentId = page.parentId != null ? String(page.parentId) : null;
+    const sortOrder = page.sortOrder ?? null;
+    nodeMap.set(id, {
+      node: { title: getTitle(page), value: id, key: id, children: [] },
+      parentId,
+      sortOrder,
+    });
+  });
+
+  const roots: PageTreeNode[] = [];
+  nodeMap.forEach(({ node, parentId }) => {
+    if (parentId !== null && nodeMap.has(parentId)) {
+      nodeMap.get(parentId)!.node.children!.push(node);
+    } else {
+      roots.push(node);
+    }
+  });
+
+  const sortOrderMap = new Map<string, number | null>();
+  nodeMap.forEach(({ sortOrder }, id) => sortOrderMap.set(id, sortOrder));
+
+  const sortNodes = (nodes: PageTreeNode[]) => {
+    nodes.sort((a, b) => {
+      const orderA = sortOrderMap.get(a.key) ?? Infinity;
+      const orderB = sortOrderMap.get(b.key) ?? Infinity;
+      return (orderA as number) - (orderB as number);
+    });
+    nodes.forEach((n) => {
+      if (n.children?.length) sortNodes(n.children);
+    });
+  };
+
+  const pruneEmptyChildren = (nodes: PageTreeNode[]): PageTreeNode[] =>
+    nodes.map((n) => {
+      if (n.children?.length)
+        return { ...n, children: pruneEmptyChildren(n.children) };
+      const { children, ...rest } = n;
+      return rest as PageTreeNode;
+    });
+
+  sortNodes(roots);
+  return pruneEmptyChildren(roots);
+}