midway-fatcms 0.0.1-beta.5 → 0.0.1-beta.51

package/dist/service/crudstd/CrudStdService.js

@@ -10,6 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudStdService = exports.SPECIAL_SETTING_KEY = void 0;
+/* eslint-disable prettier/prettier */
+const _ = require("lodash");
 const core_1 = require("@midwayjs/core");
 const CurdMixService_1 = require("../curd/CurdMixService");
 const keys_1 = require("../../libs/crud-pro/models/keys");
@@ -18,19 +20,34 @@ const devops_1 = require("../../models/devops");
 const SystemTables_1 = require("../../models/SystemTables");
 const CrudStdActionService_1 = require("./CrudStdActionService");
 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',
 };
+function getExecuteTableNameBySettingKey(appInfo, stdAction) {
+    const { settingKey } = stdAction || {};
+    const stdCrudCfgObj = appInfo.stdCrudCfgObj;
+    const actionsMap = appInfo.actionsMap || {};
+    const actionCfg = actionsMap[settingKey];
+    if (actionCfg) {
+        const mainTableName = _.get(actionCfg, 'component.props.mainTableName');
+        if (typeof mainTableName === 'string' && mainTableName.trim().length > 0) {
+            return mainTableName.trim();
+        }
+    }
+    return stdCrudCfgObj.tableBaseInfo.tableName;
+}
 let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseService {
     /**
      * 执行普通CRUD
      */
-    async executeStdQuery(appCode, settingKey, params, sqlSimpleName) {
-        const appInfo = await this.getParsedCrudStdAppForSettingKey(appCode, settingKey);
+    async executeStdQuery(stdAction, params, sqlSimpleName) {
+        const appCode = stdAction.appCode;
+        const appInfo = await this.getParsedCrudStdAppForSettingKey(stdAction);
         const stdCrudCfgObj = appInfo.stdCrudCfgObj;
         if (!appInfo || appInfo.status !== 1) {
             throw new devops_1.BizException('应用不存在或已下线：' + appCode);
@@ -39,9 +56,10 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
         const cfgModel = {
             sqlDatabase: dbName,
-            sqlDdType: dbType,
-            sqlTable: stdCrudCfgObj.tableBaseInfo.tableName,
+            sqlDbType: dbType,
+            sqlTable: getExecuteTableNameBySettingKey(appInfo, stdAction),
             sqlSimpleName,
+            updateCfg: {}
         };
         // 接口返回最大值
         const maxLimit = _.get(stdCrudCfgObj, 'othersSetting.values.maxLimit');
@@ -53,7 +71,18 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         // 根据用户配置，设置关联查询的数据信息。
         await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
-        return await this.curdMixService.executeCrudByCfg(params, cfgModel);
+        // 根据FilterValue参数，设置updateCfg
+        await this.fixCfgModelByFilterValue(params, cfgModel, appInfo, { dbType, dbName });
+        // 根据用户配置的keepSubmitData字段修改提交的数据
+        await this.fixSubmitDataByKeepSubmitData(params, cfgModel, appInfo, { dbType, dbName });
+        // 根据表结构的数据类型，修正数据类型
+        await this.fixDataFieldTypeBySqlTableField(params, cfgModel, appInfo, { dbType, dbName });
+        // 业务系统自定义的修改：查询前的查询条件：cfgModel
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
+        const crudExeCtx = await this.curdMixService.executeCrudByCfg(params, cfgModel);
+        // 业务系统自定义的修改：查询后的返回值。
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateExecuteContextForCrudStd(params, cfgModel, appInfo, this.ctx, crudExeCtx);
+        return crudExeCtx;
     }
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
@@ -61,7 +90,8 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
      * @param settingKey
      * @private
      */
-    async getParsedCrudStdAppForSettingKey(appCode, settingKey) {
+    async getParsedCrudStdAppForSettingKey(stdAction) {
+        const { appCode, settingKey, buttonSettingKey } = stdAction || {};
         if (!appCode) {
             throw new devops_1.BizException('缺少参数:curdStdAppCode');
         }
@@ -89,18 +119,20 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
             }
             appInfo.settingKeyActionCfg = actionCfg;
         }
+        if (buttonSettingKey) {
+            appInfo.buttonSettingKeyActionCfg = actionsMap[buttonSettingKey];
+        }
         return appInfo;
     }
     /**
      * 执行动作
-     * @param appCode
-     * @param settingKey
+     * @param stdAction
      * @param params
      */
-    async executeStdActionByReq(appCode, settingKey, params) {
-        const appInfo = await this.getParsedCrudStdAppForSettingKey(appCode, settingKey);
+    async executeStdActionByReq(stdAction, params) {
+        const appInfo = await this.getParsedCrudStdAppForSettingKey(stdAction);
         if (!appInfo || appInfo.status !== 1) {
-            throw new devops_1.BizException('应用不存在或已下线：' + appCode);
+            throw new devops_1.BizException('应用不存在或已下线：' + stdAction.appCode);
         }
         const actionsMap = appInfo.actionsMap;
         const actionCfg = appInfo.settingKeyActionCfg;
@@ -112,21 +144,36 @@ 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);
     }
+    /**
+   * 查询APP信息
+   * @param appCode
+   * @private
+   */
+    async getParsedCrudStdAppInfo(appCode) {
+        const cacheKey = "getParsedCrudStdAppInfo:" + appCode;
+        let appInfo = this.getFromCtxCache(cacheKey);
+        if (!appInfo) {
+            appInfo = await this.getParsedCrudStdAppInfoPrivate(appCode);
+            this.setToCtxCache(cacheKey, appInfo);
+        }
+        return appInfo;
+    }
     /**
      * 查询APP信息
      * @param appCode
      * @private
      */
-    async getParsedCrudStdAppInfo(appCode) {
+    async getParsedCrudStdAppInfoPrivate(appCode) {
         const a = await this.getCrudStdAppInfo(appCode);
         const { row } = a.getResModel();
         if (!row) {
@@ -134,12 +181,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         const { app_schema, ...others } = row;
         const stdCrudCfgObj = (0, functions_1.parseJsonObject)(app_schema);
-        // 为了方便查找到action对象
-        const actionsMap = {};
-        const keys = Object.keys(stdCrudCfgObj);
-        for (let i = 0; i < keys.length; i++) {
-            const key = keys[i];
-            const arrayCfg = stdCrudCfgObj[key];
+        const handleArrayCfg = (arrayCfg) => {
             if (Array.isArray(arrayCfg)) {
                 for (let j = 0; j < arrayCfg.length; j++) {
                     const actionCfg = arrayCfg[j];
@@ -147,8 +189,18 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
                     if (actionCfg.settingKey) {
                         actionsMap[actionCfg.settingKey] = actionCfg;
                     }
+                    const submitButtonCfg = _.get(actionCfg, 'component.props.submitButtonCfg');
+                    handleArrayCfg(submitButtonCfg);
                 }
             }
+        };
+        // 为了方便查找到action对象
+        const actionsMap = {};
+        const keys = Object.keys(stdCrudCfgObj);
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i];
+            const arrayCfg = stdCrudCfgObj[key];
+            handleArrayCfg(arrayCfg);
         }
         return { ...others, stdCrudCfgObj, actionsMap };
     }
@@ -159,6 +211,70 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         return true; // 无需鉴权
     }
+    async fixCfgModelByFilterValue(params, cfgModel, appInfo, arg3) {
+        const { filterValue } = params || {};
+        if (!filterValue && filterValue !== 0) {
+            return;
+        }
+        const filterList = _.get(appInfo, 'stdCrudCfgObj.filterList');
+        if (!Array.isArray(filterList) || filterList.length === 0) {
+            this.logWarn('filterValue存在，但是filterList没有设置');
+            return;
+        }
+        const filterItem = filterList.find(item => item.value === filterValue);
+        if (!filterItem) {
+            this.logWarn('filterValue存在，但是filterList中没有找到此配置项');
+            return;
+        }
+        const partialCondition = _.get(filterItem, 'partialCondition');
+        if (!partialCondition) {
+            this.logWarn('filterValue存在，但是filterList中的配置项没有设置partialCondition');
+            return;
+        }
+        const partialConditionObj = (0, functions_1.parseJsonObject)(partialCondition);
+        if (Object.keys(partialConditionObj).length > 0) {
+            _.merge(cfgModel.updateCfg, { condition: partialConditionObj });
+        }
+    }
+    async fixSubmitDataByKeepSubmitData(params, cfgModel, appInfo, arg3) {
+        if (cfgModel.sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT || cfgModel.sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE) {
+            const submitData = params.data || {};
+            //1. 按钮中配置的keepSubmitData
+            const buttonActionCfg = appInfo.buttonSettingKeyActionCfg || {};
+            const keepSubmitDataByButtonStr = _.get(buttonActionCfg, 'keepSubmitData');
+            const keepSubmitDataByButton = (0, functions_1.parseJsonObject)(keepSubmitDataByButtonStr);
+            //2. 全局配置的keepSubmitData
+            const keepSubmitDataByGlobalStr = _.get(appInfo, 'stdCrudCfgObj.othersSetting.values.keepSubmitData');
+            const keepSubmitDataByGlobal = (0, functions_1.parseJsonObject)(keepSubmitDataByGlobalStr);
+            //3. 合并
+            _.merge(submitData, keepSubmitDataByButton);
+            _.merge(submitData, keepSubmitDataByGlobal);
+        }
+    }
+    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,44 @@
+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;
+    /**
+     * 随便获取一个。不推荐使用。建议使用getUniqueOne。
+     * @deprecated
+     * @param reqJson
+     * @param sqlTable
+     * @returns
+     */
+    getOne(reqJson: IRequestModel, sqlTable?: string): Promise<any>;
+    /**
+     * 期望获取唯一的一个对象，如果数据库中的数量不唯一，则报错。
+     * @param reqJson
+     * @param sqlTable
+     * @returns
+     */
+    getUniqueOne(reqJson: IRequestModel, sqlTable?: string): Promise<any>;
+    /**
+     * 获取数据列表
+     * @param reqJson
+     * @param sqlTable 数据库表名称
+     * @returns
+     */
+    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,147 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrudProQuick = void 0;
+const keys_1 = require("../../libs/crud-pro/models/keys");
+const DEFAULT_MAX_LIMIT = 10 * 10000;
+class CrudProQuick {
+    constructor(curdPro, sqlDatabase, sqlDbType, sqlTable) {
+        this.baseCfgModel = {
+            maxLimit: DEFAULT_MAX_LIMIT,
+        };
+        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);
+    }
+    /**
+     * 随便获取一个。不推荐使用。建议使用getUniqueOne。
+     * @deprecated
+     * @param reqJson
+     * @param sqlTable
+     * @returns
+     */
+    async getOne(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getOneObj();
+    }
+    /**
+     * 期望获取唯一的一个对象，如果数据库中的数量不唯一，则报错。
+     * @param reqJson
+     * @param sqlTable
+     * @returns
+     */
+    async getUniqueOne(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
+        };
+        reqJson.pageNo = 1;
+        reqJson.pageSize = 1;
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        const resModel = res.getResModel();
+        const total_count = resModel.total_count;
+        const rows = resModel.rows;
+        if (total_count === 0) {
+            return null;
+        }
+        if (total_count > 1) {
+            throw new Error(`[CrudProQuick][getUniqueOne] only one object is required, but got ${total_count}`);
+        }
+        return rows[0];
+    }
+    /**
+     * 获取数据列表
+     * @param reqJson
+     * @param sqlTable 数据库表名称
+     * @returns
+     */
+    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,
+            maxLimit: this.baseCfgModel.maxLimit || DEFAULT_MAX_LIMIT,
+        };
+        return await this.curdPro.executeSQL(sqlCfgModel);
+    }
+}
+exports.CrudProQuick = CrudProQuick;

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

