midway-fatcms 0.0.1-beta.2 → 0.0.1-beta.20

package/dist/service/crudstd/CrudStdService.js

@@ -21,6 +21,8 @@ const CrudStdRelationService_1 = require("./CrudStdRelationService");
 const _ = require("lodash");
 const ApiBaseService_1 = require("../base/ApiBaseService");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
+const global_config_1 = require("../../libs/global-config/global-config");
+const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 exports.SPECIAL_SETTING_KEY = {
     QUERY_LIST: 'QUERY_LIST',
     QUERY_ONE: 'QUERY_ONE',
@@ -39,7 +41,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
         const cfgModel = {
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             sqlTable: stdCrudCfgObj.tableBaseInfo.tableName,
             sqlSimpleName,
         };
@@ -53,6 +55,10 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         // 根据用户配置，设置关联查询的数据信息。
         await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
+        // 根据表结构的数据类型，修正数据类型
+        await this.fixDataFieldTypeBySqlTableField(params, cfgModel, appInfo, { dbType, dbName });
+        // 业务系统自定义的修改cfgModel
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
         return await this.curdMixService.executeCrudByCfg(params, cfgModel);
     }
     /**
@@ -112,12 +118,13 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
      * @private
      */
     async getCrudStdAppInfo(appCode) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         this.logInfo('getCrudStdAppInfo', appCode);
         const ss = {
             sqlTable: SystemTables_1.SystemTables.sys_app,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         };
         return await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, ss);
     }
@@ -159,6 +166,30 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         return true; // 无需鉴权
     }
