midway-fatcms 0.0.1-beta.22 → 0.0.1-beta.24

package/src/service/curd/CurdMixByAccountService.ts

@@ -2,12 +2,12 @@ import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
 import { CurdProService } from './CurdProService';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+import { HandleExecuteContextType, IExecuteContextHandler } from '@/libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import { SystemTables } from '../../models/SystemTables';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import { ColumnRelation, IRequestCfgModel, IRequestModel } from '../../libs/crud-pro/interfaces';
-import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
+import { SystemTables } from '@/models/SystemTables';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { ColumnRelation, IRequestCfgModel, IRequestModel } from '@/libs/crud-pro/interfaces';
+import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const dictMixUtils = new CrudMixUtils(RelatedType.accountBasic);
@@ -17,12 +17,12 @@ const TMP_CTX_KEY = _.uniqueId('CurdMixByAccountService');
 @Provide()
 export class CurdMixByAccountService implements IExecuteContextHandler {
   @Inject()
-  ctx: Context;
+  protected ctx: Context;
 
   @Inject()
   protected curdProService: CurdProService;
 
-  async handleExecuteContextPrepare(executeContext: ExecuteContext) {
+  async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {
     const { SystemDbName, SystemDbType, toFatcmsUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
 
     const relations = dictMixUtils.pickColumnRelations(executeContext);
@@ -41,7 +41,6 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
           row['__fatcmsUserAccountId__'] = fatcmsUserAccountId;
         }
       }
-
     });
 
     if (accountIds.size === 0) {
@@ -70,7 +69,7 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
     executeContext[TMP_CTX_KEY] = MixinUtils.toNewMap(userInfos, (obj: any) => obj.account_id);
   }
 
