nsgm-cli 2.1.14 → 2.1.15

package/client/utils/suppressWarnings.ts

@@ -0,0 +1,32 @@
+// 这个文件需要在所有 React 组件加载之前执行
+// 用于抑制 useLayoutEffect 在服务端渲染时的警告
+
+if (typeof window === 'undefined') {
+  // 服务端环境
+  const originalError = console.error
+  const originalWarn = console.warn
+
+  console.error = function (...args) {
+    const message = args[0]
+    if (
+      typeof message === 'string' &&
+      (message.includes('useLayoutEffect does nothing on the server') ||
+        message.includes('Warning: useLayoutEffect does nothing on the server'))
+    ) {
+      return
+    }
+    originalError.apply(console, args)
+  }
+
+  console.warn = function (...args) {
+    const message = args[0]
+    if (
+      typeof message === 'string' &&
+      (message.includes('useLayoutEffect does nothing on the server') ||
+        message.includes('Warning: useLayoutEffect does nothing on the server'))
+    ) {
+      return
+    }
+    originalWarn.apply(console, args)
+  }
+}

package/eslint.config.js

@@ -1,7 +1,7 @@
-const js = require('@eslint/js');
-const typescript = require('@typescript-eslint/eslint-plugin');
-const typescriptParser = require('@typescript-eslint/parser');
-const prettier = require('eslint-plugin-prettier');
+const js = require('@eslint/js')
+const typescript = require('@typescript-eslint/eslint-plugin')
+const typescriptParser = require('@typescript-eslint/parser')
+const prettier = require('eslint-plugin-prettier')
 
 module.exports = [
   js.configs.recommended,
@@ -29,7 +29,7 @@ module.exports = [
     },
     plugins: {
       '@typescript-eslint': typescript,
-      'prettier': prettier
+      prettier: prettier
     },
     rules: {
       'no-console': 'off', // 允许 console 语句用于调试
@@ -46,14 +46,17 @@ module.exports = [
       'prefer-arrow-callback': 'warn',
       '@typescript-eslint/no-var-requires': 'off', // 允许 require
       '@typescript-eslint/no-explicit-any': 'warn', // 警告但不报错
-      '@typescript-eslint/no-unused-vars': ['warn', { 
-        argsIgnorePattern: '^_',
-        varsIgnorePattern: '^_'
-      }],
+      '@typescript-eslint/no-unused-vars': [
+        'warn',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_'
+        }
+      ],
       '@typescript-eslint/no-inferrable-types': 'warn',
       '@typescript-eslint/prefer-optional-chain': 'warn',
       '@typescript-eslint/no-explicit-any': 'off',
-      'prettier/prettier': 'error'
+      'prettier/prettier': 'off'
     }
   },
   {
@@ -82,14 +85,14 @@ module.exports = [
     },
     plugins: {
       '@typescript-eslint': typescript,
-      'prettier': prettier
+      prettier: prettier
     },
     rules: {
       'no-console': 'off',
       'no-undef': 'off',
       'no-unused-vars': 'off',
       '@typescript-eslint/no-explicit-any': 'off',
-      'prettier/prettier': 'error'
+      'prettier/prettier': 'off'
     }
   },
   {
@@ -113,12 +116,6 @@ module.exports = [
     }
   },
   {
-    ignores: [
-      'node_modules/**',
-      'lib/**',
-      '.next/**',
-      'coverage/**',
-      '*.config.js'
-    ]
+    ignores: ['node_modules/**', 'lib/**', '.next/**', 'coverage/**', '*.config.js']
   }
-];
+]

package/generation/client/redux/reducers.ts

@@ -2,4 +2,4 @@
 
 export default {
   //templateManage: templateManageReducer,
-}
+}

package/generation/client/utils/menu.tsx

@@ -1,34 +1,40 @@
 import { BookOutlined, SolutionOutlined } from '@ant-design/icons'
 import React from 'react'
 
