nsgm-cli 2.1.34 → 2.1.36

package/client/redux/template/manage/reducers.ts

@@ -10,7 +10,7 @@ const initialState = {
 };
 
 export const templateManageReducer = (state = initialState, { type, payload }) => {
-  const { template } = state;
+  const template = state.template || { totalCounts: 0, items: [] };
   const { totalCounts, items } = template;
   let newItems: any = [];
 

package/lib/cli/commands/delete-config.js

@@ -79,14 +79,14 @@ const cleanupReducers = (controller, reducersPath) => {
 const cleanupMenu = (controller, menuPath) => {
     // 读取文件内容
     let content = fs_1.default.readFileSync(menuPath, "utf8");
-    // 删除所有匹配的菜单项（使用与 generate_delete.ts 相同的正则）
-    content = content.replace(new RegExp(`,?\\s*\\{\\s*//\\s*${controller}_.*_start[\\s\\S]*?//\\s*${controller}_.*_end\\s*\\}\\s*,?`, "gm"), "");
-    // 修复连续逗号
+    // 删除所有匹配的菜单项（使用与 generate_delete.ts 相同的正则，替换为逗号）
+    content = content.replace(new RegExp(`,?\\s*\\{\\s*//\\s*${controller}_.*_start[\\s\\S]*?//\\s*${controller}_.*_end\\s*\\}\\s*,?`, "gm"), ",");
+    // 修复连续逗号（删除可能留下 ,,）
     content = content.replace(/,,+/g, ",");
-    // 修复对象前多余的逗号
+    // 修复数组开头多余的逗号 ([, { -> [ {)
+    content = content.replace(/\[\s*,\s*\{/gm, "[\n  {");
+    // 修复对象前多余的逗号（, { -> {）
     content = content.replace(/\n\s*,\s*\{/gm, "\n  {");
-    // 修复数组中缺失的逗号
-    content = content.replace(/(\})\s*(\{)/gm, "$1,\n  $2");
     // 清理缩进问题
     content = content.replace(/^[ ]{0,2}\/\*\{/gm, "    /*{");
     content = content.replace(/^[ ]{0,4}key:/gm, "      key:");

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

@@ -3,6 +3,7 @@ import { BaseGenerator } from "./base-generator";
  * Resolver生成器
  */
 export declare class ResolverGenerator extends BaseGenerator {
+    private getQuotedTableName;
     generate(): string;
     private generateSearchConditions;
     private generateNewValidationCalls;
@@ -10,6 +11,7 @@ export declare class ResolverGenerator extends BaseGenerator {
     private generateUpdateValidation;
     private generateUpdateValues;
     private generateBatchReturnObject;
+    private generateBatchInsertValues;
     private generateDataLoaderSearchLogic;
     private generateNewRecordObject;
 }

package/lib/generators/resolver-generator.js

@@ -6,11 +6,20 @@ const base_generator_1 = require("./base-generator");
  * Resolver生成器
  */
 class ResolverGenerator extends base_generator_1.BaseGenerator {
+    // 获取带反引号的表名（防止 MySQL 保留关键字冲突）
+    getQuotedTableName() {
+        return `\`${this.controller}\``;
+    }
     generate() {
+        // @ts-ignore - Variable is used in generated template string
         const selectFields = this.fields.map((f) => f.name).join(", ");
         const insertFields = this.getFormFields();
         const searchableFields = this.getSearchableFields();
+        // @ts-ignore - Variable is used in generated template string
+        const quotedTableName = this.getQuotedTableName();
+        // @ts-ignore - Variable is used in generated template string
         const insertFieldNames = insertFields.map((f) => f.name).join(", ");
+        // @ts-ignore - Variable is used in generated template string
         const insertPlaceholders = insertFields.map(() => "?").join(", ");
         const insertValues = insertFields
             .map((f) => {
@@ -21,6 +30,7 @@ class ResolverGenerator extends base_generator_1.BaseGenerator {
         })
             .join(", ");
         const searchConditions = this.generateSearchConditions(searchableFields);
+        // @ts-ignore - Variable is used in generated template string
         const updateFields = insertFields.map((f) => `${f.name} = ?`).join(", ");
         return `const { executeQuery, executePaginatedQuery } = require('../../utils/common')
 const { validateInteger, validatePagination, validateId } = require('../../utils/validation')
@@ -30,13 +40,13 @@ module.exports = {
     ${this.controller}: async ({ page = 0, pageSize = 10 }) => {
         try {
             const { page: validPage, pageSize: validPageSize } = validatePagination(page, pageSize);
-            
-            const sql = 'SELECT ${selectFields} FROM ${this.controller} LIMIT ? OFFSET ?';
-            const countSql = 'SELECT COUNT(*) as counts FROM ${this.controller}';
+
+            const sql = \`SELECT \${selectFields} FROM \${quotedTableName} LIMIT ? OFFSET ?\`;
+            const countSql = \`SELECT COUNT(*) as counts FROM \${quotedTableName}\`;
             const values = [validPageSize, validPage * validPageSize];
 
             console.log('执行分页查询:', { sql, values, countSql });
-            
+
             return await executePaginatedQuery(sql, countSql, values);
         } catch (error) {
             console.error('获取${this.controller}列表失败:', error.message);
@@ -48,16 +58,16 @@ module.exports = {
     ${this.controller}Get: async ({ id }, context) => {
         try {
             const validId = validateId(id);
-            
+
             console.log('🚀 使用 DataLoader 根据ID查询${this.controller}:', { id: validId });
-            
+
             // 使用 DataLoader 批量加载，自动去重和缓存
             const result = await context.dataloaders.${this.controller}.byId.load(validId);
-            
+
             if (!result) {
                 throw new Error(\`ID为 \${validId} 的${this.controller}不存在\`);
             }
-            
+
             return result;
         } catch (error) {
             console.error('获取${this.controller}失败:', error.message);
@@ -71,15 +81,15 @@ module.exports = {
             if (!Array.isArray(ids) || ids.length === 0) {
                 throw new Error('ID列表不能为空');
             }
-            
+
             // 验证所有ID
             const validIds = ids.map(id => validateId(id));
-            
+
             console.log('🚀 使用 DataLoader 批量查询${this.controller}:', { ids: validIds });
-            
+
             // DataLoader 自动批量处理，一次查询获取所有数据
             const results = await context.dataloaders.${this.controller}.byId.loadMany(validIds);
-            
+
             // 过滤掉 null 结果（未找到的记录）
             return results.filter(result => result !== null && !(result instanceof Error));
         } catch (error) {
@@ -92,23 +102,23 @@ module.exports = {
     ${this.controller}Search: async ({ page = 0, pageSize = 10, data = {} }, context) => {
         try {
             const { page: validPage, pageSize: validPageSize } = validatePagination(page, pageSize);
-            
+
             ${this.generateDataLoaderSearchLogic(searchableFields)}
-            
+
             // 原始查询方式（作为备用）
             const values = [];
             const countValues = [];
-            
+
             let whereSql = '';
 ${searchConditions}
 
-            const sql = \`SELECT ${selectFields} FROM ${this.controller} WHERE 1=1\${whereSql} LIMIT ? OFFSET ?\`;
-            const countSql = \`SELECT COUNT(*) as counts FROM ${this.controller} WHERE 1=1\${whereSql}\`;
-            
+            const sql = \`SELECT \${selectFields} FROM \${quotedTableName} WHERE 1=1\${whereSql} LIMIT ? OFFSET ?\`;
+            const countSql = \`SELECT COUNT(*) as counts FROM \${quotedTableName} WHERE 1=1\${whereSql}\`;
+
             values.push(validPageSize, validPage * validPageSize);
-            
+
             console.log('搜索${this.controller}（备用查询）:', { sql, values, countSql, countValues });
-            
+
             return await executePaginatedQuery(sql, countSql, values, countValues);
         } catch (error) {
             console.error('搜索${this.controller}失败:', error.message);
@@ -120,22 +130,22 @@ ${searchConditions}
     ${this.controller}Add: async ({ data }, context) => {
         try {
 ${this.generateNewValidationCalls(insertFields)}
-            
-            const sql = 'INSERT INTO ${this.controller} (${insertFieldNames}) VALUES (${insertPlaceholders})';
+
+            const sql = \`INSERT INTO \${quotedTableName} (\${insertFieldNames}) VALUES (\${insertPlaceholders})\`;
             const values = [${insertValues}];
-            
+
             console.log('添加${this.controller}:', { sql, values });
-            
+
             const results = await executeQuery(sql, values);
             const insertId = results.insertId;
-            
+
             // 预加载新数据到 DataLoader 缓存
             if (insertId && context?.dataloaders?.${this.controller}) {
                 const newRecord = { id: insertId, ${this.generateNewRecordObject(insertFields)} };
                 context.dataloaders.${this.controller}.prime(insertId, newRecord);
                 console.log('🚀 新${this.controller}已预加载到 DataLoader 缓存:', newRecord);
             }
-            
+
             return insertId;
         } catch (error) {
             console.error('添加${this.controller}失败:', error.message);
@@ -149,7 +159,7 @@ ${this.generateNewValidationCalls(insertFields)}
             if (!Array.isArray(datas) || datas.length === 0) {
                 throw new Error('批量添加数据不能为空');
             }
-            
+
             // 验证所有数据并转换
             const validatedDatas = datas.map((data, index) => {
                 try {
@@ -159,10 +169,10 @@ ${this.generateBatchValidation(insertFields)}
                     throw new Error(\`第 \${index + 1} 条数据验证失败: \${error.message}\`);
                 }
             });
-            
-            const placeholders = validatedDatas.map(() => '(${insertPlaceholders})').join(',');
-            const sql = \`INSERT INTO ${this.controller} (${insertFieldNames}) VALUES \${placeholders}\`;
-            const values = validatedDatas.flatMap(data => [${insertFields.map((f) => `data.${f.name}`).join(", ")}]);
+
+            const placeholders = validatedDatas.map(() => \`(\${insertPlaceholders})\`).join(',');
+            const sql = \`INSERT INTO \${quotedTableName} (\${insertFieldNames}) VALUES \${placeholders}\`;
+            const values = validatedDatas.flatMap(data => [${this.generateBatchInsertValues(insertFields)}]);
             
             console.log('批量添加${this.controller}:', { sql, values });
             
@@ -185,7 +195,7 @@ ${this.generateBatchValidation(insertFields)}
             
 ${this.generateUpdateValidation(insertFields)}
             
-            const sql = 'UPDATE ${this.controller} SET ${updateFields} WHERE id = ?';
+            const sql = \`UPDATE \${quotedTableName} SET \${updateFields} WHERE id = ?\`;
             const values = [${this.generateUpdateValues(insertFields)}, validId];
             
             console.log('更新${this.controller}:', { sql, values });
@@ -214,7 +224,7 @@ ${this.generateUpdateValidation(insertFields)}
         try {
             const validId = validateId(id);
             
-            const sql = 'DELETE FROM ${this.controller} WHERE id = ?';
+            const sql = \`DELETE FROM \${quotedTableName} WHERE id = ?\`;
             const values = [validId];
             
             console.log('删除${this.controller}:', { sql, values });
@@ -255,7 +265,7 @@ ${this.generateUpdateValidation(insertFields)}
             });
             
             const placeholders = validIds.map(() => '?').join(',');
-            const sql = \`DELETE FROM ${this.controller} WHERE id IN (\${placeholders})\`;
+            const sql = \`DELETE FROM \${quotedTableName} WHERE id IN (\${placeholders})\`;
             
             console.log('批量删除${this.controller}:', { sql, values: validIds });
             
@@ -388,9 +398,9 @@ ${this.generateUpdateValidation(insertFields)}
         })
             .join(", ");
     }
-    // private generateBatchInsertValues(insertFields: any[]): string {
-    //   return insertFields.map((f) => `data.${f.name}`).join(", ");
-    // }
+    generateBatchInsertValues(insertFields) {
+        return insertFields.map((f) => `data.${f.name}`).join(", ");
+    }
     generateDataLoaderSearchLogic(searchableFields) {
         if (searchableFields.length === 0)
             return "";