midway-fatcms 0.0.1-beta.13 → 0.0.1-beta.16

package/dist/service/curd/CrudProQuick.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrudProQuick = void 0;
+const keys_1 = require("../../libs/crud-pro/models/keys");
+class CrudProQuick {
+    constructor(curdPro, sqlDatabase, sqlDbType, sqlTable) {
+        this.baseCfgModel = {};
+        this.sqlDatabase = sqlDatabase;
+        this.sqlDbType = sqlDbType;
+        this.curdPro = curdPro;
+        this.sqlTable = sqlTable; // 全局sqlTable为空时，单独调用时就必须传sqlTable参数。
+    }
+    setBaseCfgModel(baseCfgModel) {
+        Object.assign(this.baseCfgModel, baseCfgModel);
+    }
+    async executeCrudByCfg(reqJson, cfgModel2) {
+        const cfgModel = { ...this.baseCfgModel };
+        Object.assign(cfgModel, cfgModel2);
+        cfgModel.method = 'CrudProQuickAnonymous';
+        cfgModel.updateCfg = {};
+        cfgModel.sqlDatabase = this.sqlDatabase;
+        cfgModel.sqlDbType = this.sqlDbType;
+        if (!cfgModel.sqlTable) {
+            cfgModel.sqlTable = this.sqlTable;
+        }
+        if (!cfgModel.sqlTable) {
+            throw new Error('[CrudProQuick] sqlTable not found');
+        }
+        return await this.curdPro.executeCrudByCfg(reqJson, cfgModel);
+    }
+    async getOne(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getOneObj();
+    }
+    async getList(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResRows();
+    }
+    async getListPage(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel(); // 因为它有2个返回值
+    }
+    async getTotalCount(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel().total_count;
+    }
+    async insertObject(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel().affected;
+    }
+    async updateObject(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel().affected;
+    }
+    async insertOrUpdate(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel(); // 因为它有三个返回值
+    }
+    async deleteObject(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_DELETE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel().affected;
+    }
+    async executeSQL(executeSql, args) {
+        const sqlCfgModel = {
+            executeSql: executeSql,
+            executeSqlArgs: args,
+            sqlDatabase: this.sqlDatabase,
+            sqlDbType: this.sqlDbType,
+        };
+        return await this.curdPro.executeSQL(sqlCfgModel);
+    }
+}
+exports.CrudProQuick = CrudProQuick;

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

@@ -1,7 +1,7 @@
 import { Context } from '@midwayjs/koa';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-import { RedisCacheService } from "../base/RedisCacheService";
+import { RedisCacheService } from '../base/RedisCacheService';
 export declare class CurdMixByLinkToCustomService implements IExecuteContextHandler {
     protected ctx: Context;
     protected curdProService: CurdProService;
@@ -13,10 +13,19 @@ export declare class CurdMixByLinkToCustomService implements IExecuteContextHand
      * code形如：mysql_________fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
      * code形如：fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
      * code形如：fatcms~~~sys_perm_role~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,name
      * 【数据库】~~~【表名】~~~【value】,【label】，【style】
      * @param code
      * @private
      */
     private queryInfoByLinkToCustomImpl;
+    /**
+     *
+     * @param code
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,name
+     */
+    private queryInfoByLinkToCustomByCrudMethod;
     private loadInfoByLinkToCustomMap;
 }

package/dist/service/curd/CurdMixByLinkToCustomService.js

@@ -19,8 +19,32 @@ const devops_1 = require("../../models/devops");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const RedisCacheService_1 = require("../base/RedisCacheService");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
+const global_config_1 = require("../../libs/global-config/global-config");
 const linkToCustomMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.linkToCustom);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByLinkToCustomService');