-let key = 1
+// 统一的菜单配置函数，支持可选的多语言翻译
+export const getMenuConfig = (t?: (key: string) => string) => {
+  let key = 1
 
-export default [
-  {
-    key: (++key).toString(),
-    text: '', // 空目录不显示，为了使用 SolutionOutlined 而不报错
-    url: '/',
-    icon: <SolutionOutlined rev={undefined} />,
-    subMenus: null
-  },
-  {
-    key: (++key).toString(),
-    text: '介绍',
-    url: '/',
-    icon: <BookOutlined rev={undefined} />,
-    subMenus: null
-  },
-  /*{
-    key: (++key).toString(),
-    text: '模板',
-    url: '/template/manage',
-    icon: <SolutionOutlined rev={undefined} />,
-    subMenus: [
-      {
-        key: key + '_1',
-        text: '模板1',
-        url: '/template/manage'
-      }
-    ]
-  }*/
-]
+  return [
+    {
+      key: (++key).toString(),
+      text: '', // 空目录不显示，为了使用 SolutionOutlined 而不报错
+      url: '/',
+      icon: <SolutionOutlined rev={undefined} />,
+      subMenus: null,
+    },
+    {
+      key: (++key).toString(),
+      text: t ? t('layout:layout.menu.introduction') : '介绍',
+      url: '/',
+      icon: <BookOutlined rev={undefined} />,
+      subMenus: null,
+    },
+    /*{
+      key: (++key).toString(),
+      text: t ? t('layout:layout.menu.template') : '',
+      url: '/template/manage',
+      icon: <SolutionOutlined rev={undefined} />,
+      subMenus: [
+        {
+          key: `${key}_1`,
+          text: t ? t('layout:layout.menu.template1') : '',
+          url: '/template/manage',
+        },
+      ],
+    }*/
+  ]
+}
+
+// 默认导出不传翻译函数，使用中文
+export default getMenuConfig()

package/generation/env

@@ -0,0 +1,3 @@
+# Login Configuration  
+LOGIN_USERNAME=admin
+LOGIN_PASSWORD_HASH=$2b$10$CsZ7eZWpzOmDPN4IqwNMJOgqsz.zpFnAnuk4JsF8Nr4P7Hp19eMiy

package/generation/next.config.js

@@ -1,7 +1,11 @@
 const { nextConfig } = require('nsgm-cli')
+const { i18n } = require('./next-i18next.config')
 
 module.exports = (phase, defaultConfig) => {
-    let configObj = nextConfig(phase, defaultConfig)
+  let configObj = nextConfig(phase, defaultConfig)
 
-    return configObj
-}
+  // 确保国际化配置被正确应用
+  configObj.i18n = i18n
+
+  return configObj
+}

package/generation/package.json

@@ -38,6 +38,9 @@
     "eslint": "^9",
     "eslint-config-prettier": "^10",
     "eslint-plugin-prettier": "^5",
-    "prettier": "^3"
+    "prettier": "^3",
+    "next-i18next": "^15",
+    "react-i18next": "^15",
+    "i18next": "^24"
   }
-}
+}

package/generation/tsconfig.json

@@ -5,25 +5,20 @@
     "module": "commonjs",
     "declaration": true,
     "strict": true,
-    "lib": [
-      "dom",
-      "ES2022"
-    ],
+    "lib": ["dom", "ES2022"],
     "esModuleInterop": true,
     "allowJs": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "noEmit": false,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noImplicitAny": false,
     "incremental": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": [
-        "client/*"
-      ]
+      "@/*": ["client/*"]
     },
     "noUnusedLocals": true,
     "noUnusedParameters": true,
@@ -31,14 +26,6 @@
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": [
-    "client/**/*",
-    "pages/**/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "**/__tests__/*",
-    ".next",
-    "lib"
-  ]
-}
+  "include": ["client/**/*", "pages/**/*"],
+  "exclude": ["node_modules", "**/__tests__/*", ".next", "lib"]
+}

package/lib/cli/commands/create.js

