nsgm-cli 2.1.30 → 2.1.32

package/client/layout/index.tsx

@@ -32,8 +32,17 @@ interface MenuItem {
   subMenus?: SubMenuItem[];
 }
 
-// 从环境变量获取 prefix
-const prefix = process.env.NEXT_PUBLIC_PREFIX || "";
+// 安全获取 prefix 的辅助函数
+const getPrefix = () => {
+  try {
+    if (typeof process !== "undefined" && process.env?.NEXT_PUBLIC_PREFIX) {
+      return process.env.NEXT_PUBLIC_PREFIX;
+    }
+  } catch {
+    // 浏览器环境使用空字符串
+  }
+  return "";
+};
 
 const getLocationKey = () => {
   const result = {
@@ -53,6 +62,7 @@ const getLocationKey = () => {
         const locationIndex = locationStr.indexOf("/");
         locationStr = locationStr.substring(locationIndex);
 
+        const prefix = getPrefix();
         if (prefix && locationStr.indexOf(prefix) !== -1) {
           locationStr = locationStr.split(prefix)[1];
         }
@@ -92,6 +102,7 @@ const getLocationKey = () => {
 
 const routerPush = (router: any, url: string) => {
   if (router && url && typeof window !== "undefined") {
+    const prefix = getPrefix();
     if (prefix && url.indexOf(prefix) === -1) {
       url = prefix + url;
     }

package/client/redux/store.ts

@@ -29,11 +29,20 @@ const tempStore = configureStore({
 
 export type AppDispatch = typeof tempStore.dispatch;
 
+// 安全获取 NODE_ENV
+const isDevToolsEnabled = () => {
+  try {
+    return typeof process !== "undefined" && process.env && process.env.NODE_ENV !== "production";
+  } catch {
+    return false;
+  }
+};
+
 function initStore(initialState?: any): EnhancedStore {
   return configureStore({
     reducer: combineReducer,
     preloadedState: initialState,
-    devTools: process.env.NODE_ENV !== "production",
+    devTools: isDevToolsEnabled(),
     middleware: (getDefaultMiddleware) =>
       getDefaultMiddleware({
         serializableCheck: {

package/client/styled/layout/index.ts

@@ -54,7 +54,9 @@ export const SideMenu = styled(Menu)`
   padding: 8px 0;
 `;
 
-export const ContentLayout = styled(Layout)<{ collapsed?: boolean }>`
+export const ContentLayout = styled(Layout).withConfig({
+  shouldForwardProp: (prop) => prop !== "collapsed",
+})<{ collapsed?: boolean }>`
   display: flex;
   flex-direction: column;
   flex: 1;

package/client/utils/common.ts

@@ -1,17 +1,37 @@
 import _ from "lodash";
 
 export const getLocalEnv = () => {
-  let env = process.env.NEXT_PUBLIC_ENV || "uat";
-  env = env.toLowerCase();
-  return env;
+  // 安全地访问 process.env，避免在浏览器中直接访问 process 对象
+  let env = "uat";
+  try {
+    if (typeof process !== "undefined" && process.env?.NEXT_PUBLIC_ENV) {
+      env = process.env.NEXT_PUBLIC_ENV;
+    }
+  } catch {
+    // 在浏览器环境中 process 可能未定义，使用默认值
+  }
+  return env.toLowerCase();
 };
 
 export const getLocalApiPrefix = () => {
-  let protocol = process.env.NEXT_PUBLIC_PROTOCOL || "http";
-  let host = process.env.NEXT_PUBLIC_HOST || "localhost";
-  let port = process.env.NEXT_PUBLIC_PORT || "3000";
-  const prefix = process.env.NEXT_PUBLIC_PREFIX || "";
-  const isExport = process.env.NEXT_PUBLIC_IS_EXPORT === "true";
+  // 安全地访问 process.env
+  let protocol = "http";
+  let host = "localhost";
+  let port = "3000";
+  let prefix = "";
+  let isExport = false;
+
+  try {
+    if (typeof process !== "undefined" && process.env) {
+      protocol = process.env.NEXT_PUBLIC_PROTOCOL || protocol;
+      host = process.env.NEXT_PUBLIC_HOST || host;
+      port = process.env.NEXT_PUBLIC_PORT || port;
+      prefix = process.env.NEXT_PUBLIC_PREFIX || "";
+      isExport = process.env.NEXT_PUBLIC_IS_EXPORT === "true";
+    }
+  } catch {
+    // 在浏览器环境中 process 可能未定义，使用默认值
+  }
 
   let localApiPrefix = "";
 

package/client/utils/fetch.ts

@@ -32,9 +32,15 @@ export const GRAPHQL_CONFIG = {
     cookieName: "csrfToken",
   },
 
-  // 开发模式配置
-  development: {
-    enableDebugLogs: process.env.NODE_ENV === "development",
+  // 开发模式配置 - 使用 getter 延迟访问 process
+  get development() {
+    let enableDebugLogs = false;
+    try {
+      enableDebugLogs = typeof process !== "undefined" && process.env && process.env.NODE_ENV === "development";
+    } catch {
+      // 浏览器环境使用默认值
+    }
+    return { enableDebugLogs };
   },
 };
 

package/client/utils/sso.ts

@@ -3,10 +3,9 @@ import { setCookie, getCookie, delCookie } from "./cookie";
 import { getUrlParamByKey, getLocalApiPrefix, getLocalEnv, handleXSS } from "./common";
 import _ from "lodash";
 
-const env = getLocalEnv();
-
-const LOGIN_COOKIE_ID = `${env}_cas_nsgm`;
-const LOGIN_COOKIE_USER = `${env}_nsgm_user`;
+// 延迟初始化 cookie 名称，避免在模块加载时访问 process
+const getLoginCookieId = () => `${getLocalEnv()}_cas_nsgm`;
+const getLoginCookieUser = () => `${getLocalEnv()}_nsgm_user`;
 
 const getPrincipalUrl = () => {
   const url = `${getLocalApiPrefix()}/rest/sso/sessionCheck`;
@@ -67,8 +66,8 @@ const handleLocationHref = () => {
 };
 
 const jumpToLogin = () => {
-  delCookie(LOGIN_COOKIE_ID);
-  delCookie(LOGIN_COOKIE_USER);
+  delCookie(getLoginCookieId());
+  delCookie(getLoginCookieUser());
 
   if (typeof window !== "undefined") {
     window.location.href = `${window.location.origin}/login`;
@@ -115,7 +114,7 @@ const storeLoginUser = (userAttr: any, callback: any) => {
       "name",
       "sn",
     ]);
-    setCookie(LOGIN_COOKIE_USER, user, null);
+    setCookie(getLoginCookieUser(), user, null);
     callback?.(JSON.parse(user));
   } else {
     callback?.();
@@ -124,7 +123,7 @@ const storeLoginUser = (userAttr: any, callback: any) => {
 
 const storeLogin = (cookie: any, cookieExpire: any, userAttr: any, callback: any) => {
   if (cookie) {
-    setCookie(LOGIN_COOKIE_ID, cookie, cookieExpire);
+    setCookie(getLoginCookieId(), cookie, cookieExpire);
   }
 
   storeLoginUser(userAttr, callback);
@@ -166,7 +165,7 @@ const validateLogin = (ticket: string, name = "", callback: any) => {
 };
 
 export const login = (callback: any) => {
-  const cookieLoginValue = getCookie(LOGIN_COOKIE_ID);
+  const cookieLoginValue = getCookie(getLoginCookieId());
 
   if (typeof window !== "undefined") {
     const locationHref = window.location.href;

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

@@ -5,8 +5,117 @@ 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));
+};
+/**
+ * 清理 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);
+};
+/**
+ * 清理菜单配置
+ */
+const cleanupMenu = (controller, menuPath) => {
+    // 删除所有匹配的菜单项
+    shelljs_1.default.sed("-i", new RegExp(`,?\\s*\\{\\s*//\\s*${controller}_\\w+_start[\\s\\S]*?//\\s*${controller}_\\w+_end\\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);
+};
+/**
+ * 清理 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);
+};
+/**
+ * 删除数据库表
+ */
+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}`);
+    }
+};
 /**
  * 从配置文件删除命令
  */
@@ -147,8 +256,18 @@ exports.deleteConfigCommand = {
                 try {
                     const spinner = utils_1.Console.spinner("正在删除文件...", "red");
                     spinner.start();
-                    // 调用核心删除函数
-                    (0, generate_1.deleteFiles)(module.controller, module.action || "manage", options.db === true, module.dictionary || ".");
+                    // 生成删除路径
+                    const paths = generateDeletePaths(module.controller, module.dictionary);
+                    // 1. 删除文件和目录
+                    deleteModuleFiles(paths);
+                    // 2. 清理配置文件
+                    cleanupReducers(module.controller, paths.destClientReduxReducersAllPath);
+                    cleanupRestApi(module.controller, paths.destServerRestPath);
+                    cleanupMenu(module.controller, paths.destClientUtilsMenuPath);
+                    // 3. 删除数据库表（如果指定）
+                    if (options.db) {
+                        dropDatabaseTable(module.controller);
+                    }
                     spinner.succeed("删除完成!");
                     successCount++;
                     utils_1.Console.newLine();

package/lib/generate_init.js

@@ -32,9 +32,13 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initConfigFiles = exports.initTestFiles = exports.initTypesFiles = exports.initRootFiles = exports.initScriptsFiles = exports.initPublicFiles = exports.initServerFiles = exports.initPagesFiles = exports.initClientFiles = void 0;
 const path_1 = __importStar(require("path"));
+const shelljs_1 = __importDefault(require("shelljs"));
 const constants_1 = require("./constants");
 const utils_1 = require("./utils");
 const fs_1 = require("fs");
@@ -549,6 +553,15 @@ const initRootFiles = (dictionary, newDestFolder) => {
         ];
         // 3. 复制文件
         copyMultipleFiles(fileMappings);
+        // 4. 替换 mysql.config.js 中的数据库名称为项目名称（中横线替换为下划线）
+        const destMysqlConfigPath = (0, path_1.resolve)(baseDestPath + ROOT_FILES.mysqlConfig);
+        if ((0, fs_1.existsSync)(destMysqlConfigPath)) {
+            const projectName = path_1.default.basename(baseDestPath);
+            // 将中横线替换为下划线，生成数据库名称
+            const databaseName = projectName.replace(/-/g, "_").toLowerCase();
+            shelljs_1.default.sed("-i", /database: 'crm_demo'/, `database: '${databaseName}'`, destMysqlConfigPath);
+            console.log(`Database name set to: ${databaseName}`);
+        }
         console.log("Root files initialization completed");
         return {
             destPackagePath: (0, path_1.resolve)(baseDestPath + constants_1.packagePath),

package/lib/generators/page-generator.js

@@ -556,13 +556,13 @@ export default Page`;
      */
     generateClientValidation() {
         const integerFields = this.getFormFields().filter((field) => field.type === "integer");
-        if (integerFields.length === 0) {
-            return "";
-        }
-        const validations = integerFields.map((field) => {
+        const decimalFields = this.getFormFields().filter((field) => field.type === "decimal");
+        const validations = [];
+        // 生成 integer 字段验证
+        integerFields.forEach((field) => {
             const fieldName = field.name;
             const capitalizedName = fieldName.charAt(0).toUpperCase() + fieldName.slice(1);
-            return `    // 验证${fieldName}
+            validations.push(`    // 验证${fieldName}
     const ${fieldName}Value = modalObj.${fieldName}
     if (${fieldName}Value !== undefined && ${fieldName}Value !== null && ${fieldName}Value !== '') {
       const parsed${capitalizedName} = parseInt(${fieldName}Value, 10)
@@ -571,8 +571,26 @@ export default Page`;
         return
       }
       modalObj.${fieldName} = parsed${capitalizedName}
-    }`;
+    }`);
         });
+        // 生成 decimal 字段验证
+        decimalFields.forEach((field) => {
+            const fieldName = field.name;
+            const capitalizedName = fieldName.charAt(0).toUpperCase() + fieldName.slice(1);
+            validations.push(`    // 验证${fieldName}
+    const ${fieldName}Value = modalObj.${fieldName}
+    if (${fieldName}Value !== undefined && ${fieldName}Value !== null && ${fieldName}Value !== '') {
+      const parsed${capitalizedName} = parseFloat(${fieldName}Value)
+      if (isNaN(parsed${capitalizedName})) {
+        message.error(\`${fieldName}必须是数字，当前值: "\${${fieldName}Value}"\`)
+        return
+      }
+      modalObj.${fieldName} = parsed${capitalizedName}
+    }`);
+        });
+        if (validations.length === 0) {
+            return "";
+        }
         return `${validations.join("\n\n")}\n\n`;
     }
 }

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;`;