midway-fatcms 0.0.7 → 0.0.8

package/dist/controller/manage/FlowConfigManageApi.js

@@ -40,7 +40,8 @@ let FlowConfigManageApi = class FlowConfigManageApi extends BaseApiController_1.
     }
     async updateFlowConfig() {
         const body = this.ctx.request.body;
-        const { flow_code, flow_version } = body.condition;
+        const flow_code = String(body.condition.flow_code);
+        const flow_version = Number(body.condition.flow_version);
         await this.flowConfigService.remove_cache_flow_config_one(flow_code, flow_version);
         return this.executeSysSimpleSQL(FlowModel_1.FLOW_TABLES.flow_config, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             enableSoftDelete: true,
@@ -53,7 +54,8 @@ let FlowConfigManageApi = class FlowConfigManageApi extends BaseApiController_1.
     }
     async deleteFlowConfig() {
         const body = this.ctx.request.body;
-        const { flow_code, flow_version } = body.condition;
+        const flow_code = String(body.condition.flow_code);
+        const flow_version = Number(body.condition.flow_version);
         await this.flowConfigService.remove_cache_flow_config_one(flow_code, flow_version);
         return this.executeSysSimpleSQL(FlowModel_1.FLOW_TABLES.flow_config, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             enableSoftDelete: true,

package/dist/controller/manage/SysConfigMangeApi.js

@@ -55,7 +55,12 @@ let SysConfigMangeApi = class SysConfigMangeApi extends BaseApiController_1.Base
         if (!id) {
             return common_dto_1.CommonResult.errorRes('id不能为空');
         }
-        const sysConfig = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getUniqueOne({ condition: body.condition }, SystemTables_1.SystemTables.sys_configs);
+        const sysConfigRes = await this.curdMixService.getQuickCrud({
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            sqlTable: SystemTables_1.SystemTables.sys_configs,
+        }).findOne({ condition: body.condition });
+        const sysConfig = sysConfigRes.row;
         if (!sysConfig) {
             return common_dto_1.CommonResult.errorRes('配置项不存在');
         }

package/dist/controller/manage/UserAccountManageApi.js

@@ -50,9 +50,14 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
         if (!id) {
             return common_dto_1.CommonResult.errorRes('id不能为空');
         }
-        const userAccountInfo = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getUniqueOne({
+        const userAccountInfoRes = await this.curdMixService.getQuickCrud({
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            sqlTable: SystemTables_1.SystemTables.sys_user_account,
+        }).findUniqueOne({
             condition: body.condition
-        }, SystemTables_1.SystemTables.sys_user_account);
+        });
+        const userAccountInfo = userAccountInfoRes.row;
         if (!userAccountInfo) {
             return common_dto_1.CommonResult.errorRes('用户信息不存在');
         }

package/dist/index.d.ts

@@ -70,7 +70,7 @@ export * from './service/curd/CurdMixByWorkbenchService';
 export * from './service/curd/CurdMixService';
 export * from './service/curd/CurdMixUtils';
 export * from './service/curd/CurdProService';
-export * from './service/curd/CrudProQuick';
+export * from './libs/crud-pro-quick';
 export * from './service/flow/FlowConfigService';
 export * from './service/flow/FlowInstanceService';
 export * from './service/flow/FlowInstanceCrudService';
@@ -87,7 +87,6 @@ export * from './models/contextLogger';
 export * from './models/devops';
 export * from './models/SystemTables';
 export * from './models/AsyncTaskModel';
-export * from './models/StandardColumns';
 export * from './schedule/index';
 export * from './libs/utils/common-dto';
 export * from './libs/utils/crypto-utils';
@@ -110,4 +109,5 @@ export * from './libs/crud-pro/models/RequestCfgModel';
 export * from './libs/crud-pro/models/SqlSegArg';
 export * from './libs/crud-pro/models/ResModel';
 export * from './libs/crud-sharding/index';
+export * from './libs/crud-pro-quick/index';
 export * from './libs/global-config/global-config';

package/dist/index.js

@@ -88,7 +88,7 @@ __exportStar(require("./service/curd/CurdMixByWorkbenchService"), exports);
 __exportStar(require("./service/curd/CurdMixService"), exports);
 __exportStar(require("./service/curd/CurdMixUtils"), exports);
 __exportStar(require("./service/curd/CurdProService"), exports);
-__exportStar(require("./service/curd/CrudProQuick"), exports);
+__exportStar(require("./libs/crud-pro-quick"), exports);
 __exportStar(require("./service/flow/FlowConfigService"), exports);
 __exportStar(require("./service/flow/FlowInstanceService"), exports);
 __exportStar(require("./service/flow/FlowInstanceCrudService"), exports);
@@ -105,7 +105,6 @@ __exportStar(require("./models/contextLogger"), exports);
 __exportStar(require("./models/devops"), exports);
 __exportStar(require("./models/SystemTables"), exports);
 __exportStar(require("./models/AsyncTaskModel"), exports);
-__exportStar(require("./models/StandardColumns"), exports);
 __exportStar(require("./schedule/index"), exports);
 __exportStar(require("./libs/utils/common-dto"), exports);
 __exportStar(require("./libs/utils/crypto-utils"), exports);
@@ -128,4 +127,5 @@ __exportStar(require("./libs/crud-pro/models/RequestCfgModel"), exports);
 __exportStar(require("./libs/crud-pro/models/SqlSegArg"), exports);
 __exportStar(require("./libs/crud-pro/models/ResModel"), exports);
 __exportStar(require("./libs/crud-sharding/index"), exports);
+__exportStar(require("./libs/crud-pro-quick/index"), exports);
 __exportStar(require("./libs/global-config/global-config"), exports);

package/dist/libs/crud-pro/CrudPro.d.ts

@@ -1,21 +1,36 @@
-import { ICrudProCfg, ILogger, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery, IVisitor } from './interfaces';
+import { ICrudProCfg, ILogger, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery, IVisitor, ExecuteSQLResult } from './interfaces';
 import { ExecuteContext } from './models/ExecuteContext';
 import { Transaction } from './models/Transaction';
 import { IExecuteContextFunc } from './models/ExecuteContextFunc';
 declare class CrudPro {
     private readonly executeContext;
     private readonly serviceHub;
+    /** 标记是否已被使用（防止重复使用导致状态污染） */
+    private _isUsed;
+    /** 标记是否正在执行中（防止并发调用） */
+    private _isExecuting;
     constructor();
+    /**
+     * 检查是否可以开始执行
+     * @throws 如果已使用或正在执行中则抛出异常
+     */
+    private checkAndMarkExecuting;
+    /**
+     * 标记执行完成
+     */
+    private markExecutionComplete;
     set transaction(transaction: Transaction);
     set logger(logger: ILogger);
     set visitor(visitor: IVisitor);
+    getVisitor(): IVisitor;
     set contextFunc(contextFunc: IExecuteContextFunc);
     set contextCfg(contextCfg: ICrudProCfg);
     /**
      * 直接执行一个SQL
      * @param sqlCfgModel
+     * @returns 返回未被包装的数据库原始结果（根据 resPicker 配置返回不同类型，无 {code, data, message} 包装层）
      */
-    executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
+    executeSQL(sqlCfgModel: ISqlCfgModel): Promise<ExecuteSQLResult>;
     /**
      * 从DB中读取配置
      * @param reqJson
@@ -28,6 +43,12 @@ declare class CrudPro {
      * @param cfgJson
      */
     executeCrudByCfg(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<ExecuteContext>;
+    /**
+     * 内部执行方法（不含检查逻辑，供内部调用）
+     * @param reqJson
+     * @param cfgJson
+     */
+    private executeCrudByCfgInternal;
     getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel>;
     getAllTableInfos(query: ITableNamesQuery, options?: ITableNamesOptions): Promise<ITableListResult>;
     /**

package/dist/libs/crud-pro/CrudPro.js

@@ -10,9 +10,35 @@ const MixinUtils_1 = require("./utils/MixinUtils");
 const keys_1 = require("./models/keys");
 class CrudPro {
     constructor() {
+        /** 标记是否已被使用（防止重复使用导致状态污染） */
+        this._isUsed = false;
+        /** 标记是否正在执行中（防止并发调用） */
+        this._isExecuting = false;
         this.executeContext = new ExecuteContext_1.ExecuteContext();
         this.serviceHub = new CurdProServiceHub_1.CurdProServiceHub(this.executeContext);
     }
+    /**
+     * 检查是否可以开始执行
+     * @throws 如果已使用或正在执行中则抛出异常
+     */
+    checkAndMarkExecuting() {
+        if (this._isUsed) {
+            throw new Error('[CrudPro] 此实例已被使用，不能重复使用。' +
+                '每次操作请创建新的 CrudPro 实例，可通过 curdProService.getCrudPro() 或工厂函数获取。');
+        }
+        if (this._isExecuting) {
+            throw new Error('[CrudPro] 此实例正在执行中，不能并发调用。' +
+                '请等待当前操作完成后再进行下一次调用，或创建新的实例。');
+        }
+        this._isExecuting = true;
+    }
+    /**
+     * 标记执行完成
+     */
+    markExecutionComplete() {
+        this._isExecuting = false;
+        this._isUsed = true;
+    }
     // 必填
     set transaction(transaction) {
         this.executeContext.setTransaction(transaction);
@@ -25,6 +51,10 @@ class CrudPro {
     set visitor(visitor) {
         this.executeContext.setVisitor(visitor);
     }
+    // 必填
+    getVisitor() {
+        return this.executeContext.getVisitor();
+    }
     set contextFunc(contextFunc) {
         contextFunc.setExecuteContext(this.executeContext);
         this.executeContext.contextFunc = contextFunc;
@@ -35,8 +65,10 @@ class CrudPro {
     /**
      * 直接执行一个SQL
      * @param sqlCfgModel
+     * @returns 返回未被包装的数据库原始结果（根据 resPicker 配置返回不同类型，无 {code, data, message} 包装层）
      */
     async executeSQL(sqlCfgModel) {
+        this.checkAndMarkExecuting();
         const RES_NAME = 'executeResult';
         const sqlCfgModel2 = {
             resName: RES_NAME,
@@ -53,8 +85,13 @@ class CrudPro {
             sqlDatabase: sqlCfgModel.sqlDatabase,
             sqlCfgList: [sqlCfgModel2],
         };
-        const ss = await this.executeCrudByCfg({}, cfgModel);
-        return ss.getResModelItem(RES_NAME);
+        try {
+            const ss = await this.executeCrudByCfgInternal({}, cfgModel);
+            return ss.getResModelItem(RES_NAME);
+        }
+        finally {
+            this.markExecutionComplete();
+        }
     }
     /**
      * 从DB中读取配置
@@ -74,6 +111,20 @@ class CrudPro {
      * @param cfgJson
      */
     async executeCrudByCfg(reqJson, cfgJson) {
+        this.checkAndMarkExecuting();
+        try {
+            return await this.executeCrudByCfgInternal(reqJson, cfgJson);
+        }
+        finally {
+            this.markExecutionComplete();
+        }
+    }
+    /**
+     * 内部执行方法（不含检查逻辑，供内部调用）
+     * @param reqJson
+     * @param cfgJson
+     */
+    async executeCrudByCfgInternal(reqJson, cfgJson) {
         const logger = this.executeContext.getLogger();
         logger.info('CurdPro executeCrudByCfg', cfgJson);
         // 在执行之前可以根据业务需要修改需要执行的内容。

package/dist/libs/crud-pro/interfaces.d.ts

@@ -45,7 +45,7 @@ export interface IPoolConnectionClient {
 export interface IRequestModel {
     method?: string;
     columns?: string | string[];
-    condition?: Record<string, any>;
+    condition?: IRequestCondition;
     data?: Record<string, any> | Record<string, any>[];
     orderBy?: string | IOrderByItem[];
     limit?: number;
@@ -54,21 +54,42 @@ export interface IRequestModel {
     pageNo?: number;
 }
 declare type IBasicType = boolean | string | number;
+/**
+ * 比较操作符条件
+ * 支持 MongoDB 风格的所有查询操作符
+ */
 export interface ICompareCondition {
-    $gt?: IBasicType;
-    $gte?: IBasicType;
+    $ne?: IBasicType;
     $lt?: IBasicType;
     $lte?: IBasicType;
-    $ne?: IBasicType;
-    $in?: IRequestCondition[];
-    $nin?: IRequestCondition[];
-    $like?: IBasicType;
-    $match?: IBasicType;
-    $matchBool?: IBasicType;
-    $range?: number[];
-}
-export interface IRequestCondition extends Record<string, any>, ICompareCondition {
+    $gt?: IBasicType;
+    $gte?: IBasicType;
+    $in?: IBasicType[];
+    $nin?: IBasicType[];
+    $range?: [number, number];
+    $like?: string;
+    $notLike?: string;
+    $likeInclude?: string;
+    $notLikeInclude?: string;
+    $match?: string;
+    $matchBool?: string | boolean;
+    $null?: boolean;
+    $notNull?: boolean;
+    $jsonArrayContains?: string;
+}
+/**
+ * 逻辑操作符条件
+ */
+export interface ILogicalCondition {
     $or?: IRequestCondition[];
+    $and?: IRequestCondition[];
+}
+/**
+ * 查询条件类型
+ * 支持字段值直接匹配或比较操作符
+ * 支持 $or, $and 逻辑组合
+ */
+export interface IRequestCondition extends Record<string, IBasicType | ICompareCondition | ILogicalCondition | IRequestCondition[] | undefined>, ILogicalCondition {
 }
 /**
  * 用户基本信息
@@ -139,6 +160,55 @@ export interface ISqlCfgModel extends IBaseCfgModel {
     executeSqlArgs?: any[];
     crudType?: string;
 }
+/**
+ * executeSQL 的返回结果类型说明（未被包装的直接结果）
+ *
+ * 注意：executeSQL 返回的是数据库查询的原始结果，没有 {code, data, message} 包装层。
+ * 返回类型取决于 resPicker 配置，请根据实际 SQL 类型选择合适的类型断言。
+ *
+ * 使用示例：
+ *   // 查询列表 - 返回数组
+ *   const rows = await executeSQL({ executeSql: 'SELECT * FROM users', resPicker: KeysOfSqlResPicker.RESULT_ROWS }) as ExecuteSQLRowResult<User>;
+ *
+ *   // 查询单行 - 返回对象或null
+ *   const user = await executeSQL({ executeSql: 'SELECT * FROM users WHERE id=?', executeSqlArgs: [1], resPicker: KeysOfSqlResPicker.RESULT_FIRST_ROW }) as ExecuteSQLSingleResult<User>;
+ *
+ *   // 查询总数 - 返回数字
+ *   const count = await executeSQL({ executeSql: 'SELECT COUNT(*) as total_count FROM users', resPicker: KeysOfSqlResPicker.RESULT_TOTAL_COUNT }) as ExecuteSQLCountResult;
+ *
+ *   // 判断存在 - 返回布尔
+ *   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;
+ */
+/** 查询多行时的返回类型（默认情况）：原始数据行数组，无包装 */
+export declare type ExecuteSQLRowsResult<T = Record<string, any>> = T[];
+/** 查询单行时的返回类型：首行对象或null，无包装 */
+export declare type ExecuteSQLSingleResult<T = Record<string, any>> = T | null;
+/** 查询数量时的返回类型：数字，无包装 */
+export declare type ExecuteSQLCountResult = number;
+/** 判断存在时的返回类型：布尔值，无包装 */
+export declare type ExecuteSQLExistResult = boolean;
+/** 增删改操作时的返回类型：包含 insertId 和 affectedRows，无包装 */
+export interface ExecuteSQLUpdateResult {
+    /** 插入记录的自增ID（仅INSERT操作有效） */
+    insertId: any;
+    /** 受影响的行数 */
+    affectedRows: number;
+}
+/**
+ * executeSQL 的通用返回类型（未被包装的直接结果）
+ * 根据 resPicker 的不同配置，实际返回类型可能是：
+ * - ExecuteSQLRowResult<T> : 多行数据（默认）
+ * - ExecuteSQLSingleResult<T> : 单行数据或null
+ * - ExecuteSQLCountResult : 数字
+ * - ExecuteSQLExistResult : 布尔值
+ * - ExecuteSQLUpdateResult : 增删改结果
+ *
+ * 警告：此类型为联合类型，使用时建议根据实际 resPicker 进行类型断言以获得精确类型提示
+ */
+export declare type ExecuteSQLResult<T = Record<string, any>> = ExecuteSQLRowsResult<T> | ExecuteSQLSingleResult<T> | ExecuteSQLCountResult | ExecuteSQLExistResult | ExecuteSQLUpdateResult;
 /**
  * 自定义校验函数。如果不正确请抛出异常。{code:'xxx',message:'xxx'}
  */

package/dist/libs/crud-pro/models/CrudResult.d.ts

@@ -0,0 +1,115 @@
+import { ResModelAffected } from './ResModel';
+import { ExecuteContext } from './ExecuteContext';
+/**
+ * 结果基类的辅助定位信息
+ * 用于错误排查和日志记录
+ */
+export interface CrudResultDebugInfo {
+    /** 数据库名 */
+    sqlDatabase?: string;
+    /** 表名 */
+    sqlTable?: string;
+    /** 方法名（配置中的 method 字段） */
+    method?: string;
+    /** 查询条件（用于定位问题） */
+    condition?: Record<string, any>;
+}
+/**
+ * 结果基类
+ *
+ * 使用 ES2022 私有字段 #rawContext 存储 ExecuteContext 引用。
+ * ES2022 私有字段特性：JSON.stringify 不会序列化 # 开头的私有字段。
+ * 因此结果对象可直接返回给 API 前端，自动过滤掉内部上下文。
+ *
+ * Node.js 兼容性：Node.js 14.6+ 完全支持 ES2022 私有字段。
+ */
+declare abstract class CrudResultBase {
+    #private;
+    /** 辅助定位信息，用于错误排查 */
+    readonly debugInfo: CrudResultDebugInfo;
+    constructor(rawContext: ExecuteContext, debugInfo?: CrudResultDebugInfo);
+    getRawContext(): ExecuteContext;
+    /**
+     * 生成带辅助定位信息的错误消息
+     * @param baseMessage 基础错误信息
+     * @returns 包含定位信息的完整错误消息
+     */
+    protected buildErrorMessage(baseMessage: string): string;
+}
+/** 写操作结果（INSERT/UPDATE/DELETE） */
+declare class CrudWriteResult extends CrudResultBase {
+    readonly affectedRows: number;
+    readonly insertId?: string | number;
+    constructor(data: {
+        affectedRows: number;
+        insertId?: string | number;
+        rawContext: ExecuteContext;
+        debugInfo?: CrudResultDebugInfo;
+    });
+}
+/** 单条查询结果 */
+declare class CrudQueryOneResult<T = Record<string, any>> extends CrudResultBase {
+    readonly row: T | null;
+    readonly found: boolean;
+    constructor(data: {
+        row: T | null;
+        rawContext: ExecuteContext;
+        debugInfo?: CrudResultDebugInfo;
+    });
+}
+/** 列表查询结果 */
+declare class CrudQueryListResult<T = Record<string, any>> extends CrudResultBase {
+    readonly rows: T[];
+    readonly count: number;
+    constructor(data: {
+        rows: T[];
+        rawContext: ExecuteContext;
+        debugInfo?: CrudResultDebugInfo;
+    });
+}
+/** 分页查询结果 */
+declare class CrudQueryPageResult<T = Record<string, any>> extends CrudResultBase {
+    readonly rows: T[];
+    readonly totalCount: number;
+    readonly count: number;
+    constructor(data: {
+        rows: T[];
+        totalCount: number;
+        rawContext: ExecuteContext;
+        debugInfo?: CrudResultDebugInfo;
+    });
+}
+/** 存在性判断结果 */
+declare class CrudExistResult extends CrudResultBase {
+    readonly exists: boolean;
+    constructor(data: {
+        exists: boolean;
+        rawContext: ExecuteContext;
+        debugInfo?: CrudResultDebugInfo;
+    });
+}
+/** 计数结果 */
+declare class CrudCountResult extends CrudResultBase {
+    readonly count: number;
+    constructor(data: {
+        count: number;
+        rawContext: ExecuteContext;
+        debugInfo?: CrudResultDebugInfo;
+    });
+}
+/** InsertOrUpdate 结果 */
+declare class CrudUpsertResult extends CrudResultBase {
+    readonly affected?: ResModelAffected;
+    readonly insertAffected?: ResModelAffected;
+    readonly updateAffected?: ResModelAffected;
+    readonly isExist: boolean;
+    constructor(data: {
+        affected?: ResModelAffected;
+        insertAffected?: ResModelAffected;
+        updateAffected?: ResModelAffected;
+        isExist: boolean;
+        rawContext: ExecuteContext;
+        debugInfo?: CrudResultDebugInfo;
+    });
+}
+export { CrudResultBase, CrudWriteResult, CrudQueryOneResult, CrudQueryListResult, CrudQueryPageResult, CrudExistResult, CrudCountResult, CrudUpsertResult, };

package/dist/libs/crud-pro/models/CrudResult.js

@@ -0,0 +1,126 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _CrudResultBase_rawContext;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrudUpsertResult = exports.CrudCountResult = exports.CrudExistResult = exports.CrudQueryPageResult = exports.CrudQueryListResult = exports.CrudQueryOneResult = exports.CrudWriteResult = exports.CrudResultBase = void 0;
+/**
+ * 结果基类
+ *
+ * 使用 ES2022 私有字段 #rawContext 存储 ExecuteContext 引用。
+ * ES2022 私有字段特性：JSON.stringify 不会序列化 # 开头的私有字段。
+ * 因此结果对象可直接返回给 API 前端，自动过滤掉内部上下文。
+ *
+ * Node.js 兼容性：Node.js 14.6+ 完全支持 ES2022 私有字段。
+ */
+class CrudResultBase {
+    constructor(rawContext, debugInfo) {
+        _CrudResultBase_rawContext.set(this, void 0);
+        __classPrivateFieldSet(this, _CrudResultBase_rawContext, rawContext, "f");
+        this.debugInfo = debugInfo || {};
+    }
+    getRawContext() {
+        return __classPrivateFieldGet(this, _CrudResultBase_rawContext, "f");
+    }
+    /**
+     * 生成带辅助定位信息的错误消息
+     * @param baseMessage 基础错误信息
+     * @returns 包含定位信息的完整错误消息
+     */
+    buildErrorMessage(baseMessage) {
+        const parts = [baseMessage];
+        if (this.debugInfo.sqlDatabase) {
+            parts.push(`数据库: ${this.debugInfo.sqlDatabase}`);
+        }
+        if (this.debugInfo.sqlTable) {
+            parts.push(`表: ${this.debugInfo.sqlTable}`);
+        }
+        if (this.debugInfo.method) {
+            parts.push(`方法: ${this.debugInfo.method}`);
+        }
+        if (this.debugInfo.condition) {
+            try {
+                parts.push(`条件: ${JSON.stringify(this.debugInfo.condition)}`);
+            }
+            catch (_a) {
+                parts.push(`条件: [无法序列化]`);
+            }
+        }
+        return parts.join(' | ');
+    }
+}
+exports.CrudResultBase = CrudResultBase;
+_CrudResultBase_rawContext = new WeakMap();
+/** 写操作结果（INSERT/UPDATE/DELETE） */
+class CrudWriteResult extends CrudResultBase {
+    constructor(data) {
+        super(data.rawContext, data.debugInfo);
+        this.affectedRows = data.affectedRows;
+        this.insertId = data.insertId;
+    }
+}
+exports.CrudWriteResult = CrudWriteResult;
+/** 单条查询结果 */
+class CrudQueryOneResult extends CrudResultBase {
+    constructor(data) {
+        super(data.rawContext, data.debugInfo);
+        this.row = data.row;
+        this.found = (this.row !== null && this.row !== undefined);
+    }
+}
+exports.CrudQueryOneResult = CrudQueryOneResult;
+/** 列表查询结果 */
+class CrudQueryListResult extends CrudResultBase {
+    constructor(data) {
+        super(data.rawContext, data.debugInfo);
+        this.rows = data.rows || [];
+        this.count = this.rows.length;
+    }
+}
+exports.CrudQueryListResult = CrudQueryListResult;
+/** 分页查询结果 */
+class CrudQueryPageResult extends CrudResultBase {
+    constructor(data) {
+        super(data.rawContext, data.debugInfo);
+        this.rows = data.rows || [];
+        this.totalCount = data.totalCount;
+        this.count = this.rows.length;
+    }
+}
+exports.CrudQueryPageResult = CrudQueryPageResult;
+/** 存在性判断结果 */
+class CrudExistResult extends CrudResultBase {
+    constructor(data) {
+        super(data.rawContext, data.debugInfo);
+        this.exists = data.exists;
+    }
+}
+exports.CrudExistResult = CrudExistResult;
+/** 计数结果 */
+class CrudCountResult extends CrudResultBase {
+    constructor(data) {
+        super(data.rawContext, data.debugInfo);
+        this.count = data.count;
+    }
+}
+exports.CrudCountResult = CrudCountResult;
+/** InsertOrUpdate 结果 */
+class CrudUpsertResult extends CrudResultBase {
+    constructor(data) {
+        super(data.rawContext, data.debugInfo);
+        this.affected = data.affected;
+        this.insertAffected = data.insertAffected;
+        this.updateAffected = data.updateAffected;
+        this.isExist = data.isExist;
+    }
+}
+exports.CrudUpsertResult = CrudUpsertResult;

package/dist/libs/crud-pro/models/RequestModel.d.ts

@@ -1,9 +1,9 @@
-import { IOrderByItem, IRequestModel, IVisitor } from '../interfaces';
+import { IOrderByItem, IRequestModel, IVisitor, IRequestCondition } from '../interfaces';
 declare class RequestModel {
     visitor: IVisitor;
     method: string;
     columns?: string[];
-    condition?: Record<string, any>;
+    condition?: IRequestCondition;
     data?: Record<string, any> | Record<string, any>[];
     limit: number;
     offset: number;

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

@@ -16,6 +16,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
     async executeSqlCfgModels() {
         const exeCtx = this.getExecuteContext();
         const sqlCfgModels = exeCtx.getSqlCfgModels();
+        console.log("CrudProExecuteSqlService===> " + JSON.stringify(sqlCfgModels));
         for (let i = 0; i < sqlCfgModels.length; i++) {
             const sqlCfgModel = sqlCfgModels[i];
             const checkResult = this.executeSqlCfgModelPreCheck(sqlCfgModel);
@@ -73,9 +74,42 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
             // 允许空SQL，没有需要执行的正常。
             return false;
         }
+        const errorMsg = `禁止执行的SQL: ${sqlCfgModel.executeSql}`;
         if (keys_1.KeyOfCrudTypes.NOT_CRUD === crudType) {
-            // 只支持增删改查，其他语句不支持。
-            throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_NOT_SUPPORT_THE_SQL, sqlCfgModel.executeSql);
+            // 在 isNativeSQL 模式下，允许特定的 DDL 操作（CREATE TABLE、CREATE INDEX 等），但禁止 DROP TABLE
+            if (sqlCfgModel.isNativeSQL) {
+                // 禁止的 DDL 操作（破坏性操作）
+                const forbiddenPatterns = [
+                    /^\s*DROP\s+TABLE/i,
+                    /^\s*DROP\s+DATABASE/i,
+                    /^\s*DROP\s+SCHEMA/i,
+                    /^\s*TRUNCATE\s+TABLE/i,
+                ];
+                for (const pattern of forbiddenPatterns) {
+                    if (pattern.test(sqlCfgModel.executeSql)) {
+                        throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_NOT_SUPPORT_THE_SQL, errorMsg);
+                    }
+                }
+                // 允许的 DDL 操作白名单
+                const allowedPatterns = [
+                    /^\s*CREATE\s+TABLE/i,
+                    /^\s*CREATE\s+INDEX/i,
+                    /^\s*CREATE\s+UNIQUE\s+INDEX/i,
+                    /^\s*ALTER\s+TABLE/i,
+                ];
+                const isAllowed = allowedPatterns.some(pattern => pattern.test(sqlCfgModel.executeSql));
+                if (isAllowed) {
+                    // 允许的 DDL 操作，继续执行后续校验
+                }
+                else {
+                    // 非允许的 DDL 操作，仍然抛出异常
+                    throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_NOT_SUPPORT_THE_SQL, errorMsg);
+                }
+            }
+            else {
+                // 非 isNativeSQL 模式下，只支持增删改查，其他语句不支持。
+                throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_NOT_SUPPORT_THE_SQL, errorMsg);
+            }
         }
         // 此SQL不需要执行
         if (!this.isNeedExecute(sqlCfgModel)) {