@@ -1,9 +1,9 @@
 import { Context } from '@midwayjs/koa';
 import { CurdProService } from './CurdProService';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 export declare class CurdMixByAccountService implements IExecuteContextHandler {
-    ctx: Context;
+    protected ctx: Context;
     protected curdProService: CurdProService;
-    handleExecuteContextPrepare(executeContext: ExecuteContext): Promise<void>;
-    handleExecuteContext(executeContext: ExecuteContext): Promise<void>;
+    handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
+    handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
 }

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,12 @@ 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);
+                }
             }
         });
         if (accountIds.size === 0) {
@@ -40,8 +45,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 +74,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.d.ts

@@ -1,13 +1,13 @@
 import { Context } from '@midwayjs/koa';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-import { RedisCacheService } from "../base/RedisCacheService";
+import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+import { RedisCacheService } from '../base/RedisCacheService';
 export declare class CurdMixByDictService implements IExecuteContextHandler {
     ctx: Context;
     private curdProService;
     protected redisCacheService: RedisCacheService;
     private getFromCache;
     private setToCache;
-    handleExecuteContextPrepare(executeContext: ExecuteContext): Promise<void>;
+    handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
     private getDictItemRows;
-    handleExecuteContext(executeContext: ExecuteContext): Promise<void>;
+    handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
 }

package/dist/service/curd/CurdMixByDictService.js

@@ -10,23 +10,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurdMixByDictService = void 0;
+const _ = require("lodash");
 const core_1 = require("@midwayjs/core");
 const CurdProService_1 = require("./CurdProService");
 const CurdMixUtils_1 = require("./CurdMixUtils");
 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 _ = require("lodash");
 const RedisCacheService_1 = require("../base/RedisCacheService");
+const global_config_1 = require("../../libs/global-config/global-config");
+const RedisKeys_1 = require("../../models/RedisKeys");
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.dict);
 let CurdMixByDictService = class CurdMixByDictService {
     async getFromCache(code) {
-        const cacheKey = `CurdMixByDictService@@${code}`;
+        const cacheKey = `${RedisKeys_1.RedisKeys.CURD_MIX_BY_DICT_PREFIX}${code}`;
         return this.redisCacheService.getJsonObject(cacheKey);
     }
     async setToCache(code, value) {
-        const cacheKey = `CurdMixByDictService@@${code}`;
+        const cacheKey = `${RedisKeys_1.RedisKeys.CURD_MIX_BY_DICT_PREFIX}${code}`;
         return this.redisCacheService.setJsonObject(cacheKey, value, 60 * 60);
     }
     async handleExecuteContextPrepare(executeContext) {
@@ -38,6 +40,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 +63,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();
             //放到缓存里
@@ -84,8 +87,8 @@ let CurdMixByDictService = class CurdMixByDictService {
             if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
                 columnRelation.targetColumns = [
                     {
-                        "from": "*",
-                        "to": `${sourceColumn}_info[$ARRAY_INDEX]`
+                        from: '*',
+                        to: `${sourceColumn}_info[$ARRAY_INDEX]`,
                     },
                 ];
             }

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

@@ -1,22 +1,31 @@
 import { Context } from '@midwayjs/koa';
 import { CurdProService } from './CurdProService';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-import { RedisCacheService } from "../base/RedisCacheService";
+import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+import { RedisCacheService } from '../base/RedisCacheService';
 export declare class CurdMixByLinkToCustomService implements IExecuteContextHandler {
     protected ctx: Context;
     protected curdProService: CurdProService;
     protected redisCacheService: RedisCacheService;
-    handleExecuteContextPrepare(executeContext: ExecuteContext): Promise<void>;
-    handleExecuteContext(executeContext: ExecuteContext): Promise<void>;
+    handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
+    handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
     queryInfoByLinkToCustom(code: string): Promise<Map<string, any>>;
     /**
      * 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;
 }