nsgm-cli 2.1.31 → 2.1.33

package/client/layout/index.tsx

@@ -35,7 +35,7 @@ interface MenuItem {
 // 安全获取 prefix 的辅助函数
 const getPrefix = () => {
   try {
-    if (typeof process !== "undefined" && process.env && process.env.NEXT_PUBLIC_PREFIX) {
+    if (typeof process !== "undefined" && process.env?.NEXT_PUBLIC_PREFIX) {
       return process.env.NEXT_PUBLIC_PREFIX;
     }
   } catch {

package/client/utils/common.ts

@@ -4,7 +4,7 @@ export const getLocalEnv = () => {
   // 安全地访问 process.env，避免在浏览器中直接访问 process 对象
   let env = "uat";
   try {
-    if (typeof process !== "undefined" && process.env && process.env.NEXT_PUBLIC_ENV) {
+    if (typeof process !== "undefined" && process.env?.NEXT_PUBLIC_ENV) {
       env = process.env.NEXT_PUBLIC_ENV;
     }
   } catch {

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

@@ -5,8 +5,121 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteConfigCommand = void 0;
 const utils_1 = require("../utils");
-const generate_1 = require("../../generate");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const shelljs_1 = __importDefault(require("shelljs"));
+const utils_2 = require("../../utils");
+const constants_1 = require("../../constants");
+/**
+ * 生成删除路径
+ */
+const generateDeletePaths = (controller, dictionary) => {
+    const basePath = dictionary || process.cwd();
+    return {
+        destPagesController: path_1.default.join(basePath, "pages", controller),
+        destClientReduxController: path_1.default.join(basePath, "client", "redux", controller),
+        destClientServiceController: path_1.default.join(basePath, "client", "service", controller),
+        destClientStyledController: path_1.default.join(basePath, "client", "styled", controller),
+        destServerModulesController: path_1.default.join(basePath, "server", "modules", controller),
+        destServerApisController: path_1.default.join(basePath, "server", "apis", `${controller}.js`),
+        destServerSqlController: path_1.default.join(basePath, "server", "sql", `${controller}.sql`),
+        destServerDataLoader: path_1.default.join(basePath, "server", "dataloaders", `${controller}-dataloader.ts`),
+        destClientReduxReducersAllPath: path_1.default.join(basePath, "client", "redux", "reducers.ts"),
+        destServerRestPath: path_1.default.join(basePath, "server", "rest.js"),
+        destClientUtilsMenuPath: path_1.default.join(basePath, "client", "utils", "menu.tsx"),
+        destI18nZhCN: path_1.default.join(basePath, "public", "locales", "zh-CN", `${controller}.json`),
+        destI18nEnUS: path_1.default.join(basePath, "public", "locales", "en-US", `${controller}.json`),
+        destI18nJaJP: path_1.default.join(basePath, "public", "locales", "ja-JP", `${controller}.json`),
+    };
+};
+/**
+ * 删除文件和目录
+ */
+const deleteModuleFiles = (paths) => {
+    const directoriesToDelete = [
+        paths.destPagesController,
+        paths.destClientReduxController,
+        paths.destClientServiceController,
+        paths.destClientStyledController,
+        paths.destServerModulesController,
+    ];
+    const filesToDelete = [
+        paths.destServerApisController,
+        paths.destServerSqlController,
+        paths.destServerDataLoader,
+        paths.destI18nZhCN,
+        paths.destI18nEnUS,
+        paths.destI18nJaJP,
+    ];
+    directoriesToDelete.forEach((dir) => (0, utils_2.rmdirSync)(dir));
+    filesToDelete.forEach((file) => (0, utils_2.rmFileSync)(file));
+    console.log(`✅ 已删除 ${directoriesToDelete.length} 个目录和 ${filesToDelete.length} 个文件`);
+};
+/**
+ * 清理 reducers 配置
+ */
+const cleanupReducers = (controller, reducersPath) => {
+    // 删除 import 语句
+    shelljs_1.default.sed("-i", new RegExp(`^.*import.*from.*['"].*\\/${controller}\\/.*['"].*$`, "gm"), "", reducersPath);
+    // 删除 export 对象中的属性行
+    shelljs_1.default.sed("-i", new RegExp(`^\\s*${controller}\\w*:\\s*${controller}\\w*Reducer,?\\s*$`, "gm"), "", reducersPath);
+    // 修复连续逗号
+    shelljs_1.default.sed("-i", /,,+/g, ",", reducersPath);
+    // 修复对象末尾的逗号
+    shelljs_1.default.sed("-i", /,(\s*\n\s*\})/, "$1", reducersPath);
+    // 移除空对象中的逗号
+    shelljs_1.default.sed("-i", /\{\s*,\s*\}/, "{}", reducersPath);
+    // 标准化空行
+    shelljs_1.default.sed("-i", /\n\s*\n\s*\n/g, "\n\n", reducersPath);
+    console.log(`✅ 已清理 reducers 配置: ${controller}`);
+};
+/**
+ * 清理菜单配置
+ */
+const cleanupMenu = (controller, menuPath) => {
+    // 删除所有匹配的菜单项（匹配多行结构）
+    shelljs_1.default.sed("-i", new RegExp(`,?\\s*\\{\\s*//\\s*${controller}_\\w+_start[\\s\\S]*?//\\s*${controller}_\\w+_end[\\s\\S]*?\\n\\s*\\}\\s*,?`, "gm"), "", menuPath);
+    // 修复连续逗号
+    shelljs_1.default.sed("-i", /,,+/g, ",", menuPath);
+    // 修复对象前多余的逗号
+    shelljs_1.default.sed("-i", /\n\s*,\s*\{/gm, "\n  {", menuPath);
+    // 修复数组中缺失的逗号
+    shelljs_1.default.sed("-i", /(\})\s*(\{)/gm, "$1,\n  $2", menuPath);
+    // 清理缩进问题
+    shelljs_1.default.sed("-i", /^[ ]{0,2}\/\*\{/gm, "    /*{", menuPath);
+    shelljs_1.default.sed("-i", /^[ ]{0,4}key:/gm, "      key:", menuPath);
+    shelljs_1.default.sed("-i", /^[ ]{0,4}text:/gm, "      text:", menuPath);
+    shelljs_1.default.sed("-i", /^[ ]{0,4}url:/gm, "      url:", menuPath);
+    shelljs_1.default.sed("-i", /^[ ]{0,4}icon:/gm, "      icon:", menuPath);
+    shelljs_1.default.sed("-i", /^[ ]{0,4}subMenus:/gm, "      subMenus:", menuPath);
+    shelljs_1.default.sed("-i", /^[ ]{0,2}\}\*\//gm, "    }*/", menuPath);
+    console.log(`✅ 已清理菜单配置: ${controller}`);
+};
+/**
+ * 清理 REST API 配置
+ */
+const cleanupRestApi = (controller, restPath) => {
+    // 删除 require 语句
+    shelljs_1.default.sed("-i", new RegExp(`^const\\s+${controller}\\s*=\\s*require.*${controller}['"].*$`, "gm"), "", restPath);
+    // 删除 router.use 语句
+    shelljs_1.default.sed("-i", new RegExp(`^router\\.use\\(['"]\\/${controller}['"]\\s*,\\s*${controller}\\)\\s*$`, "gm"), "", restPath);
+    console.log(`✅ 已清理 REST API 配置: ${controller}`);
+};
+/**
+ * 删除数据库表
+ */
+const dropDatabaseTable = (controller) => {
+    try {
+        // 创建临时的 DROP TABLE SQL
+        const dropSql = `DROP TABLE IF EXISTS \`${controller}\`;`;
+        const mysqlCommand = `mysql -u${constants_1.mysqlUser} -p${constants_1.mysqlPassword} -h${constants_1.mysqlHost} -P${constants_1.mysqlPort} -e "${dropSql}"`;
+        shelljs_1.default.exec(mysqlCommand);
+        utils_1.Console.info(`已删除数据库表: ${controller}`);
+    }
+    catch (error) {
+        utils_1.Console.error(`删除数据库表失败: ${error}`);
+    }
+};
 /**
  * 从配置文件删除命令
  */
@@ -144,18 +257,30 @@ exports.deleteConfigCommand = {
             for (const module of targetModules) {
                 utils_1.Console.separator();
                 utils_1.Console.highlight(`🗑️ 删除模块 ${successCount + failureCount + 1}/${targetModules.length}: ${module.controller}`);
+                utils_1.Console.newLine();
                 try {
-                    const spinner = utils_1.Console.spinner("正在删除文件...", "red");
-                    spinner.start();
-                    // 调用核心删除函数
-                    (0, generate_1.deleteFiles)(module.controller, module.action || "manage", options.db === true, module.dictionary || ".");
-                    spinner.succeed("删除完成!");
-                    successCount++;
+                    // 生成删除路径
+                    const paths = generateDeletePaths(module.controller, module.dictionary);
+                    // 1. 删除文件和目录
+                    utils_1.Console.info("📁 正在删除文件和目录...");
+                    deleteModuleFiles(paths);
+                    // 2. 清理配置文件
+                    utils_1.Console.info("🔧 正在清理配置文件...");
+                    cleanupReducers(module.controller, paths.destClientReduxReducersAllPath);
+                    cleanupRestApi(module.controller, paths.destServerRestPath);
+                    cleanupMenu(module.controller, paths.destClientUtilsMenuPath);
+                    // 3. 删除数据库表（如果指定）
+                    if (options.db) {
+                        utils_1.Console.info("💾 正在删除数据库表...");
+                        dropDatabaseTable(module.controller);
+                    }
+                    utils_1.Console.success(`✅ ${module.controller} 删除完成!`);
                     utils_1.Console.newLine();
+                    successCount++;
                 }
                 catch (error) {
                     const errorMessage = error instanceof Error ? error.message : String(error);
-                    utils_1.Console.error(`错误: ${errorMessage}`);
+                    utils_1.Console.error(`❌ 错误: ${errorMessage}`);
                     failures.push({ module: module.controller, error: errorMessage });
                     failureCount++;
                     utils_1.Console.newLine();

package/lib/generators/sql-generator.js

@@ -96,9 +96,11 @@ class SQLGenerator extends base_generator_1.BaseGenerator {
         const primaryKeyField = this.fields.find((f) => f.isPrimaryKey);
         const primaryKey = primaryKeyField ? `  PRIMARY KEY (\`${primaryKeyField.name}\`)` : "";
         const databaseName = this.getDatabaseName();
-        return `use ${databaseName};
+        return `CREATE DATABASE IF NOT EXISTS ${databaseName} CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-CREATE TABLE \`${this.controller}\` (
+use ${databaseName};
+
+CREATE TABLE IF NOT EXISTS \`${this.controller}\` (
 ${fieldDefinitions.join(",\n")},
 ${primaryKey}
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;`;