+function toMapObject(rows, fieldsArr) {
+    const valueKey = fieldsArr[0];
+    const labelKey = fieldsArr[1];
+    const isObjectMode = fieldsArr.length > 2 || labelKey === '*';
+    const map = new Map();
+    for (let i = 0; i < rows.length; i++) {
+        const rowObj = rows[i];
+        const value = rowObj[valueKey];
+        if (typeof value !== 'undefined') {
+            const valueStr = '' + value;
+            if (isObjectMode) {
+                map.set(valueStr, rowObj);
+            }
+            else {
+                const label = rowObj[labelKey];
+                if (label) {
+                    map.set(valueStr, label);
+                }
+            }
+        }
+    }
+    return map;
+}
 let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
     async handleExecuteContextPrepare(executeContext) {
         const relations = linkToCustomMixUtils.pickColumnRelations(executeContext);
@@ -43,8 +67,8 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
                 if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
                     columnRelation.targetColumns = [
                         {
-                            "from": "*",
-                            "to": `${sourceColumn}_info[$ARRAY_INDEX]`
+                            from: '*',
+                            to: `${sourceColumn}_info[$ARRAY_INDEX]`,
                         },
                     ];
                 }
@@ -54,7 +78,7 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
         });
     }
     async queryInfoByLinkToCustom(code) {
-        const cacheKey = "linkToCustom@@" + code;
+        const cacheKey = 'linkToCustom@@' + code;
         let values;
         const expireSecond = 2 * 60; // 2分钟
         const enumMap = await this.redisCacheService.getJsonObject(cacheKey);
@@ -68,11 +92,16 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
      * code形如：mysql_________fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
      * code形如：fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
      * code形如：fatcms~~~sys_perm_role~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,name
      * 【数据库】~~~【表名】~~~【value】,【label】，【style】
      * @param code
      * @private
      */
     async queryInfoByLinkToCustomImpl(code) {
+        if (code.startsWith('GET_BY_CRUD_METHOD')) {
+            return this.queryInfoByLinkToCustomByCrudMethod(code);
+        }
         const arr = code
             .split('~~~')
             .map(s => s.trim())
@@ -89,12 +118,10 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
         if (fieldsArr.length < 2) {
             throw new devops_1.BizException('linkToCustom枚举值查询字符串，fields字段必须符合固定格式', exceptions_1.Exceptions.CFG_ERROR);
         }
-        const valueKey = fieldsArr[0];
         const labelKey = fieldsArr[1];
-        const isObjectMode = fieldsArr.length > 2 || labelKey === "*";
         const res1 = await this.curdProService.executeCrudByCfg({
             condition: {},
-            columns: labelKey === "*" ? null : fields,
+            columns: labelKey === '*' ? null : fields,
             limit: 4000,
             offset: 0,
         }, {
@@ -105,30 +132,51 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
             maxLimit: 4000,
         });
         const rows = res1.getResRows();
-        const map = new Map();
-        for (let i = 0; i < rows.length; i++) {
-            const rowObj = rows[i];
-            const value = rowObj[valueKey];
-            if (typeof value !== 'undefined') {
-                const valueStr = "" + value;
-                if (isObjectMode) {
-                    map.set(valueStr, rowObj);
-                }
-                else {
-                    const label = rowObj[labelKey];
-                    if (label) {
-                        map.set(valueStr, label);
-                    }
-                }
-            }
+        const map = toMapObject(rows, fieldsArr);
+        return map;
+    }
+    /**
+     *
+     * @param code
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,name
+     */
+    async queryInfoByLinkToCustomByCrudMethod(code) {
+        const arr = code
+            .split('~~~')
+            .map(s => s.trim())
+            .filter(Boolean);
+        if (arr.length !== 3) {
+            throw new devops_1.BizException('linkToCustom枚举值查询字符串，必须符合固定格式。', exceptions_1.Exceptions.CFG_ERROR);
+        }
+        const [prefix, methodCode, fields] = arr;
+        const fieldsArr = fields
+            .split(',')
+            .map(s => s.trim())
+            .filter(Boolean);
+        if (fieldsArr.length < 2) {
+            throw new devops_1.BizException(`linkToCustom枚举值查询字符串，fields字段必须符合固定格式。${prefix}`, exceptions_1.Exceptions.CFG_ERROR);
+        }
+        const methodInfo = (await this.curdProService.getCachedCfgByMethod(methodCode));
+        if (!methodInfo || methodInfo.status !== 1) {
+            throw new Error('接口不存在或已下线: ' + methodCode);
         }
+        const cfgModel = methodInfo;
+        const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(cfgModel.sqlDatabase);
+        cfgModel.sqlDatabase = dbName;
+        cfgModel.sqlDbType = dbType;
+        const reqJson = {};
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudMtd(reqJson, cfgModel, methodInfo, this.ctx);
+        const exeCtx = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
+        const rows = exeCtx.getResRows();
+        const map = toMapObject(rows, fieldsArr);
         return map;
     }
     async loadInfoByLinkToCustomMap(relations) {
         const bigMap = new Map();
         for (let i = 0; i < relations.length; i++) {
             const relation = relations[i];
-            const code = relation.relatedCode || "";
+            const code = relation.relatedCode || '';
             const codeTrim = code.trim();
             const map = await this.queryInfoByLinkToCustom(codeTrim);
             bigMap.set(codeTrim, map);

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

@@ -10,7 +10,7 @@ export declare class CurdMixService {
     private curdMixByLinkToCustomService;
     private prepare;
     executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
-    getBbUtil(database: string, sqlDbType: SqlDbType): import("./CurdProService").DBUtils;
+    getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): import("./CrudProQuick").CrudProQuick;
     executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
     executeCrud(reqJson: IRequestModel): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;

package/dist/service/curd/CurdMixService.js

@@ -30,9 +30,9 @@ let CurdMixService = class CurdMixService {
         this.prepare();
         return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
     }
-    getBbUtil(database, sqlDbType) {
+    getBbUtil(sqlDatabase, sqlDbType, sqlTable) {
         this.prepare();
-        return this.curdProService.getBbUtil(database, sqlDbType);
+        return this.curdProService.getBbUtil(sqlDatabase, sqlDbType, sqlTable);
     }
     async executeSQL(sqlCfgModel) {
         this.prepare();

package/dist/service/curd/CurdMixUtils.js

@@ -46,40 +46,47 @@ function copyBySingleSourceValue(row, sourceValue, targetColumns, getValue) {
         }
     }
 }
-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) {

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 sqlDbType;
-    private readonly curdProService;
-    constructor(sqlDatabase: string, sqlDbType: 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;
@@ -33,7 +26,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, sqlDbType: 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;
@@ -69,6 +71,7 @@ class MyContextFunc extends ExecuteContextFunc_1.BaseExecuteContextFunc {
         if (sqlDbType === keys_1.SqlDbType.postgres) {
             const dbConfig = _.get(this.postgres2Config, dataBaseName);
             if (!dbConfig) {
+                console.error('postgres配置中不存在此数据库', JSON.stringify(sqlCfgModel));
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_NOT_FOUND, 'postgres配置中不存在此数据库:' + dataBaseName);
             }
             return (0, PostgresUtils_1.getConnectionPool)(dataBaseName, dbConfig);
@@ -76,12 +79,14 @@ class MyContextFunc extends ExecuteContextFunc_1.BaseExecuteContextFunc {
         if (sqlDbType === keys_1.SqlDbType.sqlserver) {
             const dbConfig = _.get(this.sqlserver2Config, dataBaseName);
             if (!dbConfig) {
+                console.error('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('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, sqlDbType, curdProService) {
-        this.sqlDatabase = sqlDatabase;
-        this.sqlDbType = sqlDbType;
-        this.curdProService = curdProService;
-    }
-    async getOne(reqJson, sqlTable) {
-        const cfgModel = {
-            sqlTable,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: this.sqlDatabase,
-            sqlDbType: this.sqlDbType,
-            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,
-            sqlDbType: this.sqlDbType,
-            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);
@@ -152,7 +133,11 @@ 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,
@@ -181,114 +166,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, sqlDbType) {
-        return new DBUtils(database, sqlDbType, 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 };