midway-fatcms 0.0.19 → 0.0.20

package/.prettierrc.js

@@ -1,4 +1,5 @@
 module.exports = {
   ...require('mwts/.prettierrc.json'),
   printWidth: 500, // 与ESLint的max-len保持一致
+  endOfLine: 'crlf',
 }

package/dist/controller/manage/ProxyApiMangeApi.js

@@ -28,7 +28,7 @@ let ProxyApiMangeApi = class ProxyApiMangeApi extends BaseApiController_1.BaseAp
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_proxyapi, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
             validateCfg: {
                 'data.proxy_name': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
-                'data.path_prefix': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
+                'data.path_prefix': [keys_1.KeysOfValidators.STRING],
                 'data.upstream_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });
@@ -37,6 +37,7 @@ let ProxyApiMangeApi = class ProxyApiMangeApi extends BaseApiController_1.BaseAp
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_proxyapi, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
                 'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'data.path_prefix': [keys_1.KeysOfValidators.STRING],
             },
         });
     }

package/dist/libs/crud-pro/services/CrudProDataTypeConvertService.js

@@ -13,23 +13,9 @@ const REGEX_STRING_TYPE = /^(varchar|char|text|longtext|mediumtext|tinytext|nvar
 /** PG / MySQL 原生 boolean 列名 */
 const REGEX_NATIVE_BOOLEAN_TYPE = /^(boolean|bool)$/;
 /** 含 WHERE 条件的操作类型（查询/删除/更新） */
-const CONDITION_TYPES = new Set([
-    keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-    keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-    keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
-    keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT,
-    keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_EXIST,
-    keys_1.KeysOfSimpleSQL.SIMPLE_DELETE,
-    keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
-]);
+const CONDITION_TYPES = new Set([keys_1.KeysOfSimpleSQL.SIMPLE_QUERY, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_EXIST, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE]);
 /** INSERT/UPDATE 操作类型 */
-const INSERT_OR_UPDATE_TYPES = new Set([
-    keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-    keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
-    keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE,
-    keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE,
-    keys_1.KeysOfSimpleSQL.SIMPLE_BATCH_INSERT,
-]);
+const INSERT_OR_UPDATE_TYPES = new Set([keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE, keys_1.KeysOfSimpleSQL.SIMPLE_BATCH_INSERT]);
 // ============ 工具函数 ============
 function isIntegerType(type) {
     return REGEX_INTEGER_TYPE.test(type);
@@ -265,9 +251,7 @@ class DataConvertHandler {
         if (typeof value === 'boolean') {
             return value ? 't' : 'f';
         }
-        const escaped = ('' + value)
-            .replace(/\\/g, '\\\\')
-            .replace(/"/g, '\\"');
+        const escaped = ('' + value).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
         return '"' + escaped + '"';
     }
     /** 对象/数组 → JSON 字符串，跳过 $sqlFunc、Date、Buffer */

package/dist/libs/crud-pro-quick/fixSoftDelete.d.ts

@@ -1,6 +1,6 @@
-import { KeysOfSimpleSQL } from "../../libs/crud-pro/models/keys";
-import { IRequestModel, IVisitor } from "../../libs/crud-pro/interfaces";
-import { IRequestCfgModel2 } from "./models";
+import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
+import { IRequestModel, IVisitor } from '../../libs/crud-pro/interfaces';
+import { IRequestCfgModel2 } from './models';
 /**
  * 软删除处理函数
  *
@@ -10,4 +10,4 @@ import { IRequestCfgModel2 } from "./models";
  * @param visitor 获取当前用户信息的函数（用于软删除时记录删除人）
  */
 declare function fixSoftDelete(oldSqlSimpleName: KeysOfSimpleSQL, cfgModel: IRequestCfgModel2, params: IRequestModel, visitor?: IVisitor): void;
-export { fixSoftDelete, };
+export { fixSoftDelete };

package/dist/libs/crud-pro-quick/fixSoftDelete.js

@@ -43,9 +43,7 @@ function fixSoftDelete1(oldSqlSimpleName, cfgModel, params, visitor) {
         cfgModel.sqlSimpleName = keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE;
     }
     // QUERY 操作：强制查询未删除的记录
-    if (keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE === oldSqlSimpleName
-        || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY === oldSqlSimpleName
-        || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === oldSqlSimpleName) {
+    if (keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE === oldSqlSimpleName || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY === oldSqlSimpleName || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === oldSqlSimpleName) {
         if (!params.condition) {
             params.condition = {};
         }
@@ -78,9 +76,7 @@ function fixSoftDelete2(oldSqlSimpleName, cfgModel, params, visitor) {
         cfgModel.sqlSimpleName = keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE;
     }
     // QUERY 操作：强制查询未删除的记录
-    if (keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE === oldSqlSimpleName
-        || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY === oldSqlSimpleName
-        || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === oldSqlSimpleName) {
+    if (keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE === oldSqlSimpleName || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY === oldSqlSimpleName || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === oldSqlSimpleName) {
         if (!params.condition) {
             params.condition = {};
         }

package/dist/service/curd/CurdMixService.d.ts

@@ -1,7 +1,7 @@
 import { ColumnRelation, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery, ExecuteSQLResult } from '../../libs/crud-pro/interfaces';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
 import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
-import { ShardingBase } from "../../libs/crud-sharding";
+import { ShardingBase } from '../../libs/crud-sharding';
 import { IGetQuickCrudParam, IGetShardingCrudParam } from './CurdProService';
 export interface ILinkColumnRelationParam {
     columnsRelations: ColumnRelation[];

package/dist/service/proxyapi/ProxyApiLoadService.js

@@ -76,7 +76,8 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         for (let i = 0; i < entities.length; i++) {
             const entity = entities[i];
             if (entity.status === 1) {
-                const path_prefix2 = '/' + entity.upstream_code + entity.path_prefix;
+                const pathPrefix = (0, ProxyApiUtils_1.normalizePathPrefix)(entity.path_prefix);
+                const path_prefix2 = '/' + entity.upstream_code + pathPrefix;
                 routeTrie.addRoute(path_prefix2, new RouteHandler_1.RouteHandler(entity));
             }
         }

package/dist/service/proxyapi/ProxyApiUtils.d.ts

@@ -12,4 +12,6 @@ export declare const BALANCE_STRATEGY: {
  * @param str
  * @param mod
  */
+/** path_prefix 为空表示代理上游根路径；单独的 "/" 会在路由树中注册无效节点，统一归一化为空 */
+export declare function normalizePathPrefix(path_prefix: string | null | undefined): string;
 export declare function stringHashMod(str: string, mod: number): number;

package/dist/service/proxyapi/ProxyApiUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringHashMod = exports.BALANCE_STRATEGY = void 0;
+exports.stringHashMod = exports.normalizePathPrefix = exports.BALANCE_STRATEGY = void 0;
 const md5 = require("md5");
 exports.BALANCE_STRATEGY = {
     ROUND_ROBIN: 'ROUND_ROBIN',
@@ -16,6 +16,14 @@ exports.BALANCE_STRATEGY = {
  * @param str
  * @param mod
  */
+/** path_prefix 为空表示代理上游根路径；单独的 "/" 会在路由树中注册无效节点，统一归一化为空 */
+function normalizePathPrefix(path_prefix) {
+    if (path_prefix === '/' || path_prefix == null) {
+        return '';
+    }
+    return path_prefix;
+}
+exports.normalizePathPrefix = normalizePathPrefix;
 function stringHashMod(str, mod) {
     if (!str) {
         throw new Error('stringHashMod str is required');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/controller/home.controller.ts

@@ -36,16 +36,17 @@ export class HomeController extends BaseApiController {
       return this.ctx.render('404_workbench', infos);
     }
 
-
     const html_content = workbenchInfo.html_content || '未配置HTML模版';
 
     const userInfo = await this.getUserAndRefreshSessionInfo();
 
     // 形如(不带域名)：/ns/app/abc-app-path?aa=2332
-    const urlcsrftoken = await privateAES.time_encrypt_utf8_base64(JSON.stringify({
-      url: this.ctx.req.url,
-      timestamp: Date.now(),
-    }));
+    const urlcsrftoken = await privateAES.time_encrypt_utf8_base64(
+      JSON.stringify({
+        url: this.ctx.req.url,
+        timestamp: Date.now(),
+      })
+    );
     const fatcmscsrftoken = await privateAES.time_encrypt_utf8_base64('' + Date.now());
 
     const utils = createRenderUtils({
@@ -70,7 +71,6 @@ export class HomeController extends BaseApiController {
     return await this.authService.refreshSession(userSessionInfo);
   }
 
-
   @Get('/robots.txt')
   async robots(): Promise<string> {
     return `User-agent: * \nDisallow: /ns/api/manage/`;

package/src/controller/manage/ProxyApiMangeApi.ts

@@ -27,7 +27,7 @@ export class ProxyApiMangeApi extends BaseApiController {
     return this.executeSysSimpleSQL(SystemTables.sys_proxyapi, KeysOfSimpleSQL.SIMPLE_INSERT, {
       validateCfg: {
         'data.proxy_name': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
-        'data.path_prefix': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
+        'data.path_prefix': [KeysOfValidators.STRING],
         'data.upstream_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });
@@ -38,6 +38,7 @@ export class ProxyApiMangeApi extends BaseApiController {
     return this.executeSysSimpleSQL(SystemTables.sys_proxyapi, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
         'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
+        'data.path_prefix': [KeysOfValidators.STRING],
       },
     });
   }

package/src/libs/crud-pro/interfaces.ts

@@ -10,24 +10,24 @@ export interface ICrudProCfg {
   methodsCacheTime?: number; //鍐呭瓨缂撳瓨鏃堕棿榛樿 1鍒嗛挓
   dictItemTableName?: string; // 瀛楀吀椤硅〃鍚嶇О锛岄粯璁わ細sys_data_dict_item
   sysConfigTableName?: string; // 瀛楀吀椤硅〃鍚嶇О锛岄粯璁わ細sys_configs
-  tableMetaCacheTime?: number; // 琛ㄦ牸鍏冧俊鎭紦瀛樻椂闂?
+  tableMetaCacheTime?: number; // 琛ㄦ牸鍏冧俊鎭紦瀛樻椂闂?
 }
 
 export interface ITableColumn {
-  name: string; // 瀛楁鍚?
+  name: string; // 瀛楁鍚?
   type: string; // 鏁版嵁绫诲瀷
   isNullable: boolean; // 鏄惁鍙┖
   isPrimaryKey?: boolean; // 鏄惁涓婚敭
-  isIdentity?: boolean; // 鏄惁鑷鍒楋紙SQL Server锛?
-  defaultValue?: any; // 榛樿鍊?
-  maxLength?: number; // 鏈€澶ч暱搴?
+  isIdentity?: boolean; // 鏄惁鑷鍒楋紙SQL Server锛?
+  defaultValue?: any; // 榛樿鍊?
+  maxLength?: number; // 鏈€澶ч暱搴?
   comment?: string; // 瀛楁娉ㄩ噴
 }
 
 export interface ITableMeta {
   expiredTime: number; // 杩囨湡鏃堕棿
-  tableColumns: string[]; // 琛ㄦ牸鎵€鏈夊瓧娈?
-  columnDetails?: ITableColumn[]; // 璇︾粏鐨勫瓧娈典俊鎭?
+  tableColumns: string[]; // 琛ㄦ牸鎵€鏈夊瓧娈?
+  columnDetails?: ITableColumn[]; // 璇︾粏鐨勫瓧娈典俊鎭?
 }
 
 export interface IConnectionPool {
@@ -50,19 +50,19 @@ export interface IPoolConnectionClient {
 }
 
 /**
- * 璇锋眰妯″瀷涓?data 瀛楁鐨勫€肩被鍨?
+ * 璇锋眰妯″瀷涓?data 瀛楁鐨勫€肩被鍨?
  *
- * 閫氱敤绫诲瀷锛圡ySQL / PostgreSQL / SQL Server 鍧囨敮鎸侊級锛?
+ * 閫氱敤绫诲瀷锛圡ySQL / PostgreSQL / SQL Server 鍧囨敮鎸侊級锛?
  * - string    : 瀛楃涓插垪锛坴archar, char, text, nvarchar 绛夛級
  * - number    : 鏁存暟 / 娴偣鏁板垪锛坕nt, bigint, decimal, float 绛夛級
- * - boolean   : 甯冨皵鍒楋紙MySQL tinyint(1) 鏄犲皠锛汸G 鍘熺敓 boolean锛汼S bit(1)锛?
+ * - boolean   : 甯冨皵鍒楋紙MySQL tinyint(1) 鏄犲皠锛汸G 鍘熺敓 boolean锛汼S bit(1)锛?
  * - Date      : 鏃ユ湡鏃堕棿鍒楋紙datetime, timestamp, date 绛夛級
- * - null      : 绌哄€?
+ * - null      : 绌哄€?
  *
- * MySQL 涓撴湁锛?
+ * MySQL 涓撴湁锛?
  * - Record<string, any> : MySQL JSON 鍒楋紙5.7+锛夛紝CrudProDataTypeConvertService 鑷姩 JSON.stringify()
  *
- * PostgreSQL 涓撴湁锛?
+ * PostgreSQL 涓撴湁锛?
  * - any[]               : PG ARRAY 鍒楋紙濡?int[], text[]锛夛紝CrudProDataTypeConvertService
  *                         浼氳嚜鍔ㄨ浆涓?PG 鏁扮粍瀛楅潰閲?{1,2,3}
  * - Record<string, any> : PG JSONB / JSON 鍒楋紝CrudProDataTypeConvertService 鑷姩 JSON.stringify()
@@ -71,24 +71,24 @@ export interface IPoolConnectionClient {
  * - any[]               : longtext/varchar 绛夐潪 JSON 鍒楀瓨鏁扮粍鏃讹紝CrudProDataTypeConvertService 涔熶細鑷姩 JSON.stringify()
  * - Record<string, any> : longtext/varchar 绛夐潪 JSON 鍒楀瓨瀵硅薄鏃讹紝鍚屼笂
  *
- * SQL Server 璇存槑锛?
+ * SQL Server 璇存槑锛?
  * - 鍘熺敓 JSON 鍒楀湪 SS 涓檷绾т负 NVARCHAR(MAX)锛屼絾 longtext 瀛?JSON 瀵硅薄鐨勫満鏅悓鏍疯瑕嗙洊
  * - XML 鍒楀悓鐞嗭紝浼?string
  *
  * 閫氱敤浜岃繘鍒讹紙MySQL / PostgreSQL / SQL Server锛夛細
- * - Buffer   : BLOB / LONGBLOB (MySQL)銆丅YTEA (PG)銆乂ARBINARY (SS) 绛変簩杩涘埗鍒?
+ * - Buffer   : BLOB / LONGBLOB (MySQL)銆丅YTEA (PG)銆乂ARBINARY (SS) 绛変簩杩涘埗鍒?
  *             涓夌椹卞姩锛坢ysql2 / pg / mssql锛夊師鐢熸敮鎸?Buffer 鍙傛暟锛屾棤闇€棰濆杞崲
  */
 export type IRequestModelDataFieldValue =
-  | string                 // 閫氱敤锛氬瓧绗︿覆鍒?
+  | string                 // 閫氱敤锛氬瓧绗︿覆鍒?
   | number                 // 閫氱敤锛氭暟鍊煎垪
-  | boolean                // 閫氱敤锛氬竷灏斿垪锛圡ySQL tinyint(1) / PG boolean / SS bit(1)锛?
+  | boolean                // 閫氱敤锛氬竷灏斿垪锛圡ySQL tinyint(1) / PG boolean / SS bit(1)锛?
   | Date                   // 閫氱敤锛氭棩鏈熸椂闂村垪
-  | null                   // 閫氱敤锛氱┖鍊?
-  | any[]                  // PG ARRAY 列：转为 PG 数组字面量；其他列存数组：自动 JSON.stringify()
-  | Record<string, any>    // json/jsonb/longtext 等列存对象：按值类型自动 JSON.stringify()，不依赖列类型
-  | Buffer                 // 通用二进制：MySQL BLOB / PG BYTEA / SS VARBINARY，驱动原生支持无需转换
-  | ISqlFuncArg;           //  表达式：UPDATE SET / INSERT VALUES 中生成非参数化 SQL 片段（NOW/UUID/INC/DEC/MUL/FN 等）
+  | null                   // 閫氱敤锛氱┖鍊?
+  | any[]                  // PG ARRAY 列：转为 PG 数组字面量；其他列存数组：自动 JSON.stringify()
+  | Record<string, any>    // json/jsonb/longtext 等列存对象：按值类型自动 JSON.stringify()，不依赖列类型
+  | Buffer                 // 通用二进制：MySQL BLOB / PG BYTEA / SS VARBINARY，驱动原生支持无需转换
+  | ISqlFuncArg;           //  表达式：UPDATE SET / INSERT VALUES 中生成非参数化 SQL 片段（NOW/UUID/INC/DEC/MUL/FN 等）
 
 
 export type IRequestEntity = Record<string, IRequestModelDataFieldValue>;
@@ -102,7 +102,7 @@ export interface IRequestModel {
   method?: string;
   columns?: string | string[]; // "columns": "id,name,age,sex,addr",
   condition?: IRequestCondition; // 鎷兼帴鏌ヨ鏉′欢
-  data?: IRequestModelData, // 鍗曟潯鎴栨壒閲忔彃鍏?鏇存柊鐨勬暟鎹儴鍒?
+  data?: IRequestModelData, // 鍗曟潯鎴栨壒閲忔彃鍏?鏇存柊鐨勬暟鎹儴鍒?
   orderBy?: string | IOrderByItem[];
   limit?: number;
   offset?: number;
@@ -113,53 +113,53 @@ export interface IRequestModel {
 type IBasicType = boolean | string | number;
 
 /**
- * 姣旇緝鎿嶄綔绗︽潯浠?
+ * 姣旇緝鎿嶄綔绗︽潯浠?
  * 鏀寔 MongoDB 椋庢牸鐨勬墍鏈夋煡璇㈡搷浣滅
  */
 export interface ICompareCondition {
-  // 姣旇緝鎿嶄綔绗?
-  $ne?: IBasicType;                    // 涓嶇瓑浜?
+  // 姣旇緝鎿嶄綔绗?
+  $ne?: IBasicType;                    // 涓嶇瓑浜?
   $lt?: IBasicType;                    // 灏忎簬
-  $lte?: IBasicType;                   // 灏忎簬鎴栫瓑浜?
+  $lte?: IBasicType;                   // 灏忎簬鎴栫瓑浜?
   $gt?: IBasicType;                    // 澶т簬
-  $gte?: IBasicType;                   // 澶т簬鎴栫瓑浜?
+  $gte?: IBasicType;                   // 澶т簬鎴栫瓑浜?
 
-  // 闆嗗悎鎿嶄綔绗?
+  // 闆嗗悎鎿嶄綔绗?
   $in?: IBasicType[];                  // 鍦ㄩ泦鍚堜腑
-  $nin?: IBasicType[];                 // 涓嶅湪闆嗗悎涓?
+  $nin?: IBasicType[];                 // 涓嶅湪闆嗗悎涓?
 
-  // 鑼冨洿鎿嶄綔绗?
+  // 鑼冨洿鎿嶄綔绗?
   $range?: [number, number];           // 鑼冨洿鏌ヨ [min, max]
 
-  // 妯＄硦鍖归厤鎿嶄綔绗?
+  // 妯＄硦鍖归厤鎿嶄綔绗?
   $like?: string;                      // 鍓嶇紑鍖归厤 A%
   $notLike?: string;                   // 闈炲墠缂€鍖归厤
   $likeInclude?: string;               // 鍖呭惈鍖归厤 %A%
-  $notLikeInclude?: string;            // 涓嶅寘鍚尮閰?
+  $notLikeInclude?: string;            // 涓嶅寘鍚尮閰?
 
-  // 鍏ㄦ枃绱㈠紩鎿嶄綔绗?
+  // 鍏ㄦ枃绱㈠紩鎿嶄綔绗?
   $match?: string;                     // MySQL 鍏ㄦ枃绱㈠紩
   $matchBool?: string | boolean;       // MySQL 甯冨皵鍏ㄦ枃绱㈠紩
 
-  // NULL 鍒ゆ柇鎿嶄綔绗?
+  // NULL 鍒ゆ柇鎿嶄綔绗?
   $null?: boolean;                     // IS NULL
   $notNull?: boolean;                  // IS NOT NULL
 
-  // JSON 鎿嶄綔绗?
+  // JSON 鎿嶄綔绗?
   $jsonArrayContains?: string;         // JSON 鏁扮粍鍖呭惈
 }
 
 /**
- * 閫昏緫鎿嶄綔绗︽潯浠?
+ * 閫昏緫鎿嶄綔绗︽潯浠?
  */
 export interface ILogicalCondition {
-  $or?: IRequestCondition[];           // 閫昏緫鎴?
-  $and?: IRequestCondition[];          // 閫昏緫涓?
+  $or?: IRequestCondition[];           // 閫昏緫鎴?
+  $and?: IRequestCondition[];          // 閫昏緫涓?
 }
 
 /**
  * 鏌ヨ鏉′欢绫诲瀷
- * 鏀寔瀛楁鍊肩洿鎺ュ尮閰嶆垨姣旇緝鎿嶄綔绗?
+ * 鏀寔瀛楁鍊肩洿鎺ュ尮閰嶆垨姣旇緝鎿嶄綔绗?
  * 鏀寔 $or, $and 閫昏緫缁勫悎
  */
 export interface IRequestCondition extends Record<string, IBasicType | ICompareCondition | ILogicalCondition | IRequestCondition[] | undefined>, ILogicalCondition {
@@ -183,7 +183,7 @@ export interface IVisitor {
  */
 export enum BasicRecordEnum {
   dict = 'dict', // 鍏宠仈鏁版嵁瀛楀吀
-  sysCfgEnum = 'sysCfgEnum', // 閰嶇疆鏂囦欢涓紝蹇呴』鍖呭惈code涓€鍒楋紝浣滀负鍞竴閿€?
+  sysCfgEnum = 'sysCfgEnum', // 閰嶇疆鏂囦欢涓紝蹇呴』鍖呭惈code涓€鍒楋紝浣滀负鍞竴閿€?
 }
 
 export interface CopyAttr {
@@ -194,7 +194,7 @@ export interface CopyAttr {
 export interface ColumnRelation {
   relatedType: any; // 濡傦細 dict
   relatedCode?: string; // SexEnum
-  sourceColumn: string; // 浠巖ow涓彇鍊肩殑瀛楁鍚?
+  sourceColumn: string; // 浠巖ow涓彇鍊肩殑瀛楁鍚?
   targetColumns?: CopyAttr[]; //[{from:'label', to:'user_sex_text'}]
 }
 
@@ -202,57 +202,57 @@ export interface ColumnRelation {
  * 鍩烘湰鍝嶅簲閰嶇疆
  */
 export interface IBaseCfgModel {
-  sqlTable?: string; // 鍙互涓虹┖. originSql涓笉鍖呭惈@@table鏃跺彲浠ヤ负绌?
+  sqlTable?: string; // 鍙互涓虹┖. originSql涓笉鍖呭惈@@table鏃跺彲浠ヤ负绌?
   sqlSchema?: string; // 鍙互涓虹┖
   sqlDatabase?: string; // 鍙互涓虹┖锛岀敤姝ゅ瓧娈佃繘琛宑onnection鐨勯€夋嫨鍜屽垏鎹€傞厤鍚坓etBizConnectionPool浣跨敤
   sqlDbType?: SqlDbType; // 鏁版嵁搴撶被鍨嬶紝mysql(榛樿) 銆乸ostgres
   maxLimit?: number; // 鏈€澶т竴娆℃€ц繑鍥炵殑鏁伴噺
   columns?: string | string[]; // "columns": "id,name,age,sex,addr",
   columnsRelation?: ColumnRelation[];
-  autoSnowflakeId?: boolean; // INSERT 鏃惰嚜鍔ㄤ负绌?id 瀛楁濉厖闆姳ID锛堥粯璁?false锛?
+  autoSnowflakeId?: boolean; // INSERT 鏃惰嚜鍔ㄤ负绌?id 瀛楁濉厖闆姳ID锛堥粯璁?false锛?
 }
 
 export type IFunctionParam = IFuncCfgModel | string | number | boolean | null;
 export interface IFuncCfgModel extends Record<any, any> {
-  ___PLAIN_OBJECT___?: boolean; // 鏈韩灏辨槸涓€涓璞?
-  functionName?: string; // 鍑芥暟鍚?
+  ___PLAIN_OBJECT___?: boolean; // 鏈韩灏辨槸涓€涓璞?
+  functionName?: string; // 鍑芥暟鍚?
   functionParams?: IFunctionParam[]; // 鍑芥暟鍙傛暟
 
   const?: any; // 甯搁噺,浠绘剰绫诲瀷銆傚彲浠ユ槸json瀵硅薄
-  constString?: any; // 甯搁噺瀛楃涓?
-  constNumber?: number; // 甯搁噺鏁板瓧锛屼换鎰忓舰寮? int,bigDecimal,bigInteger锛屽瓧绗︿覆锛岀瓑銆?
+  constString?: any; // 甯搁噺瀛楃涓?
+  constNumber?: number; // 甯搁噺鏁板瓧锛屼换鎰忓舰寮? int,bigDecimal,bigInteger锛屽瓧绗︿覆锛岀瓑銆?
   constBool?: boolean; // 甯搁噺bool鍊笺€備笌js鐨勫垽鏂€昏緫涓€鑷达紝false, null, 0 , "" 琚涓烘槸 false锛屽叾浠栬涓烘槸true
 
-  context?: string; // 浠巆ontext涓彇鍊?
-  contextAsString?: string; // 浠巆ontext涓彇鍊?
-  contextAsNumber?: string; // 浠巆ontext涓彇鍊?
-  contextAsBool?: string; // 浠巆ontext涓彇鍊?
+  context?: string; // 浠巆ontext涓彇鍊?
+  contextAsString?: string; // 浠巆ontext涓彇鍊?
+  contextAsNumber?: string; // 浠巆ontext涓彇鍊?
+  contextAsBool?: string; // 浠巆ontext涓彇鍊?
 
-  executeExpressReturnObject?: string; // 鎵ц琛ㄨ揪寮忥紝杩斿洖瀵硅薄銆傚彲浠ュ寘鍚玞ontext涓殑鍙橀噺銆?
-  executeExpressReturnString?: string; // 鎵ц琛ㄨ揪寮忥紝杩斿洖瀛楃涓层€傚彲浠ュ寘鍚玞ontext涓殑鍙橀噺銆?
+  executeExpressReturnObject?: string; // 鎵ц琛ㄨ揪寮忥紝杩斿洖瀵硅薄銆傚彲浠ュ寘鍚玞ontext涓殑鍙橀噺銆?
+  executeExpressReturnString?: string; // 鎵ц琛ㄨ揪寮忥紝杩斿洖瀛楃涓层€傚彲浠ュ寘鍚玞ontext涓殑鍙橀噺銆?
 
-  message?: string; // 鍦ㄦ牎楠岄樁娈垫湁鐢紝鍏朵粬闃舵娌℃湁鐢?
+  message?: string; // 鍦ㄦ牎楠岄樁娈垫湁鐢紝鍏朵粬闃舵娌℃湁鐢?
 }
 
 export interface ISqlCfgModel extends IBaseCfgModel {
   resName?: string;
   resPicker?: string;
   originSql?: string; // 鏈夌壒娈婂崰浣嶇鐨凷QL, 鍘熷鐨凷QL
-  validate?: IFuncCfgModel; //鎵ц鍓嶏紝杩涜鏍￠獙锛屾牎楠屼笉閫氳繃灏辨姏鍑哄紓甯? 鏍￠獙鍑芥暟鍙互杩斿洖 boolean鎴栫洿鎺ユ姏鍑哄紓甯?
+  validate?: IFuncCfgModel; //鎵ц鍓嶏紝杩涜鏍￠獙锛屾牎楠屼笉閫氳繃灏辨姏鍑哄紓甯? 鏍￠獙鍑芥暟鍙互杩斿洖 boolean鎴栫洿鎺ユ姏鍑哄紓甯?
   executeWhen?: IFuncCfgModel; //婊¤冻琛ㄨ揪寮忕殑缁撴灉锛屾墠鑳芥墽琛屻€?榛樿锛歵rue 鏍￠獙鍑芥暟蹇呴』杩斿洖 boolean
-  isNativeSQL?: boolean; // 鍙互杩愯鐨凷QL銆傚湪postgres/sqlserver鐜涓嬩篃鍙互浣跨敤闂彿銆?
-  executeSql?: string; // 鍙互杩愯鐨凷QL銆傚湪postgres/sqlserver鐜涓嬩篃鍙互浣跨敤闂彿銆?
-  executeSqlArgs?: any[]; //鍙互杩愯鐨凷QL鐨勫弬鏁?
+  isNativeSQL?: boolean; // 鍙互杩愯鐨凷QL銆傚湪postgres/sqlserver鐜涓嬩篃鍙互浣跨敤闂彿銆?
+  executeSql?: string; // 鍙互杩愯鐨凷QL銆傚湪postgres/sqlserver鐜涓嬩篃鍙互浣跨敤闂彿銆?
+  executeSqlArgs?: any[]; //鍙互杩愯鐨凷QL鐨勫弬鏁?
   crudType?: string;
 }
 
 /**
  * executeSQL 鐨勮繑鍥炵粨鏋滅被鍨嬭鏄庯紙鏈鍖呰鐨勭洿鎺ョ粨鏋滐級
  *
- * 娉ㄦ剰锛歟xecuteSQL 杩斿洖鐨勬槸鏁版嵁搴撴煡璇㈢殑鍘熷缁撴灉锛屾病鏈?{code, data, message} 鍖呰灞傘€?
- * 杩斿洖绫诲瀷鍙栧喅浜?resPicker 閰嶇疆锛岃鏍规嵁瀹為檯 SQL 绫诲瀷閫夋嫨鍚堥€傜殑绫诲瀷鏂█銆?
+ * 娉ㄦ剰锛歟xecuteSQL 杩斿洖鐨勬槸鏁版嵁搴撴煡璇㈢殑鍘熷缁撴灉锛屾病鏈?{code, data, message} 鍖呰灞傘€?
+ * 杩斿洖绫诲瀷鍙栧喅浜?resPicker 閰嶇疆锛岃鏍规嵁瀹為檯 SQL 绫诲瀷閫夋嫨鍚堥€傜殑绫诲瀷鏂█銆?
  *
- * 浣跨敤绀轰緥锛?
+ * 浣跨敤绀轰緥锛?
  *   // 鏌ヨ鍒楄〃 - 杩斿洖鏁扮粍
  *   const rows = await executeSQL({ executeSql: 'SELECT * FROM users', resPicker: KeysOfSqlResPicker.RESULT_ROWS }) as ExecuteSQLRowResult<User>;
  *
@@ -265,7 +265,7 @@ export interface ISqlCfgModel extends IBaseCfgModel {
  *   // 鍒ゆ柇瀛樺湪 - 杩斿洖甯冨皵
  *   const exists = await executeSQL({ executeSql: 'SELECT 1 as is_exist FROM users WHERE id=?', executeSqlArgs: [1], resPicker: KeysOfSqlResPicker.RESULT_IS_EXIST }) as ExecuteSQLExistResult;
  *
- *   // 澧炲垹鏀规搷浣?- 杩斿洖鍙楀奖鍝嶈鏁颁俊鎭?
+ *   // 澧炲垹鏀规搷浣?- 杩斿洖鍙楀奖鍝嶈鏁颁俊鎭?
  *   const result = await executeSQL({ executeSql: 'INSERT INTO users(name) VALUES(?)', executeSqlArgs: ['寮犱笁'], resPicker: KeysOfSqlResPicker.UPDATE_RESULT }) as ExecuteSQLUpdateResult;
  */
 
@@ -290,15 +290,15 @@ export interface ExecuteSQLUpdateResult {
 }
 
 /**
- * executeSQL 鐨勯€氱敤杩斿洖绫诲瀷锛堟湭琚寘瑁呯殑鐩存帴缁撴灉锛?
+ * executeSQL 鐨勯€氱敤杩斿洖绫诲瀷锛堟湭琚寘瑁呯殑鐩存帴缁撴灉锛?
  * 鏍规嵁 resPicker 鐨勪笉鍚岄厤缃紝瀹為檯杩斿洖绫诲瀷鍙兘鏄細
  * - ExecuteSQLRowResult<T> : 澶氳鏁版嵁锛堥粯璁わ級
  * - ExecuteSQLSingleResult<T> : 鍗曡鏁版嵁鎴杗ull
  * - ExecuteSQLCountResult : 鏁板瓧
- * - ExecuteSQLExistResult : 甯冨皵鍊?
- * - ExecuteSQLUpdateResult : 澧炲垹鏀圭粨鏋?
+ * - ExecuteSQLExistResult : 甯冨皵鍊?
+ * - ExecuteSQLUpdateResult : 澧炲垹鏀圭粨鏋?
  *
- * 璀﹀憡锛氭绫诲瀷涓鸿仈鍚堢被鍨嬶紝浣跨敤鏃跺缓璁牴鎹疄闄?resPicker 杩涜绫诲瀷鏂█浠ヨ幏寰楃簿纭被鍨嬫彁绀?
+ * 璀﹀憡锛氭绫诲瀷涓鸿仈鍚堢被鍨嬶紝浣跨敤鏃跺缓璁牴鎹疄闄?resPicker 杩涜绫诲瀷鏂█浠ヨ幏寰楃簿纭被鍨嬫彁绀?
  */
 export type ExecuteSQLResult<T = Record<string, any>> =
   | ExecuteSQLRowsResult<T>
@@ -389,7 +389,7 @@ export interface ITableNamesOptions {
 }
 
 /**
- * 琛ㄤ俊鎭」锛堝寘鍚〃鍚嶅拰绫诲瀷锛?
+ * 琛ㄤ俊鎭」锛堝寘鍚〃鍚嶅拰绫诲瀷锛?
  */
 export interface ITableInfo {
   name: string;      // 琛ㄥ悕
@@ -397,10 +397,10 @@ export interface ITableInfo {
 }
 
 /**
- * 琛ㄤ俊鎭煡璇㈢粨鏋?
+ * 琛ㄤ俊鎭煡璇㈢粨鏋?
  */
 export interface ITableListResult {
-  tables: ITableInfo[];  // 鎵€鏈夎〃鍜岃鍥?
-  tableNames: string[];  // 浠呰〃鍚嶏紙涓嶅惈瑙嗗浘锛?
+  tables: ITableInfo[];  // 鎵€鏈夎〃鍜岃鍥?
+  tableNames: string[];  // 浠呰〃鍚嶏紙涓嶅惈瑙嗗浘锛?
   viewNames: string[];   // 浠呰鍥惧悕
 }

package/src/libs/crud-pro/services/CrudProDataTypeConvertService.ts

@@ -19,24 +19,10 @@ const REGEX_STRING_TYPE = /^(varchar|char|text|longtext|mediumtext|tinytext|nvar
 const REGEX_NATIVE_BOOLEAN_TYPE = /^(boolean|bool)$/;
 
 /** 含 WHERE 条件的操作类型（查询/删除/更新） */
-const CONDITION_TYPES = new Set<string>([
-  KeysOfSimpleSQL.SIMPLE_QUERY,
-  KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-  KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
-  KeysOfSimpleSQL.SIMPLE_QUERY_COUNT,
-  KeysOfSimpleSQL.SIMPLE_QUERY_EXIST,
-  KeysOfSimpleSQL.SIMPLE_DELETE,
-  KeysOfSimpleSQL.SIMPLE_UPDATE,
-]);
+const CONDITION_TYPES = new Set<string>([KeysOfSimpleSQL.SIMPLE_QUERY, KeysOfSimpleSQL.SIMPLE_QUERY_ONE, KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, KeysOfSimpleSQL.SIMPLE_QUERY_COUNT, KeysOfSimpleSQL.SIMPLE_QUERY_EXIST, KeysOfSimpleSQL.SIMPLE_DELETE, KeysOfSimpleSQL.SIMPLE_UPDATE]);
 
 /** INSERT/UPDATE 操作类型 */
-const INSERT_OR_UPDATE_TYPES = new Set<string>([
-  KeysOfSimpleSQL.SIMPLE_INSERT,
-  KeysOfSimpleSQL.SIMPLE_UPDATE,
-  KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE,
-  KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE,
-  KeysOfSimpleSQL.SIMPLE_BATCH_INSERT,
-]);
+const INSERT_OR_UPDATE_TYPES = new Set<string>([KeysOfSimpleSQL.SIMPLE_INSERT, KeysOfSimpleSQL.SIMPLE_UPDATE, KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE, KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE, KeysOfSimpleSQL.SIMPLE_BATCH_INSERT]);
 
 // ============ 工具函数 ============
 
@@ -92,9 +78,7 @@ function isInsertOrUpdateType(sqlSimpleName: string): boolean {
 }
 
 /** 获取表元数据，失败时 warn 并返回 null */
-async function getTableMetaOrWarn(
-  serviceHub: any, logger: any, cfgModel: RequestCfgModel, actionName: string
-) {
+async function getTableMetaOrWarn(serviceHub: any, logger: any, cfgModel: RequestCfgModel, actionName: string) {
   const query: ITableMetaQuery = {
     sqlTable: cfgModel.sqlTable,
     sqlDatabase: cfgModel.sqlDatabase,
@@ -187,8 +171,11 @@ class DataConvertHandler {
       const typeMap = buildColumnTypeMap(tableMeta);
 
       // 按列类型强转基础值（boolean 等适配实际 DB 字段）
-      if (isBatch) { for (const row of data) this.convertDataFieldsByType(row, typeMap, cfgModel.sqlDbType); }
-      else { this.convertDataFieldsByType(data, typeMap, cfgModel.sqlDbType); }
+      if (isBatch) {
+        for (const row of data) this.convertDataFieldsByType(row, typeMap, cfgModel.sqlDbType);
+      } else {
+        this.convertDataFieldsByType(data, typeMap, cfgModel.sqlDbType);
+      }
 
       // PostgreSQL：ARRAY 列 JS 数组 → PG 数组字面量
       if (cfgModel.sqlDbType === SqlDbType.postgres) {
@@ -199,23 +186,25 @@ class DataConvertHandler {
           }
         }
         if (arrayFieldSet.size > 0) {
-          if (isBatch) { for (const row of data) this.convertPgArrayFields(row, arrayFieldSet); }
-          else { this.convertPgArrayFields(data, arrayFieldSet); }
+          if (isBatch) {
+            for (const row of data) this.convertPgArrayFields(row, arrayFieldSet);
+          } else {
+            this.convertPgArrayFields(data, arrayFieldSet);
+          }
         }
       }
     }
 
     // 三库通用：对象/数组 → JSON.stringify（不依赖列类型）
-    if (isBatch) { for (const row of data) this.serializeObjectValues(row); }
-    else { this.serializeObjectValues(data); }
+    if (isBatch) {
+      for (const row of data) this.serializeObjectValues(row);
+    } else {
+      this.serializeObjectValues(data);
+    }
   }
 
   /** 按表字段类型转换 data 中的基础类型值 */
-  private convertDataFieldsByType(
-    dataObj: Record<string, any>,
-    typeMap: Map<string, string>,
-    sqlDbType: SqlDbType
-  ): void {
+  private convertDataFieldsByType(dataObj: Record<string, any>, typeMap: Map<string, string>, sqlDbType: SqlDbType): void {
     for (const key of Object.keys(dataObj)) {
       const value = dataObj[key];
       if (value === null || value === undefined) {
@@ -291,9 +280,7 @@ class DataConvertHandler {
     if (typeof value === 'boolean') {
       return value ? 't' : 'f';
     }
-    const escaped = ('' + value)
-      .replace(/\\/g, '\\\\')
-      .replace(/"/g, '\\"');
+    const escaped = ('' + value).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
     return '"' + escaped + '"';
   }
 
@@ -349,11 +336,7 @@ class ConditionConvertHandler {
   }
 
   /** 递归遍历 condition，支持 $or/$and 嵌套 */
-  private convertConditionFields(
-    condition: IRequestCondition,
-    typeMap: Map<string, string>,
-    sqlDbType: SqlDbType
-  ): void {
+  private convertConditionFields(condition: IRequestCondition, typeMap: Map<string, string>, sqlDbType: SqlDbType): void {
     if (!condition || typeof condition !== 'object') {
       return;
     }
@@ -410,7 +393,6 @@ class ConditionConvertHandler {
  * data/condition 类型强转、PG ARRAY 字面量、对象/数组 JSON 序列化
  */
 class CrudProDataTypeConvertService extends CrudProServiceBase {
-
   async convertDataTypeByTableMeta(reqModel: RequestModel, cfgModel: RequestCfgModel): Promise<void> {
     return new DataConvertHandler(this.serviceHub, this.logger).convertDataTypeByTableMeta(reqModel, cfgModel);
   }