+    async fixDataFieldTypeBySqlTableField(params, cfgModel, appInfo, arg3) {
+        const tableFields = _.get(appInfo, 'stdCrudCfgObj.tableFields');
+        const tableFieldMap = MixinUtils_1.MixinUtils.toMap(tableFields, (e) => {
+            return e.fieldIndex;
+        });
+        if (arg3.dbType === keys_1.SqlDbType.postgres) {
+            if (cfgModel.sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT || cfgModel.sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE) {
+                const data = params.data || {};
+                const dataKeys = Object.keys(data);
+                for (let index = 0; index < dataKeys.length; index++) {
+                    const dataKey = dataKeys[index];
+                    const dataValue = data[dataKey];
+                    const fieldInfo = tableFieldMap[dataKey];
+                    const fieldType = ('' + _.get(fieldInfo, 'type')).toUpperCase();
+                    if (fieldType === 'ARRAY') {
+                        const dataValueArray = (0, functions_1.parseJsonObject)(dataValue);
+                        if (Array.isArray(dataValueArray)) {
+                            data[dataKey] = `{${dataValueArray.map(v => `"${v}"`).join(',')}}`;
+                        }
+                    }
+                }
+            }
+        }
+    }
 };
 __decorate([
     (0, core_1.Inject)(),

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

@@ -0,0 +1,24 @@
+import { SqlDbType } from "../../libs/crud-pro/models/keys";
+import { IRequestModel } from "../../libs/crud-pro/interfaces";
+import { IRequestCfgModel2 } from "../../models/bizmodels";
+import { CrudPro } from "../../libs/crud-pro/CrudPro";
+import { ResModelAffected, ResModelStandard } from "../../libs/crud-pro/models/ResModel";
+export declare class CrudProQuick {
+    private readonly curdPro;
+    private readonly sqlDbType;
+    private readonly sqlDatabase;
+    private readonly sqlTable?;
+    private baseCfgModel;
+    constructor(curdPro: CrudPro, sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string);
+    setBaseCfgModel(baseCfgModel: IRequestCfgModel2): void;
+    private executeCrudByCfg;
+    getOne(reqJson: IRequestModel, sqlTable?: string): Promise<any>;
+    getList(reqJson: IRequestModel, sqlTable?: string): Promise<any[]>;
+    getListPage(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard>;
+    getTotalCount(reqJson: IRequestModel, sqlTable?: string): Promise<number>;
+    insertObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected>;
+    updateObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected>;
+    insertOrUpdate(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard>;
+    deleteObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected>;
+    executeSQL(executeSql: string, args?: any[]): Promise<any>;
+}

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/CurdMixByAccountService.js

@@ -17,10 +17,12 @@ const CurdMixUtils_1 = require("./CurdMixUtils");
 const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
+const global_config_1 = require("../../libs/global-config/global-config");
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.accountBasic);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByAccountService');
 let CurdMixByAccountService = class CurdMixByAccountService {
     async handleExecuteContextPrepare(executeContext) {
+        const { SystemDbName, SystemDbType, toFatcmsUserAccountId } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const relations = dictMixUtils.pickColumnRelations(executeContext);
         if (!relations || relations.length === 0) {
             return;
@@ -28,9 +30,13 @@ let CurdMixByAccountService = class CurdMixByAccountService {
         const accountIds = new Set();
         dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
             const { sourceColumn } = columnRelation;
-            const accountId = _.get(row, sourceColumn);
-            if (accountId) {
-                accountIds.add(accountId);
+            if (sourceColumn) {
+                const accountId = _.get(row, sourceColumn);
+                if (accountId) {
+                    const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
+                    accountIds.add(fatcmsUserAccountId);
+                    row['__fatcmsUserAccountId__'] = fatcmsUserAccountId;
+                }
             }
         });
         if (accountIds.size === 0) {
@@ -40,8 +46,8 @@ let CurdMixByAccountService = class CurdMixByAccountService {
             method: 'UserAccountService.queryAccountBasicInfoByIds',
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         };
         const reqJson = {
             columns: ['nick_name', 'avatar', 'account_id'],
@@ -69,7 +75,7 @@ let CurdMixByAccountService = class CurdMixByAccountService {
                     { from: 'avatar', to: `${sourceColumn}_user.avatar` },
                 ];
             }
-            dictMixUtils.copyColumnRelationToRowNoRelatedCode(row, userInfoMap, columnRelation);
+            dictMixUtils.copyUserInfoToRowNoRelatedCode(row, userInfoMap, columnRelation);
         });
     }
 };

package/dist/service/curd/CurdMixByDictService.js

@@ -18,6 +18,7 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
 const _ = require("lodash");
 const RedisCacheService_1 = require("../base/RedisCacheService");
+const global_config_1 = require("../../libs/global-config/global-config");
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.dict);
 let CurdMixByDictService = class CurdMixByDictService {
@@ -38,6 +39,7 @@ let CurdMixByDictService = class CurdMixByDictService {
         executeContext[TMP_CTX_KEY] = new MultiKeyMap_1.MultiKeyMap(rows, 'dict_code', 'value');
     }
     async getDictItemRows(codes) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const noCacheCodes = [];
         // 从缓存里面取
         let cachedRows = [];
@@ -60,8 +62,8 @@ let CurdMixByDictService = class CurdMixByDictService {
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
             });
             selectedRows = res1.getResRows();
             //放到缓存里

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,46 +118,65 @@ 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,
         }, {
             sqlTable,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             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/CurdMixBySysConfigService.js

@@ -18,10 +18,12 @@ const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
 const parseConfig_1 = require("../../libs/utils/parseConfig");
+const global_config_1 = require("../../libs/global-config/global-config");
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.sysCfgEnum);
 const TMP_CTX_KEY = _.uniqueId('CurdMixBySysConfigService');
 let CurdMixBySysConfigService = class CurdMixBySysConfigService {
     async handleExecuteContextPrepare(executeContext) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
         if (!codes || codes.length === 0) {
             return;
@@ -31,8 +33,8 @@ let CurdMixBySysConfigService = class CurdMixBySysConfigService {
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         const rows = res1.getResRows();
         const multiKeyMap = new MultiKeyMap_1.MultiKeyMap();

package/dist/service/curd/CurdMixByWorkbenchService.js

@@ -18,6 +18,7 @@ const CurdMixUtils_1 = require("./CurdMixUtils");
 const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
+const global_config_1 = require("../../libs/global-config/global-config");
 const lruCache = new lru_cache_1.LRUCache({
     max: 500,
     ttl: 1000 * 60 * 5,
@@ -27,6 +28,7 @@ const workbenchMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.Related
 const TMP_CTX_KEY = _.uniqueId('CurdMixByWorkbenchService');
 let CurdMixByWorkbenchService = class CurdMixByWorkbenchService {
     async loadWorkbenchListMap() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         let workbenchListMap = lruCache.get('workbenchListMap');
         if (!workbenchListMap) {
             const reqJson = {
@@ -36,8 +38,8 @@ let CurdMixByWorkbenchService = class CurdMixByWorkbenchService {
             const res = await this.curdProService.executeCrudByCfg(reqJson, {
                 sqlTable: SystemTables_1.SystemTables.sys_workbench,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
             });
             const workbenchList = res.getResRows();
             workbenchListMap = MixinUtils_1.MixinUtils.toNewMap(workbenchList, (obj) => obj.workbench_code);

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, sqlDdType: 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, sqlDdType) {
+    getBbUtil(sqlDatabase, sqlDbType, sqlTable) {
         this.prepare();
-        return this.curdProService.getBbUtil(database, sqlDdType);
+        return this.curdProService.getBbUtil(sqlDatabase, sqlDbType, sqlTable);
     }
     async executeSQL(sqlCfgModel) {
         this.prepare();

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

@@ -24,5 +24,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 };