nsgm-cli 2.1.39 → 2.1.40

package/client/utils/i18n.ts

@@ -62,6 +62,25 @@ export const formatDate = (date: Date | string, locale = "zh-CN") => {
   }).format(dateObj);
 };
 
+// Format date and time as YYYY-MM-DD HH:mm:ss
+export const formatDateTime = (date: Date | string) => {
+  const dateObj = typeof date === "string" ? new Date(date) : date;
+
+  // Check if date is valid
+  if (isNaN(dateObj.getTime())) {
+    return "";
+  }
+
+  const year = dateObj.getFullYear();
+  const month = String(dateObj.getMonth() + 1).padStart(2, "0");
+  const day = String(dateObj.getDate()).padStart(2, "0");
+  const hours = String(dateObj.getHours()).padStart(2, "0");
+  const minutes = String(dateObj.getMinutes()).padStart(2, "0");
+  const seconds = String(dateObj.getSeconds()).padStart(2, "0");
+
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
+
 // Format number based on locale
 export const formatNumber = (number: number, locale = "zh-CN") => {
   return new Intl.NumberFormat(locale).format(number);

package/lib/generate_create.js

@@ -218,8 +218,8 @@ const generateDynamicFiles = (controller, action, paths, fields, dictionary) =>
     fs_1.default.writeFileSync(paths.destServerModulesResolver, resolverGenerator.generate());
     fs_1.default.writeFileSync(paths.destClientAction, serviceGenerator.generate());
     fs_1.default.writeFileSync(paths.destPagesAction, pageGenerator.generate());
-    // 生成 DataLoader 文件
-    const dataLoaderPath = (0, path_1.resolve)(`${projectPath}/server/dataloaders/${controller}-dataloader.ts`);
+    // 生成 DataLoader 文件 (JavaScript)
+    const dataLoaderPath = (0, path_1.resolve)(`${projectPath}/server/dataloaders/${controller}-dataloader.js`);
     (0, utils_1.mkdirSync)(path_1.default.dirname(dataLoaderPath));
     fs_1.default.writeFileSync(dataLoaderPath, dataLoaderGenerator.generate());
     console.log(`🚀 已生成 DataLoader 文件: ${dataLoaderPath}`);

package/lib/generators/dataloader-generator.d.ts

@@ -1,7 +1,7 @@
 import { BaseGenerator } from "./base-generator";
 /**
  * DataLoader生成器
- * 自动生成对应的 DataLoader 文件
+ * 自动生成对应的 DataLoader JavaScript 文件
  */
 export declare class DataLoaderGenerator extends BaseGenerator {
     generate(): string;

package/lib/generators/dataloader-generator.js

@@ -4,34 +4,24 @@ exports.DataLoaderGenerator = void 0;
 const base_generator_1 = require("./base-generator");
 /**
  * DataLoader生成器
- * 自动生成对应的 DataLoader 文件
+ * 自动生成对应的 DataLoader JavaScript 文件
  */
 class DataLoaderGenerator extends base_generator_1.BaseGenerator {
     generate() {
         const capitalizedController = this.getCapitalizedController();
         const selectFields = this.fields.map((f) => f.name).join(", ");
-        // const searchableFields = this.getSearchableFields(); // 暂时注释掉未使用的变量
-        return `import DataLoader from 'dataloader';
-import { executeQuery } from '../utils/common';
+        return `const DataLoader = require('dataloader');
+const { executeQuery } = require('../utils/common');
 
 /**
  * ${capitalizedController} DataLoader
  * 针对 ${this.controller} 表的批量数据加载器，解决 N+1 查询问题
  */
-export class ${capitalizedController}DataLoader {
-  // 按 ID 批量加载 ${this.controller}
-  public readonly byId: DataLoader<number, any>;
-  
-  // 按名称批量加载 ${this.controller}  
-  public readonly byName: DataLoader<string, any>;
-  
-  // 按名称模糊搜索 ${this.controller}
-  public readonly searchByName: DataLoader<string, any[]>;
-
+class ${capitalizedController}DataLoader {
   constructor() {
     // 按 ID 批量加载
     this.byId = new DataLoader(
-      async (ids: readonly number[]) => {
+      async (ids) => {
         try {
           console.log(\`🔍 DataLoader: 批量加载 \${ids.length} 个 ${this.controller} by ID\`);
           
@@ -42,7 +32,7 @@ export class ${capitalizedController}DataLoader {
           
           // 确保返回顺序与输入 keys 一致，未找到的返回 null
           return ids.map(id => 
-            results.find((row: any) => row.id === id) || null
+            results.find((row) => row.id === id) || null
           );
         } catch (error) {
           console.error('DataLoader byId 批量加载失败:', error);
@@ -58,7 +48,7 @@ export class ${capitalizedController}DataLoader {
 
     // 按名称批量加载
     this.byName = new DataLoader(
-      async (names: readonly string[]) => {
+      async (names) => {
         try {
           console.log(\`🔍 DataLoader: 批量加载 \${names.length} 个 ${this.controller} by name\`);
           
@@ -69,7 +59,7 @@ export class ${capitalizedController}DataLoader {
           
           // 确保返回顺序与输入 keys 一致
           return names.map(name => 
-            results.find((row: any) => row.name === name) || null
+            results.find((row) => row.name === name) || null
           );
         } catch (error) {
           console.error('DataLoader byName 批量加载失败:', error);
@@ -85,7 +75,7 @@ export class ${capitalizedController}DataLoader {
 
     // 按名称模糊搜索（返回数组）
     this.searchByName = new DataLoader(
-      async (searchTerms: readonly string[]) => {
+      async (searchTerms) => {
         try {
           console.log(\`🔍 DataLoader: 批量搜索 \${searchTerms.length} 个关键词\`);
           
@@ -116,7 +106,7 @@ export class ${capitalizedController}DataLoader {
   /**
    * 清除所有缓存
    */
-  clearAll(): void {
+  clearAll() {
     this.byId.clearAll();
     this.byName.clearAll();
     this.searchByName.clearAll();
@@ -126,21 +116,21 @@ export class ${capitalizedController}DataLoader {
   /**
    * 清除特定 ID 的缓存
    */
-  clearById(id: number): void {
+  clearById(id) {
     this.byId.clear(id);
   }
 
   /**
    * 清除特定名称的缓存
    */
-  clearByName(name: string): void {
+  clearByName(name) {
     this.byName.clear(name);
   }
 
   /**
    * 预加载数据到缓存
    */
-  prime(id: number, data: any): void {
+  prime(id, data) {
     this.byId.prime(id, data);
     if (data && data.name) {
       this.byName.prime(data.name, data);
@@ -171,9 +161,11 @@ export class ${capitalizedController}DataLoader {
 /**
  * 创建 ${capitalizedController} DataLoader 实例
  */
-export function create${capitalizedController}DataLoader(): ${capitalizedController}DataLoader {
+function create${capitalizedController}DataLoader() {
   return new ${capitalizedController}DataLoader();
-}`;
+}
+
+module.exports = { ${capitalizedController}DataLoader, create${capitalizedController}DataLoader };`;
     }
     /**
      * 生成外键 DataLoader
@@ -190,7 +182,7 @@ export function create${capitalizedController}DataLoader(): ${capitalizedControl
             return `
     // 按 ${fk.name} 批量加载相关的 ${this.controller}
     this.by${capitalizedRelated}Id = new DataLoader(
-      async (${fk.name}s: readonly number[]) => {
+      async (${fk.name}s) => {
         try {
           console.log(\`🔍 DataLoader: 批量加载 \${${fk.name}s.length} 个 ${this.controller} by ${fk.name}\`);
           
@@ -201,7 +193,7 @@ export function create${capitalizedController}DataLoader(): ${capitalizedControl
           
           // 按外键分组
           return ${fk.name}s.map(${fk.name} => 
-            results.filter((row: any) => row.${fk.name} === ${fk.name})
+            results.filter((row) => row.${fk.name} === ${fk.name})
           );
         } catch (error) {
           console.error('DataLoader by${capitalizedRelated}Id 批量加载失败:', error);

package/lib/generators/page-generator.js

@@ -48,7 +48,7 @@ import { get${capitalizedController}Service } from '@/service/${this.controller}
 import { RootState, AppDispatch } from '@/redux/store'
 import _ from 'lodash'
 import { useTranslation } from 'next-i18next'
-import { getAntdLocale } from '@/utils/i18n'
+import { getAntdLocale, formatDateTime } from '@/utils/i18n'
 import { useRouter } from 'next/router'
 import { handleXSS, checkModalObj } from '@/utils/common'
 import { UploadOutlined } from '@ant-design/icons'
@@ -501,7 +501,7 @@ export default Page`;
             }
             // 根据字段类型设置特定属性
             if (field.type === "timestamp" || field.type === "date" || field.type === "datetime") {
-                column += `,\n      render: (text: string) => text ? new Date(text).toLocaleString() : '-'`;
+                column += `,\n      render: (text: string) => text ? formatDateTime(text) : '-'`;
             }
             else if (field.type === "integer" || field.type === "decimal") {
                 column += `,\n      align: 'center' as const`;

package/lib/server/dataloaders/index.d.ts

@@ -1,11 +1,8 @@
-import { TemplateDataLoader } from "./template-dataloader";
 /**
  * DataLoader 上下文接口
  */
 export interface DataLoaderContext extends Record<string, unknown> {
-    dataloaders: {
-        template: TemplateDataLoader;
-    };
+    dataloaders: Record<string, any>;
 }
 /**
  * 创建 DataLoader 上下文
@@ -15,23 +12,7 @@ export declare function createDataLoaderContext(): DataLoaderContext;
 /**
  * DataLoader 统计信息
  */
-export declare function getDataLoaderStats(context: DataLoaderContext): {
-    template: {
-        byId: {
-            cacheMap: any;
-            name: string;
-        };
-        byName: {
-            cacheMap: any;
-            name: string;
-        };
-        searchByName: {
-            cacheMap: any;
-            name: string;
-        };
-    };
-    timestamp: string;
-};
+export declare function getDataLoaderStats(context: DataLoaderContext): Record<string, any>;
 /**
  * 清除所有 DataLoader 缓存
  */

package/lib/server/dataloaders/index.js

@@ -1,16 +1,79 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDataLoaderContext = createDataLoaderContext;
 exports.getDataLoaderStats = getDataLoaderStats;
 exports.clearAllDataLoaderCache = clearAllDataLoaderCache;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
 const template_dataloader_1 = require("./template-dataloader");
+/**
+ * 加载项目中的自定义 DataLoader
+ * 只加载编译后的 JavaScript 文件 (*.js)
+ */
+function loadProjectDataLoaders() {
+    const projectDataLoadersPath = (0, path_1.join)(process.cwd(), "server", "dataloaders");
+    const dataLoaders = {};
+    if (!fs_1.default.existsSync(projectDataLoadersPath)) {
+        return dataLoaders;
+    }
+    try {
+        const files = fs_1.default.readdirSync(projectDataLoadersPath);
+        let loadedCount = 0;
+        files.forEach((file) => {
+            // 只加载 JavaScript dataloader 文件：*-dataloader.js
+            const match = file.match(/^([a-z_]+)-?_dataloader\.js$/i);
+            if (match) {
+                const moduleName = match[1]; // 提取模块名，如 'product'
+                const filePath = (0, path_1.join)(projectDataLoadersPath, file);
+                try {
+                    // 清除 require 缓存，确保每次都能重新加载
+                    delete require.cache[require.resolve(filePath)];
+                    // 加载 JavaScript DataLoader 文件
+                    const loaderModule = require(filePath);
+                    // 获取 DataLoader 类的构造函数或工厂函数
+                    const DataLoaderClass = loaderModule.default || loaderModule;
+                    if (typeof DataLoaderClass === "function") {
+                        const instance = new DataLoaderClass();
+                        dataLoaders[moduleName] = instance;
+                        loadedCount++;
+                    }
+                    else {
+                        // 尝试工厂函数
+                        const factoryName = `create${moduleName.charAt(0).toUpperCase() + moduleName.slice(1)}DataLoader`;
+                        const createFunc = loaderModule[factoryName] || loaderModule.createProductDataLoader;
+                        if (typeof createFunc === "function") {
+                            dataLoaders[moduleName] = createFunc();
+                            loadedCount++;
+                        }
+                    }
+                }
+                catch (error) {
+                    console.warn(`⚠️  加载 DataLoader 失败: ${file}`, error.message);
+                }
+            }
+        });
+        if (loadedCount > 0) {
+            console.log(`📦 共加载 ${loadedCount} 个自定义 DataLoader: ${Object.keys(dataLoaders).join(", ")}`);
+        }
+        return dataLoaders;
+    }
+    catch (error) {
+        console.warn("⚠️  加载项目 DataLoader 时出错:", error);
+        return dataLoaders;
+    }
+}
 /**
  * 创建 DataLoader 上下文
  * 每个 GraphQL 请求都会创建新的 DataLoader 实例，确保请求隔离
  */
 function createDataLoaderContext() {
+    const projectDataLoaders = loadProjectDataLoaders();
     return {
         dataloaders: {
+            ...projectDataLoaders,
             template: (0, template_dataloader_1.createTemplateDataLoader)(),
         },
     };
@@ -19,15 +82,33 @@ function createDataLoaderContext() {
  * DataLoader 统计信息
  */
 function getDataLoaderStats(context) {
-    return {
-        template: context.dataloaders.template.getStats(),
+    const stats = {
         timestamp: new Date().toISOString(),
     };
+    if (context.dataloaders) {
+        Object.keys(context.dataloaders).forEach((key) => {
+            const loader = context.dataloaders[key];
+            if (loader && typeof loader.getStats === "function") {
+                stats[key] = loader.getStats();
+            }
+            else {
+                stats[key] = { name: key, status: "no stats" };
+            }
+        });
+    }
+    return stats;
 }
 /**
  * 清除所有 DataLoader 缓存
  */
 function clearAllDataLoaderCache(context) {
-    context.dataloaders.template.clearAll();
+    if (context.dataloaders) {
+        Object.keys(context.dataloaders).forEach((key) => {
+            const loader = context.dataloaders[key];
+            if (loader && typeof loader.clearAll === "function") {
+                loader.clearAll();
+            }
+        });
+    }
     console.log("🧹 所有 DataLoader 缓存已清空");
 }

package/lib/server/debug/dataloader-debug.d.ts

@@ -19,23 +19,7 @@ export declare const dataLoaderStatsResolver: {
         };
         loaders: any[];
         recommendations: string[];
-        contextStats: {
-            template: {
-                byId: {
-                    cacheMap: any;
-                    name: string;
-                };
-                byName: {
-                    cacheMap: any;
-                    name: string;
-                };
-                searchByName: {
-                    cacheMap: any;
-                    name: string;
-                };
-            };
-            timestamp: string;
-        } | null;
+        contextStats: Record<string, any> | null;
         timestamp: string;
     }>;
     resetDataLoaderStats: () => Promise<{

package/lib/server/utils/dataloader-monitor.d.ts

@@ -67,21 +67,5 @@ export declare function getDataLoaderHealth(context?: DataLoaderContext): {
     };
     loaders: any[];
     recommendations: string[];
-    contextStats: {
-        template: {
-            byId: {
-                cacheMap: any;
-                name: string;
-            };
-            byName: {
-                cacheMap: any;
-                name: string;
-            };
-            searchByName: {
-                cacheMap: any;
-                name: string;
-            };
-        };
-        timestamp: string;
-    } | null;
+    contextStats: Record<string, any> | null;
 };