nsgm-cli 2.1.30 → 2.1.31

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 && 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 && 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/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`;
     }
 }