midway-fatcms 0.0.1-beta.3 → 0.0.1-beta.31

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

@@ -1,5 +1,5 @@
 import { ColumnRelation } from '../../libs/crud-pro/interfaces';
-import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
+import { HandleExecuteContextType } from '../../libs/crud-pro/models/ExecuteContext';
 import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
 declare enum RelatedType {
     dict = "dict",
@@ -13,9 +13,25 @@ declare class CrudMixUtils {
     private readonly relatedType;
     constructor(relatedType: RelatedType);
     private getColumnsRelation;
-    pickColumnRelations(exeCtx: ExecuteContext): ColumnRelation[];
-    pickColumnRelationCodes(exeCtx: ExecuteContext): string[];
-    forEachRowAndColumnsRelation(exeCtx: ExecuteContext, func: FuncRowColumnRelation): void;
+    /**
+     * 从执行上下文，获取所有的关联关系
+     * @param exeCtxType
+     * @returns
+     */
+    pickColumnRelations(exeCtxType: HandleExecuteContextType): ColumnRelation[];
+    /**
+     * 从执行上下文，获取所有的关联关系的代码
+     * @param exeCtx
+     * @returns
+     */
+    pickColumnRelationCodes(exeCtx: HandleExecuteContextType): string[];
+    /**
+     * 遍历每一行，每一个关联列
+     * @param exeCtxType
+     * @param func
+     * @returns
+     */
+    forEachRowAndColumnsRelation(exeCtxType: HandleExecuteContextType, func: FuncRowColumnRelation): void;
     copyColumnRelationToRow(row: any, multiKeyMap: MultiKeyMap, columnRelation: ColumnRelation): void;
     /**
      * 无relatedCode模式
@@ -24,5 +40,12 @@ declare class CrudMixUtils {
      * @param columnRelation
      */
     copyColumnRelationToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation): void;
+    /**
+     * 专门COPY用户信息到row上面。无relatedCode模式
+     * @param row
+     * @param map
+     * @param columnRelation
+     */
+    copyUserInfoToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation): void;
 }
 export { CrudMixUtils, RelatedType, FuncRowColumnRelation };

package/dist/service/curd/CurdMixUtils.js

@@ -24,6 +24,11 @@ function getColumnsRelationAll(sqlCfg, cfgModel) {
     }
     return [];
 }