-  async handleExecuteContext(executeContext: ExecuteContext): Promise<void> {
+  async handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void> {
     const userInfoMap = executeContext[TMP_CTX_KEY] as Map<string, any>;
     if (!userInfoMap || userInfoMap.size === 0) {
       return;

package/src/service/curd/CurdMixByDictService.ts

@@ -1,21 +1,21 @@
+import * as _ from 'lodash';
 import { Inject, Provide } from '@midwayjs/core';
 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';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import { SystemTables} from '../../models/SystemTables';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
-import { ColumnRelation } from '../../libs/crud-pro/interfaces';
-import * as _ from 'lodash';
-import {RedisCacheService} from "../base/RedisCacheService";
+import { SystemTables } from '@/models/SystemTables';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { MultiKeyMap } from '@/libs/crud-pro/utils/MultiKeyMap';
+import { ColumnRelation } from '@/libs/crud-pro/interfaces';
+import { RedisCacheService } from '../base/RedisCacheService';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import { RedisKeys } from '@/models/RedisKeys';
 
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 
 const dictMixUtils = new CrudMixUtils(RelatedType.dict);
 
-
 @Provide()
 export class CurdMixByDictService implements IExecuteContextHandler {
   @Inject()
@@ -27,17 +27,16 @@ export class CurdMixByDictService implements IExecuteContextHandler {
   @Inject()
   protected redisCacheService: RedisCacheService;
 
-  private async getFromCache(code:string): Promise<any> {
-    const cacheKey = `CurdMixByDictService@@${code}`
-    return this.redisCacheService.getJsonObject(cacheKey)
+  private async getFromCache(code: string): Promise<any> {
+    const cacheKey = `${RedisKeys.CURD_MIX_BY_DICT_PREFIX}${code}`;
+    return this.redisCacheService.getJsonObject(cacheKey);
   }
-  private async setToCache(code:string, value: any): Promise<any> {
-    const cacheKey = `CurdMixByDictService@@${code}`
-    return this.redisCacheService.setJsonObject(cacheKey, value, 60 * 60 )
+  private async setToCache(code: string, value: any): Promise<any> {
+    const cacheKey = `${RedisKeys.CURD_MIX_BY_DICT_PREFIX}${code}`;
+    return this.redisCacheService.setJsonObject(cacheKey, value, 60 * 60);
   }
 
-
-  async handleExecuteContextPrepare(executeContext: ExecuteContext): Promise<void> {
+  async handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void> {
     const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
     if (!codes || codes.length === 0) {
       return;
@@ -47,18 +46,14 @@ export class CurdMixByDictService implements IExecuteContextHandler {
   }
 
   private async getDictItemRows(codes: string[]) {
-
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-
-
     const noCacheCodes: string[] = [];
 
     // 从缓存里面取
     let cachedRows = [];
     for (let i = 0; i < codes.length; i++) {
       const code = codes[i];
-      const rows1:any[] = await this.getFromCache(code);
+      const rows1: any[] = await this.getFromCache(code);
       // const rows1 = [];
       if (rows1 && rows1.length > 0) {
         cachedRows = cachedRows.concat(rows1);
@@ -94,7 +89,7 @@ export class CurdMixByDictService implements IExecuteContextHandler {
     return cachedRows.concat(selectedRows);
   }
 
-  async handleExecuteContext(executeContext: ExecuteContext): Promise<void> {
+  async handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void> {
     const multiKeyMap = executeContext[TMP_CTX_KEY] as MultiKeyMap;
     if (!multiKeyMap || multiKeyMap.isEmpty()) {
       return;
@@ -107,8 +102,8 @@ export class CurdMixByDictService implements IExecuteContextHandler {
       if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
         columnRelation.targetColumns = [
           {
-            "from": "*",
-            "to": `${sourceColumn}_info[$ARRAY_INDEX]`
+            from: '*',
+            to: `${sourceColumn}_info[$ARRAY_INDEX]`,
           },
         ];
       }

package/src/service/curd/CurdMixByLinkToCustomService.ts

@@ -2,16 +2,17 @@ import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
 import { CurdProService } from './CurdProService';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+import { HandleExecuteContextType, IExecuteContextHandler } from '@/libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import { ColumnRelation } from '../../libs/crud-pro/interfaces';
-import { BizException } from '../../models/devops';
-import { Exceptions } from '../../libs/crud-pro/exceptions';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { ColumnRelation } from '@/libs/crud-pro/interfaces';
+import { BizException } from '@/models/devops';
+import { Exceptions } from '@/libs/crud-pro/exceptions';
 import { RedisCacheService } from '../base/RedisCacheService';
-import { parseDatabaseName } from '../../libs/crud-pro/utils/DatabaseName';
+import { parseDatabaseName } from '@/libs/crud-pro/utils/DatabaseName';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { IRequestCfgModel2 } from '@/models/bizmodels';
+import { RedisKeys } from '@/models/RedisKeys';
 
 const linkToCustomMixUtils = new CrudMixUtils(RelatedType.linkToCustom);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByLinkToCustomService');
@@ -53,7 +54,7 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
   @Inject()
   protected redisCacheService: RedisCacheService;
 
-  async handleExecuteContextPrepare(executeContext: ExecuteContext) {
+  async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {
     const relations = linkToCustomMixUtils.pickColumnRelations(executeContext);
 
     if (!relations || relations.length === 0) {
@@ -62,7 +63,7 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
     executeContext[TMP_CTX_KEY] = await this.loadInfoByLinkToCustomMap(relations);
   }
 
-  async handleExecuteContext(executeContext: ExecuteContext): Promise<void> {
+  async handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void> {
     const dataInfoMap = executeContext[TMP_CTX_KEY] as Map<string, Map<string, any>>;
     if (!dataInfoMap || dataInfoMap.size === 0) {
       return;
@@ -90,7 +91,7 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
   }
 
   public async queryInfoByLinkToCustom(code: string): Promise<Map<string, any>> {
-    const cacheKey = 'linkToCustom@@' + code;
+    const cacheKey = RedisKeys.LINK_TO_CUSTOM_PREFIX + code;
     let values;
     const expireSecond = 2 * 60; // 2分钟
     const enumMap = await this.redisCacheService.getJsonObject(cacheKey);

package/src/service/curd/CurdMixBySysConfigService.ts

@@ -1,22 +1,20 @@
 import { Inject, Provide } from '@midwayjs/core';
 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';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
 import * as _ from 'lodash';
-import { SystemTables} from '../../models/SystemTables';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
-import { ColumnRelation } from '../../libs/crud-pro/interfaces';
-import { parseConfigContentToEnumInfo } from "../../libs/utils/parseConfig";
+import { SystemTables } from '@/models/SystemTables';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { MultiKeyMap } from '@/libs/crud-pro/utils/MultiKeyMap';
+import { ColumnRelation } from '@/libs/crud-pro/interfaces';
+import { parseConfigContentToEnumInfo } from '@/libs/utils/parseConfig';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const dictMixUtils = new CrudMixUtils(RelatedType.sysCfgEnum);
 
 const TMP_CTX_KEY = _.uniqueId('CurdMixBySysConfigService');
 
-
-
 @Provide()
 export class CurdMixBySysConfigService implements IExecuteContextHandler {
   @Inject()
@@ -25,11 +23,9 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
   @Inject()
   protected curdProService: CurdProService;
 
-  async handleExecuteContextPrepare(executeContext: ExecuteContext) {
-    
+  async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
-    
     const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
     if (!codes || codes.length === 0) {
       return;
@@ -61,8 +57,7 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
     executeContext[TMP_CTX_KEY] = multiKeyMap;
   }
 
-
-  async handleExecuteContext(executeContext: ExecuteContext): Promise<void> {
+  async handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void> {
     const multiKeyMap = executeContext[TMP_CTX_KEY] as MultiKeyMap;
     if (!multiKeyMap || multiKeyMap.isEmpty()) {
       return;

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -3,12 +3,12 @@ import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
 import { LRUCache } from 'lru-cache';
 import { CurdProService } from './CurdProService';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+import { HandleExecuteContextType, IExecuteContextHandler } from '@/libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import { SystemTables } from '../../models/SystemTables';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import { ColumnRelation } from '../../libs/crud-pro/interfaces';
-import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
+import { SystemTables } from '@/models/SystemTables';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { ColumnRelation } from '@/libs/crud-pro/interfaces';
+import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const lruCache = new LRUCache<string, any>({
@@ -30,7 +30,6 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   private async loadWorkbenchListMap() {
-    
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     let workbenchListMap = lruCache.get('workbenchListMap');
@@ -52,7 +51,7 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
     return workbenchListMap;
   }
 
-  async handleExecuteContextPrepare(executeContext: ExecuteContext) {
+  async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {
     const relations = workbenchMixUtils.pickColumnRelations(executeContext);
     if (!relations || relations.length === 0) {
       return;
@@ -60,7 +59,7 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
     executeContext[TMP_CTX_KEY] = await this.loadWorkbenchListMap();
   }
 
-  async handleExecuteContext(executeContext: ExecuteContext): Promise<void> {
+  async handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void> {
     const userInfoMap = executeContext[TMP_CTX_KEY] as Map<string, any>;
     if (!userInfoMap || userInfoMap.size === 0) {
       return;

package/src/service/curd/CurdMixService.ts

@@ -1,14 +1,19 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { CurdProService } from './CurdProService';
 import { CurdMixByDictService } from './CurdMixByDictService';
-import { IRequestCfgModel, IRequestModel, ISqlCfgModel } from '../../libs/crud-pro/interfaces';
+import { ColumnRelation, IRequestCfgModel, IRequestModel, ISqlCfgModel } from '@/libs/crud-pro/interfaces';
 import { CurdMixBySysConfigService } from './CurdMixBySysConfigService';
 import { CurdMixByAccountService } from './CurdMixByAccountService';
 import { RelatedType } from './CurdMixUtils';
 import { CurdMixByWorkbenchService } from './CurdMixByWorkbenchService';
-import { IRequestCfgModel2 } from '../../models/bizmodels';
-import {CurdMixByLinkToCustomService} from "./CurdMixByLinkToCustomService";
-import {SqlDbType} from "@/libs/crud-pro/models/keys";
+import { IRequestCfgModel2 } from '@/models/bizmodels';
+import { CurdMixByLinkToCustomService } from './CurdMixByLinkToCustomService';
+import { SqlDbType } from '@/libs/crud-pro/models/keys';
+import { IExecuteContextCustom } from '@/libs/crud-pro/models/ExecuteContext';
+
+export interface ILinkColumnRelationParam {
+  columnsRelations: ColumnRelation[];
+}
 
 @Provide()
 export class CurdMixService {
@@ -30,7 +35,6 @@ export class CurdMixService {
   @Inject()
   private curdMixByLinkToCustomService: CurdMixByLinkToCustomService;
 
-
   private prepare() {
     this.curdProService.setResponseCfgHandlers(RelatedType.dict, this.curdMixByDictService);
     this.curdProService.setResponseCfgHandlers(RelatedType.sysCfgEnum, this.curdMixBySysConfigService);
@@ -62,4 +66,32 @@ export class CurdMixService {
   public async getCachedCfgByMethod(method: string): Promise<IRequestCfgModel> {
     return this.curdProService.getCachedCfgByMethod(method);
   }
+
+  /**
+   * 根据配置的关联关系，直接关联数据
+   * @param rows
+   * @param param
+   * @returns
+   */
+  public async linkColumnRelationDatas(rows: any[], param: ILinkColumnRelationParam) {
+    if (!Array.isArray(rows) || rows.length === 0) {
+      return;
+    }
+
+    this.prepare();
+
+    const exeCtx: IExecuteContextCustom = {
+      rows,
+      columnsRelation: param.columnsRelations,
+      isCustomContext: true,
+    };
+
+    const responseCfgHandlers = this.curdProService.getResponseCfgHandlers();
+    const handlers = Object.values(responseCfgHandlers);
+    for (let i = 0; i < handlers.length; i++) {
+      const handler = handlers[i];
+      await handler.handleExecuteContextPrepare(exeCtx);
+      await handler.handleExecuteContext(exeCtx);
+    }
+  }
 }

package/src/service/curd/CurdMixUtils.ts

@@ -1,5 +1,5 @@
 import { ColumnRelation, CopyAttr } from '@/libs/crud-pro/interfaces';
-import { ExecuteContext } from '@/libs/crud-pro/models/ExecuteContext';
+import { ExecuteContext, HandleExecuteContextType, IExecuteContextCustom } from '@/libs/crud-pro/models/ExecuteContext';
 import { KeyOfCrudTypes } from '@/libs/crud-pro/models/keys';
 import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
 import { SqlCfgModel } from '@/libs/crud-pro/models/SqlCfgModel';
@@ -30,8 +30,11 @@ function getColumnsRelationAll(sqlCfg: SqlCfgModel, cfgModel: RequestCfgModel):
   return [];
 }
 
-
-
+const forEachColumnsRelation = (row: any, columnsRelation: ColumnRelation[], func: FuncRowColumnRelation) => {
+  for (let i = 0; i < columnsRelation.length; i++) {
+    func(row, columnsRelation[i]);
+  }
+};
 
 function copyBySingleSourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any) {
   // const codeObject = map.get(sourceValue);
@@ -43,28 +46,20 @@ function copyBySingleSourceValue(row: any, sourceValue: any, targetColumns: Copy
   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 copyByArraySourceValueInner(row: any, codes: any[], targetColumns: CopyAttr[], getValue: any, resultObj: any) {
-
   for (let codeIndex = 0; codeIndex < codes.length; codeIndex++) {
     const code = codes[codeIndex];
     // const codeObject = map.get(code);
@@ -75,7 +70,6 @@ function copyByArraySourceValueInner(row: any, codes: any[], targetColumns: Copy
           const targetColumn = targetColumns[i];
 
           if (targetColumn.from === '*') {
-
             const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
             _.set(row, toStr, codeObject);
 
@@ -95,22 +89,20 @@ function copyByArraySourceValueInner(row: any, codes: any[], targetColumns: Copy
 }
 
 function copyByArraySourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any): boolean {
-  const resultObj = {isSetArray: false }
+  const resultObj = { isSetArray: false };
   // 支持关联JSON数组。使用 字符串存储的类型
   if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
     const codes = parseJsonObject(sourceValue);
     if (Array.isArray(codes)) {
       copyByArraySourceValueInner(row, codes, targetColumns, getValue, resultObj);
     }
-  } else if(Array.isArray(sourceValue)) {
+  } else if (Array.isArray(sourceValue)) {
     // 直接使用JSON或者postgres的数组存储的类型
     copyByArraySourceValueInner(row, sourceValue, targetColumns, getValue, resultObj);
   }
   return resultObj.isSetArray;
 }
 
-
-
 class CrudMixUtils {
   private readonly relatedType: RelatedType;
   constructor(relatedType: RelatedType) {
@@ -123,8 +115,22 @@ class CrudMixUtils {
     return ss.filter(s => s.relatedType === relatedType);
   }
 
-  public pickColumnRelations(exeCtx: ExecuteContext): ColumnRelation[] {
+  /**
+   * 从执行上下文，获取所有的关联关系
+   * @param exeCtxType
+   * @returns
+   */
+  public pickColumnRelations(exeCtxType: HandleExecuteContextType): ColumnRelation[] {
+    // 自定义的关联关系
+    const customExeCtx = exeCtxType as IExecuteContextCustom;
+    if (customExeCtx.isCustomContext) {
+      const customExeCtx = exeCtxType as IExecuteContextCustom;
+      return customExeCtx.columnsRelation;
+    }
+
+    // 默认的执行上下文
     const relationResult: ColumnRelation[] = [];
+    const exeCtx: ExecuteContext = exeCtxType as ExecuteContext;
     const cfgModel = exeCtx.getCfgModel();
     const sqlModels = exeCtx.getSqlCfgModels();
     if (Array.isArray(sqlModels) && sqlModels.length > 0) {
@@ -142,12 +148,18 @@ class CrudMixUtils {
         }
       }
     }
+
     return _.uniqBy(relationResult, (obj: ColumnRelation) => {
       return `${obj.relatedCode}_${obj.relatedType}_${obj.sourceColumn}_${JSON.stringify(obj.targetColumns)}`;
     });
   }
 
-  public pickColumnRelationCodes(exeCtx: ExecuteContext): string[] {
+  /**
+   * 从执行上下文，获取所有的关联关系的代码
+   * @param exeCtx
+   * @returns
+   */
+  public pickColumnRelationCodes(exeCtx: HandleExecuteContextType): string[] {
     const relationResult: ColumnRelation[] = this.pickColumnRelations(exeCtx);
     const codes = relationResult.map(e => e.relatedCode);
     if (!codes || codes.length === 0) {
@@ -156,17 +168,32 @@ class CrudMixUtils {
     return [...new Set(codes)]; // 去重
   }
 
-  public forEachRowAndColumnsRelation(exeCtx: ExecuteContext, func: FuncRowColumnRelation) {
+  /**
+   * 遍历每一行，每一个关联列
+   * @param exeCtxType
+   * @param func
+   * @returns
+   */
+  public forEachRowAndColumnsRelation(exeCtxType: HandleExecuteContextType, func: FuncRowColumnRelation) {
+    // 自定义的关联关系
+    const customExeCtx = exeCtxType as IExecuteContextCustom;
+    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: ExecuteContext = exeCtxType as ExecuteContext;
     const sqlCfgList = exeCtx.getSqlCfgModels();
     const resModel = exeCtx.getResModel();
     const cfgModel = exeCtx.getCfgModel();
 
-    const forEachColumnsRelation = (row: any, columnsRelation: ColumnRelation[]) => {
-      for (let i = 0; i < columnsRelation.length; i++) {
-        func(row, columnsRelation[i]);
-      }
-    };
-
     for (let i = 0; i < sqlCfgList.length; i++) {
       const sqlCfg = sqlCfgList[i];
 
@@ -179,18 +206,17 @@ 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);
           }
         }
       }
     }
   }
 
-
   public copyColumnRelationToRow(row: any, multiKeyMap: MultiKeyMap, columnRelation: ColumnRelation) {
     const { relatedCode, sourceColumn, targetColumns } = columnRelation;
 
@@ -205,18 +231,14 @@ class CrudMixUtils {
 
     const getValue = (code: string) => {
       return multiKeyMap.getValue(relatedCode, code);
-    }
+    };
 
     const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
     if (!isSetArray) {
       copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
     }
-
   }
 
-
-
-
   /**
    * 无relatedCode模式
    * @param row
@@ -238,26 +260,24 @@ 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
-  */
+   * 专门COPY用户信息到row上面。无relatedCode模式
+   * @param row
+   * @param map
+   * @param columnRelation
+   */
   public copyUserInfoToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation) {
     const { targetColumns } = columnRelation;
     if (!targetColumns) {