@@ -47,10 +47,10 @@ exports.createCommand = {
                 const wizardResult = await utils_1.Prompt.createControllerWizard();
                 utils_1.Console.separator();
                 utils_1.Console.title('📋 控制器配置确认');
+                utils_1.Console.info(`项目目录: ${wizardResult.dictionary}`);
                 utils_1.Console.info(`控制器名称: ${wizardResult.controller}`);
                 utils_1.Console.info(`功能模块: 完整CRUD + 导入导出 + 批量删除`);
                 utils_1.Console.info(`描述: ${wizardResult.description}`);
-                utils_1.Console.info(`项目目录: ${wizardResult.dictionary}`);
                 utils_1.Console.info(`数据库表: ${wizardResult.includeDatabase ? '是' : '否'}`);
                 if (wizardResult.includeDatabase && wizardResult.fields.length > 0) {
                     const fieldNames = wizardResult.fields.map((field) => field.name).join(', ');

package/lib/cli/commands/delete.js

@@ -48,9 +48,9 @@ exports.deleteCommand = {
                 const wizardResult = await utils_1.Prompt.deleteControllerWizard();
                 utils_1.Console.separator();
                 utils_1.Console.title('📋 删除确认');
+                utils_1.Console.info(`项目目录: ${wizardResult.dictionary}`);
                 utils_1.Console.info(`控制器名称: ${wizardResult.controller}`);
                 utils_1.Console.info(`删除范围: ${wizardResult.action === 'all' ? '所有相关文件' : '指定操作'}`);
-                utils_1.Console.info(`项目目录: ${wizardResult.dictionary}`);
                 utils_1.Console.info(`删除数据库: ${wizardResult.deleteDatabase ? '是' : '否'}`);
                 utils_1.Console.separator();
                 const confirmed = await utils_1.Prompt.confirm('确认删除？此操作不可恢复！', false);

package/lib/cli/commands/init.js

@@ -13,7 +13,7 @@ exports.initCommand = {
     options: [
         {
             name: 'dictionary',
-            description: '项目目录名称',
+            description: '项目目录',
             default: '.',
             type: 'string',
         },
@@ -36,7 +36,7 @@ exports.initCommand = {
                 const wizardResult = await utils_1.Prompt.initWizard();
                 utils_1.Console.separator();
                 utils_1.Console.title('📋 项目配置确认');
-                utils_1.Console.info(`项目名称: ${wizardResult.projectName}`);
+                utils_1.Console.info(`项目目录: ${wizardResult.projectName}`);
                 utils_1.Console.info(`项目描述: ${wizardResult.description}`);
                 utils_1.Console.info(`作者: ${wizardResult.author}`);
                 utils_1.Console.info(`数据库: ${wizardResult.database ? '是' : '否'}`);
@@ -92,10 +92,10 @@ exports.initCommand = {
                     utils_1.Console.box(`项目已成功创建到 ${finalOptions.dictionary} 目录\n\n` +
                         `下一步:\n` +
                         `1. cd ${finalOptions.dictionary}\n` +
-                        `2. cp .env.example .env\n` +
-                        `3. npm run generate-password yourPassword\n` +
-                        `4. modify .env LOGIN_PASSWORD_HASH=yourEncryptedPassword\n` +
-                        `5. npm run dev`, 'success');
+                        `2. npm run dev\n\n` +
+                        `默认登录账号: admin/admin123\n` +
+                        `如需修改密码: npm run generate-password yourNewPassword\n` +
+                        `然后修改 .env 中的 LOGIN_PASSWORD_HASH`, 'success');
                 }
                 catch (error) {
                     spinner.fail('项目初始化失败');

package/lib/cli/utils/prompt.d.ts

@@ -68,7 +68,7 @@ export declare class Prompt {
         fields: FieldDefinition[];
     }>;
     /**
-     * 收集字段定义
+     * 收集字段定义 (简化版本)
      */
     static collectFieldDefinitions(): Promise<FieldDefinition[]>;
     /**

package/lib/cli/utils/prompt.js

@@ -90,14 +90,14 @@ class Prompt {
             {
                 type: 'input',
                 name: 'projectName',
-                message: '项目名称:',
+                message: '项目目录:',
                 default: 'my-nsgm-project',
                 validate: (input) => {
                     if (!input.trim())
-                        return '项目名称不能为空';
+                        return '项目目录不能为空';
                     // 允许路径格式，包括相对路径和绝对路径
                     if (!/^[a-zA-Z0-9\-_./\\]+$/.test(input))
-                        return '项目名称只能包含字母、数字、横线、下划线和路径分隔符';
+                        return '项目目录只能包含字母、数字、横线、下划线和路径分隔符';
                     return true;
                 },
             },
@@ -129,6 +129,17 @@ class Prompt {
         console_1.Console.title('📝 创建控制器向导 (包含完整CRUD + 导入导出 + 批量删除功能)');
         console_1.Console.newLine();
         const answers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'dictionary',
+                message: '项目目录:',
+                default: '.',
+                validate: (input) => {
+                    if (!input.trim())
+                        return '项目目录不能为空';
+                    return true;
+                },
+            },
             {
                 type: 'input',
                 name: 'controller',
@@ -147,17 +158,6 @@ class Prompt {
                 message: '控制器描述:',
                 default: (answers) => `${answers.controller} 控制器`,
             },
-            {
-                type: 'input',
-                name: 'dictionary',
-                message: '项目目录:',
-                default: '.',
-                validate: (input) => {
-                    if (!input.trim())
-                        return '项目目录不能为空';
-                    return true;
-                },
-            },
             {
                 type: 'confirm',
                 name: 'useCustomFields',
@@ -193,11 +193,10 @@ class Prompt {
         return answers;
     }
     /**
-     * 收集字段定义
+     * 收集字段定义 (简化版本)
      */
     static async collectFieldDefinitions() {
         const fields = [];
-        let addMore = true;
         // 默认添加ID字段
         fields.push({
             name: 'id',
@@ -207,97 +206,57 @@ class Prompt {
             isPrimaryKey: true,
             isAutoIncrement: true,
         });
-        console_1.Console.info('💡 提示：系统会自动添加 create_date 和 update_date 字段');
-        while (addMore) {
-            const fieldAnswers = await inquirer_1.default.prompt([
-                {
-                    type: 'input',
-                    name: 'name',
-                    message: '字段名称:',
-                    validate: (input) => {
-                        if (!input.trim())
-                            return '字段名称不能为空';
-                        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(input))
-                            return '字段名称只能包含字母、数字和下划线，且以字母或下划线开头';
-                        if (fields.some((f) => f.name === input.trim()))
-                            return '字段名称已存在';
-                        if (['create_date', 'update_date'].includes(input.trim()))
-                            return '系统字段将自动添加';
-                        return true;
-                    },
-                },
-                {
-                    type: 'list',
-                    name: 'type',
-                    message: '字段类型:',
-                    choices: [
-                        { name: 'varchar - 字符串', value: 'varchar' },
-                        { name: 'text - 长文本', value: 'text' },
-                        { name: 'integer - 整数', value: 'integer' },
-                        { name: 'decimal - 小数', value: 'decimal' },
-                        { name: 'boolean - 布尔值', value: 'boolean' },
-                        { name: 'date - 日期', value: 'date' },
-                        { name: 'datetime - 日期时间', value: 'datetime' },
-                        { name: 'timestamp - 时间戳', value: 'timestamp' },
-                    ],
-                },
-                {
-                    type: 'input',
-                    name: 'length',
-                    message: '字段长度 (可选，数字类型可指定精度):',
-                    when: (answers) => ['varchar', 'decimal'].includes(answers.type),
-                    default: (answers) => (answers.type === 'varchar' ? '255' : '10,2'),
-                },
-                {
-                    type: 'confirm',
-                    name: 'required',
-                    message: '是否必填:',
-                    default: false,
-                },
-                {
-                    type: 'input',
-                    name: 'comment',
-                    message: '字段注释:',
-                    default: (answers) => answers.name,
-                },
-                {
-                    type: 'confirm',
-                    name: 'showInList',
-                    message: '是否在列表页显示:',
-                    default: true,
-                },
-                {
-                    type: 'confirm',
-                    name: 'showInForm',
-                    message: '是否在表单中显示:',
-                    default: true,
-                },
-                {
-                    type: 'confirm',
-                    name: 'searchable',
-                    message: '是否可搜索:',
-                    default: (answers) => answers.type === 'varchar',
-                },
+        console_1.Console.info('💡 输入字段信息，输入空白字段名结束添加');
+        let fieldIndex = 1;
+        while (true) {
+            const fieldName = await this.input(`字段${fieldIndex} 名称 (留空结束):`);
+            if (!fieldName.trim())
+                break;
+            // 验证字段名
+            if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(fieldName)) {
+                console_1.Console.error('字段名称格式无效，请重新输入');
+                continue;
+            }
+            if (fields.some((f) => f.name === fieldName) || ['create_date', 'update_date'].includes(fieldName)) {
+                console_1.Console.error('字段名称已存在或为系统保留字段，请重新输入');
+                continue;
+            }
+            // 简化的字段类型选择
+            const fieldType = await this.select('字段类型:', [
+                'varchar',
+                'text',
+                'integer',
+                'decimal',
+                'boolean',
+                'date',
+                'datetime',
             ]);
-            fields.push({
-                name: fieldAnswers.name.trim(),
-                type: fieldAnswers.type,
-                length: fieldAnswers.length ? fieldAnswers.length.trim() : undefined,
-                required: fieldAnswers.required,
-                comment: fieldAnswers.comment.trim(),
-                showInList: fieldAnswers.showInList,
-                showInForm: fieldAnswers.showInForm,
-                searchable: fieldAnswers.searchable,
-            });
-            const continueAnswer = await inquirer_1.default.prompt([
-                {
-                    type: 'confirm',
-                    name: 'addMore',
-                    message: '是否继续添加字段:',
-                    default: false,
-                },
-            ]);
-            addMore = continueAnswer.addMore;
+            // 只对需要长度的类型询问长度
+            let length;
+            if (fieldType === 'varchar') {
+                length = await this.input('字符串长度:', '255');
+            }
+            else if (fieldType === 'decimal') {
+                length = await this.input('小数精度 (如: 10,2):', '10,2');
+            }
+            // 简化配置：只询问是否必填和注释
+            const required = await this.confirm('是否必填:', true);
+            const comment = await this.input('字段注释:', fieldName);
+            const field = {
+                name: fieldName,
+                type: fieldType,
+                required,
+                comment,
+                showInList: true, // 默认在列表显示
+                showInForm: true, // 默认在表单显示
+                searchable: fieldType === 'varchar', // varchar类型默认可搜索
+            };
+            // 只有当length有值时才添加
+            if (length) {
+                field.length = length;
+            }
+            fields.push(field);
+            fieldIndex++;
         }
         // 自动添加系统字段
         fields.push({
@@ -322,6 +281,17 @@ class Prompt {
         console_1.Console.title('🗑️ 删除控制器向导');
         console_1.Console.newLine();
         const answers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'dictionary',
+                message: '项目目录:',
+                default: '.',
+                validate: (input) => {
+                    if (!input.trim())
+                        return '项目目录不能为空';
+                    return true;
+                },
+            },
             {
                 type: 'input',
                 name: 'controller',
@@ -344,17 +314,6 @@ class Prompt {
                 ],
                 default: 'all',
             },
-            {
-                type: 'input',
-                name: 'dictionary',
-                message: '项目目录:',
-                default: '.',
-                validate: (input) => {
-                    if (!input.trim())
-                        return '项目目录不能为空';
-                    return true;
-                },
-            },
             {
                 type: 'confirm',
                 name: 'deleteDatabase',

package/lib/constants.d.ts

@@ -13,12 +13,15 @@ declare const publicPathSource = "../public";
 declare const publicPath = "./public";
 declare const scriptsPathSource = "../scripts";
 declare const scriptsPath = "./scripts";
+declare const typesPathSource = "../types";
+declare const typesPath = "./types";
 declare const reduxPath = "/redux";
 declare const servicePath = "/service";
 declare const styledPath = "/styled";
 declare const styledLayoutPath = "/layout";
 declare const utilsPath = "/utils";
 declare const layoutPath = "/layout";
+declare const componentsPath = "/components";
 declare const modulesPath = "/modules";
 declare const apisPath = "/apis";
 declare const sqlPath = "/sql";
@@ -35,6 +38,9 @@ declare const sourceServerPathGeneration: string;
 declare const sourcePagesPath: string;
 declare const sourcePublicPath: string;
 declare const sourceScriptsPath: string;
+declare const sourceTypesPath: string;
+declare const projectClientPath: string;
+declare const projectPublicPath: string;
 declare const destClientPath: string;
 declare const destClientReduxPath: string;
 declare const destClientServicePath: string;
@@ -50,9 +56,10 @@ declare const destServerUtilsPath: string;
 declare const destPagesPath: string;
 declare const destPublicPath: string;
 declare const destScriptsPath: string;
+declare const destTypesPath: string;
 declare const destClientUtilsMenuPath: string;
 declare const destClientReduxReducersAllPath: string;
 declare const destPublicHealthCheckPath: string;
 declare const destPackagePath: string;
 declare const destServerRestPath: string;
-export { sourceFolder, destFolder, isLocal, generationPath, clientPathSource, clientPath, serverPathSource, serverPath, pagesPathSource, pagesPath, publicPathSource, publicPath, scriptsPathSource, scriptsPath, reduxPath, servicePath, styledPath, styledLayoutPath, utilsPath, layoutPath, modulesPath, apisPath, sqlPath, utilsMenuPath, reduxReducersPath, slbHealthCheckPath, packagePath, restPath, sourceGenerationPath, sourceClientPath, sourceClientPathGeneration, sourceServerPath, sourceServerPathGeneration, sourcePagesPath, sourcePublicPath, sourceScriptsPath, destClientPath, destClientReduxPath, destClientServicePath, destClientStyledPath, destClientStyledLayoutPath, destClientUtilsPath, destClientLayoutPath, destServerPath, destServerModulesPath, destServerApisPath, destServerSqlPath, destServerUtilsPath, destPagesPath, destPublicPath, destScriptsPath, destClientUtilsMenuPath, destClientReduxReducersAllPath, destPublicHealthCheckPath, destPackagePath, destServerRestPath, mysqlUser, mysqlPassword, mysqlHost, mysqlPort, mysqlDatabase, };
+export { sourceFolder, destFolder, isLocal, generationPath, clientPathSource, clientPath, serverPathSource, serverPath, pagesPathSource, pagesPath, publicPathSource, publicPath, scriptsPathSource, scriptsPath, typesPathSource, typesPath, reduxPath, servicePath, styledPath, styledLayoutPath, utilsPath, layoutPath, componentsPath, modulesPath, apisPath, sqlPath, utilsMenuPath, reduxReducersPath, slbHealthCheckPath, packagePath, restPath, sourceGenerationPath, sourceClientPath, sourceClientPathGeneration, sourceServerPath, sourceServerPathGeneration, sourcePagesPath, sourcePublicPath, sourceScriptsPath, sourceTypesPath, projectClientPath, projectPublicPath, destClientPath, destClientReduxPath, destClientServicePath, destClientStyledPath, destClientStyledLayoutPath, destClientUtilsPath, destClientLayoutPath, destServerPath, destServerModulesPath, destServerApisPath, destServerSqlPath, destServerUtilsPath, destPagesPath, destPublicPath, destScriptsPath, destTypesPath, destClientUtilsMenuPath, destClientReduxReducersAllPath, destPublicHealthCheckPath, destPackagePath, destServerRestPath, mysqlUser, mysqlPassword, mysqlHost, mysqlPort, mysqlDatabase, };