+const forEachColumnsRelation = (row, columnsRelation, func) => {
+    for (let i = 0; i < columnsRelation.length; i++) {
+        func(row, columnsRelation[i]);
+    }
+};
 function copyBySingleSourceValue(row, sourceValue, targetColumns, getValue) {
     // const codeObject = map.get(sourceValue);
     const codeObject = getValue(sourceValue);
@@ -33,53 +38,60 @@ function copyBySingleSourceValue(row, sourceValue, targetColumns, getValue) {
     if (Array.isArray(targetColumns)) {
         for (let i = 0; i < targetColumns.length; i++) {
             const targetColumn = targetColumns[i];
-            const toStr = targetColumn.to.replace('[$ARRAY_INDEX]', ``);
-            if (targetColumn.from === "*") {
+            const toStr = targetColumn.to.replace('[$ARRAY_INDEX]', '');
+            if (targetColumn.from === '*') {
                 _.set(row, toStr, codeObject);
             }
             else {
                 const dictAttrValue = _.get(codeObject, targetColumn.from);
-                if (typeof dictAttrValue !== "undefined" && dictAttrValue !== null) {
+                if (typeof dictAttrValue !== 'undefined' && dictAttrValue !== null) {
                     _.set(row, toStr, dictAttrValue);
                 }
             }
         }
     }
 }
-function copyByArraySourceValue(row, sourceValue, targetColumns, getValue) {
-    let isSetArray = false;
-    // 支持关联JSON数组
-    if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
-        const codes = (0, functions_1.parseJsonObject)(sourceValue);
-        if (Array.isArray(codes)) {
-            for (let codeIndex = 0; codeIndex < codes.length; codeIndex++) {
-                const code = codes[codeIndex];
-                // const codeObject = map.get(code);
-                const codeObject = getValue(code);
-                if (codeObject) {
-                    if (Array.isArray(targetColumns)) {
-                        for (let i = 0; i < targetColumns.length; i++) {
-                            const targetColumn = targetColumns[i];
-                            if (targetColumn.from === '*') {
-                                const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
-                                _.set(row, toStr, codeObject);
-                                isSetArray = true;
-                            }
-                            else {
-                                const dictAttrValue = _.get(codeObject, targetColumn.from);
-                                if (typeof dictAttrValue !== "undefined" && dictAttrValue !== null) {
-                                    const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
-                                    _.set(row, toStr, dictAttrValue);
-                                    isSetArray = true;
-                                }
-                            }
+function copyByArraySourceValueInner(row, codes, targetColumns, getValue, resultObj) {
+    for (let codeIndex = 0; codeIndex < codes.length; codeIndex++) {
+        const code = codes[codeIndex];
+        // const codeObject = map.get(code);
+        const codeObject = getValue(code);
+        if (codeObject) {
+            if (Array.isArray(targetColumns)) {
+                for (let i = 0; i < targetColumns.length; i++) {
+                    const targetColumn = targetColumns[i];
+                    if (targetColumn.from === '*') {
+                        const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
+                        _.set(row, toStr, codeObject);
+                        resultObj.isSetArray = true;
+                    }
+                    else {
+                        const dictAttrValue = _.get(codeObject, targetColumn.from);
+                        if (typeof dictAttrValue !== 'undefined' && dictAttrValue !== null) {
+                            const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
+                            _.set(row, toStr, dictAttrValue);
+                            resultObj.isSetArray = true;
                         }
                     }
                 }
             }
         }
     }
-    return isSetArray;
+}
+function copyByArraySourceValue(row, sourceValue, targetColumns, getValue) {
+    const resultObj = { isSetArray: false };
+    // 支持关联JSON数组。使用 字符串存储的类型
+    if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
+        const codes = (0, functions_1.parseJsonObject)(sourceValue);
+        if (Array.isArray(codes)) {
+            copyByArraySourceValueInner(row, codes, targetColumns, getValue, resultObj);
+        }
+    }
+    else if (Array.isArray(sourceValue)) {
+        // 直接使用JSON或者postgres的数组存储的类型
+        copyByArraySourceValueInner(row, sourceValue, targetColumns, getValue, resultObj);
+    }
+    return resultObj.isSetArray;
 }
 class CrudMixUtils {
     constructor(relatedType) {
@@ -90,8 +102,21 @@ class CrudMixUtils {
         const relatedType = this.relatedType;
         return ss.filter(s => s.relatedType === relatedType);
     }
-    pickColumnRelations(exeCtx) {
+    /**
+     * 从执行上下文，获取所有的关联关系
+     * @param exeCtxType
+     * @returns
+     */
+    pickColumnRelations(exeCtxType) {
+        // 自定义的关联关系
+        const customExeCtx = exeCtxType;
+        if (customExeCtx.isCustomContext) {
+            const customExeCtx = exeCtxType;
+            return customExeCtx.columnsRelation;
+        }
+        // 默认的执行上下文
         const relationResult = [];
+        const exeCtx = exeCtxType;
         const cfgModel = exeCtx.getCfgModel();
         const sqlModels = exeCtx.getSqlCfgModels();
         if (Array.isArray(sqlModels) && sqlModels.length > 0) {
@@ -113,6 +138,11 @@ class CrudMixUtils {
             return `${obj.relatedCode}_${obj.relatedType}_${obj.sourceColumn}_${JSON.stringify(obj.targetColumns)}`;
         });
     }
+    /**
+     * 从执行上下文，获取所有的关联关系的代码
+     * @param exeCtx
+     * @returns
+     */
     pickColumnRelationCodes(exeCtx) {
         const relationResult = this.pickColumnRelations(exeCtx);
         const codes = relationResult.map(e => e.relatedCode);
@@ -121,15 +151,29 @@ class CrudMixUtils {
         }
         return [...new Set(codes)]; // 去重
     }
-    forEachRowAndColumnsRelation(exeCtx, func) {
+    /**
+     * 遍历每一行，每一个关联列
+     * @param exeCtxType
+     * @param func
+     * @returns
+     */
+    forEachRowAndColumnsRelation(exeCtxType, func) {
+        // 自定义的关联关系
+        const customExeCtx = exeCtxType;
+        if (customExeCtx.isCustomContext) {
+            const rows = customExeCtx.rows || [];
+            const columnsRelation = customExeCtx.columnsRelation;
+            for (let index = 0; index < rows.length; index++) {
+                const row = rows[index];
+                forEachColumnsRelation(row, columnsRelation, func);
+            }
+            return;
+        }
+        // 默认的执行上下文
+        const exeCtx = exeCtxType;
         const sqlCfgList = exeCtx.getSqlCfgModels();
         const resModel = exeCtx.getResModel();
         const cfgModel = exeCtx.getCfgModel();
-        const forEachColumnsRelation = (row, columnsRelation) => {
-            for (let i = 0; i < columnsRelation.length; i++) {
-                func(row, columnsRelation[i]);
-            }
-        };
         for (let i = 0; i < sqlCfgList.length; i++) {
             const sqlCfg = sqlCfgList[i];
             // 只有Select语句需要
@@ -140,12 +184,12 @@ class CrudMixUtils {
                     if (Array.isArray(resValue) && isNotEmpty(resValue)) {
                         // 多行查询时
                         for (const row of resValue) {
-                            forEachColumnsRelation(row, columnsRelation);
+                            forEachColumnsRelation(row, columnsRelation, func);
                         }
                     }
                     else if (typeof resValue === 'object' && isNotEmpty(resValue)) {
                         // 单行查询时
-                        forEachColumnsRelation(resValue, columnsRelation);
+                        forEachColumnsRelation(resValue, columnsRelation, func);
                     }
                 }
             }
@@ -187,7 +231,37 @@ class CrudMixUtils {
             if (!map) {
                 return null;
             }
-            if (typeof map.get === "function") {
+            if (typeof map.get === 'function') {
+                return map.get(`${code}`);
+            }
+            return map[code];
+        };
+        const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
+        if (!isSetArray) {
+            copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
+        }
+    }
+    /**
+     * 专门COPY用户信息到row上面。无relatedCode模式
+     * @param row
+     * @param map
+     * @param columnRelation
+     */
+    copyUserInfoToRowNoRelatedCode(row, map, columnRelation) {
+        const { targetColumns } = columnRelation;
+        if (!targetColumns) {
+            return;
+        }
+        const tmpSourceColumn = '__fatcmsUserAccountId__';
+        const sourceValue = _.get(row, tmpSourceColumn);
+        if (!sourceValue) {
+            return;
+        }
+        const getValue = (code) => {
+            if (!map) {
+                return null;
+            }
+            if (typeof map.get === 'function') {
                 return map.get(`${code}`);
             }
             return map[code];

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

@@ -5,14 +5,7 @@ import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/mode
 import { RelatedType } from './CurdMixUtils';
 import { BaseService } from '../base/BaseService';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
-export declare class DBUtils {
-    private readonly sqlDatabase;
-    private readonly sqlDdType;
-    private readonly curdProService;
-    constructor(sqlDatabase: string, sqlDdType: SqlDbType, curdProService: CurdProService);
-    getOne(reqJson: IRequestModel, sqlTable: string): Promise<any>;
-    getList(reqJson: IRequestModel, sqlTable: string): Promise<any[]>;
-}
+import { CrudProQuick } from '../../service/curd/CrudProQuick';
 export declare class CurdProService extends BaseService {
     protected ctx: Context;
     private mysql2Config;
@@ -21,6 +14,7 @@ export declare class CurdProService extends BaseService {
     private crudProCfg;
     private responseCfgHandlers;
     setResponseCfgHandlers(key: RelatedType, handler: IExecuteContextHandler): void;
+    getResponseCfgHandlers(): Record<RelatedType, IExecuteContextHandler>;
     /**
      * Execute级别：每次调用都会产生新的
      * @private
@@ -33,7 +27,6 @@ export declare class CurdProService extends BaseService {
     executeCrud(reqJson: IRequestModel): Promise<ExecuteContext>;
     executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
     executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext>;
-    private applyStandardUpdateCfg;
-    getBbUtil(database: string, sqlDdType: SqlDbType): DBUtils;
+    getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick;
     getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;
 }

package/dist/service/curd/CurdProService.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CurdProService = exports.DBUtils = void 0;
+exports.CurdProService = void 0;
 const _ = require("lodash");
 const core_1 = require("@midwayjs/core");
 const CrudPro_1 = require("../../libs/crud-pro/CrudPro");
@@ -20,7 +20,9 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const ExecuteContextFunc_1 = require("../../libs/crud-pro/models/ExecuteContextFunc");
 const BaseService_1 = require("../base/BaseService");
-const bizmodels_1 = require("../../models/bizmodels");
+const CrudProQuick_1 = require("../../service/curd/CrudProQuick");
+const fixCfgModel_1 = require("./fixCfgModel");
+const global_config_1 = require("../../libs/global-config/global-config");
 function toVisitor(ctx) {
     const workbenchInfo = ctx.workbenchInfo;
     const userSession = ctx.userSession;
@@ -61,27 +63,30 @@ class MyContextFunc extends ExecuteContextFunc_1.BaseExecuteContextFunc {
     }
     async getConnectionPool(sqlCfgModel) {
         if (!sqlCfgModel.sqlDatabase) {
-            console.error('查询语句中未指定数据库', sqlCfgModel.executeSql);
+            console.error('[MyContextFunc]查询语句中未指定数据库', sqlCfgModel.executeSql);
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_QUERY_PARAM_EMPTY, '查询语句中未指定数据库');
         }
         const dataBaseName = sqlCfgModel.sqlDatabase;
-        const sqlDdType = sqlCfgModel.sqlDdType;
-        if (sqlDdType === keys_1.SqlDbType.postgres) {
+        const sqlDbType = sqlCfgModel.sqlDbType;
+        if (sqlDbType === keys_1.SqlDbType.postgres) {
             const dbConfig = _.get(this.postgres2Config, dataBaseName);
             if (!dbConfig) {
+                console.error('[MyContextFunc]postgres配置中不存在此数据库', JSON.stringify(sqlCfgModel));
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_NOT_FOUND, 'postgres配置中不存在此数据库:' + dataBaseName);
             }
             return (0, PostgresUtils_1.getConnectionPool)(dataBaseName, dbConfig);
         }
-        if (sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (sqlDbType === keys_1.SqlDbType.sqlserver) {
             const dbConfig = _.get(this.sqlserver2Config, dataBaseName);
             if (!dbConfig) {
+                console.error('[MyContextFunc]sqlserver配置中不存在此数据库', JSON.stringify(sqlCfgModel));
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_NOT_FOUND, 'sqlserver配置中不存在此数据库:' + dataBaseName);
             }
             return (0, SqlServerUtils_1.getConnectionPool)(dataBaseName, dbConfig);
         }
         const dbConfig = _.get(this.mysql2Config, dataBaseName);
         if (!dbConfig) {
+            console.error('[MyContextFunc]MySQL配置中不存在此数据库', JSON.stringify(sqlCfgModel));
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_NOT_FOUND, 'MySQL配置中不存在此数据库:' + dataBaseName);
         }
         return (0, MySQLUtils_1.getConnectionPool)(dataBaseName, dbConfig);
@@ -96,43 +101,19 @@ class MyContextFunc extends ExecuteContextFunc_1.BaseExecuteContextFunc {
         }
         return null;
     }
-}
-class DBUtils {
-    constructor(sqlDatabase, sqlDdType, curdProService) {
-        this.sqlDatabase = sqlDatabase;
-        this.sqlDdType = sqlDdType;
-        this.curdProService = curdProService;
-    }
-    async getOne(reqJson, sqlTable) {
-        const cfgModel = {
-            sqlTable,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: this.sqlDatabase,
-            sqlDdType: this.sqlDdType,
-            updateCfg: {},
-        };
-        const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-        return res.getOneObj();
-    }
-    async getList(reqJson, sqlTable) {
-        const cfgModel = {
-            sqlTable,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: this.sqlDatabase,
-            sqlDdType: this.sqlDdType,
-            updateCfg: {},
-        };
-        const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-        return res.getResRows();
+    /**
+     * 在执行之前可以根据业务需要修改需要执行的内容
+     * @param reqJson
+     * @param cfgJson
+     */
+    async beforeExecuteSQLList(reqJson, cfgJson) {
+        const { bizUpdateCfgModelForCrudPro } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        if (typeof bizUpdateCfgModelForCrudPro === 'function') {
+            await bizUpdateCfgModelForCrudPro(reqJson, cfgJson);
+        }
+        return Promise.resolve();
     }
 }
-exports.DBUtils = DBUtils;
-function isSimpleQuery(sqlSimpleName) {
-    return sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE;
-}
 let CurdProService = class CurdProService extends BaseService_1.BaseService {
     constructor() {
         super(...arguments);
@@ -141,6 +122,9 @@ let CurdProService = class CurdProService extends BaseService_1.BaseService {
     setResponseCfgHandlers(key, handler) {
         this.responseCfgHandlers[key] = handler;
     }
+    getResponseCfgHandlers() {
+        return this.responseCfgHandlers;
+    }
     /**
      * Execute级别：每次调用都会产生新的
      * @private
@@ -152,11 +136,15 @@ let CurdProService = class CurdProService extends BaseService_1.BaseService {
         crudPro.transaction = this.ctx.transaction;
         crudPro.logger = this.getContextLogger();
         crudPro.visitor = visitor;
-        crudPro.contextCfg = this.crudProCfg;
+        const crudProCfg = this.crudProCfg || {};
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        crudProCfg.sysDatabaseName = SystemDbName;
+        crudProCfg.sysDatabaseDbType = SystemDbType;
+        crudPro.contextCfg = crudProCfg;
         crudPro.contextFunc = new MyContextFunc({
             mysql2Config: this.mysql2Config,
             postgres2Config: this.postgres2Config,
-            sqlserver2Config: this.sqlserver2Config
+            sqlserver2Config: this.sqlserver2Config,
         }, this.responseCfgHandlers);
         return crudPro;
     }
@@ -181,114 +169,14 @@ let CurdProService = class CurdProService extends BaseService_1.BaseService {
     // 直接执行一个请求
     async executeCrudByCfg(reqJson, cfgModel) {
         this.logInfo('executeCrudByCfg', cfgModel);
-        if (!cfgModel.method) {
-            const req = this.ctx.req;
-            if (req) {
-                cfgModel.method = `${req.method}:${req.url}`;
-            }
-            else {
-                cfgModel.method = 'anonymous';
-            }
-        }
-        if (!cfgModel.updateCfg) {
-            cfgModel.updateCfg = {};
-        }
-        // 应用标准的updateCfg
-        this.applyStandardUpdateCfg(cfgModel);
         const curdPro = this.getCrudPro();
+        // 应用标准的updateCfg。
+        (0, fixCfgModel_1.fixCfgModel)(cfgModel);
         return await curdPro.executeCrudByCfg(reqJson, cfgModel);
     }
-    applyStandardUpdateCfg(cfgModel) {
-        const sqlSimpleName = cfgModel.sqlSimpleName;
-        const enableStandardUpdateCfg = cfgModel.enableStandardUpdateCfg; // 用于设置data字段
-        const enableStandardUpdateCfgCondition = cfgModel.enableStandardUpdateCfgCondition; // 用于设置condition字段
-        // 彻底关闭
-        if (enableStandardUpdateCfg === false) {
-            return;
-        }
-        const getDataCfgArray = () => {
-            // 明确有配置
-            if (Array.isArray(enableStandardUpdateCfg)) {
-                if (enableStandardUpdateCfg.includes('null')) {
-                    return [];
-                }
-                return enableStandardUpdateCfg;
-            }
-            // update 、insert 添加 by
-            return ['by']; // 创建/修改语句默认添加by
-        };
-        const getConditionCfgArray = () => {
-            // 明确有配置
-            if (Array.isArray(enableStandardUpdateCfgCondition)) {
-                if (enableStandardUpdateCfgCondition.includes('null')) {
-                    return [];
-                }
-                return enableStandardUpdateCfgCondition;
-            }
-            return [];
-        };
-        const dataCfgArray = getDataCfgArray();
-        const conditionCfgArray = getConditionCfgArray();
-        const mapping = {
-            'condition.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
-            'condition.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
-            'data.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
-            'data.created_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
-            'data.created_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
-            'data.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
-            'data.modified_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
-            'data.modified_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
-            'data.modified_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
-            'data.modified_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
-        };
-        const buildUpdateCfgBy = (cfgArray, prefix) => {
-            const obj = {};
-            if (Array.isArray(cfgArray)) {
-                for (let i = 0; i < cfgArray.length; i++) {
-                    const suffix = cfgArray[i];
-                    if (suffix) {
-                        const key = `${prefix}_${suffix}`;
-                        obj[key] = mapping[key];
-                    }
-                }
-            }
-            return obj;
-        };
-        // 查询语句
-        if (isSimpleQuery(sqlSimpleName)) {
-            const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 查询用户本人创建的
-            Object.assign(cfgModel.updateCfg, updateCfgObj);
-        }
-        // 删除语句
-        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_DELETE) {
-            const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 删除用户本人创建的
-            Object.assign(cfgModel.updateCfg, updateCfgObj);
-        }
-        // 插入语句
-        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT) {
-            const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
-            Object.assign(cfgModel.updateCfg, updateCfgObj1);
-        }
-        // 更新语句
-        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE) {
-            const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
-            const updateCfgObj2 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
-            Object.assign(cfgModel.updateCfg, updateCfgObj1);
-            Object.assign(cfgModel.updateCfg, updateCfgObj2);
-        }
-        // 插入或更新
-        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE ||
-            sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE) {
-            const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
-            const updateCfgObj2 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
-            const updateCfgObj3 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
-            Object.assign(cfgModel.updateCfg, updateCfgObj1);
-            Object.assign(cfgModel.updateCfg, updateCfgObj2);
-            Object.assign(cfgModel.updateCfg, updateCfgObj3);
-        }
-    }
-    getBbUtil(database, sqlDdType) {
-        return new DBUtils(database, sqlDdType, this);
+    getBbUtil(sqlDatabase, sqlDbType, sqlTable) {
+        const curdPro = this.getCrudPro();
+        return new CrudProQuick_1.CrudProQuick(curdPro, sqlDatabase, sqlDbType, sqlTable);
     }
     async getCachedCfgByMethod(method) {
         const curdPro = this.getCrudPro();

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

@@ -0,0 +1,3 @@
+import { IRequestCfgModel2 } from "../../models/bizmodels";
+declare function fixCfgModel(cfgModel: IRequestCfgModel2): void;
+export { fixCfgModel };