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

package/src/service/asyncTask/AsyncTaskService.ts

@@ -0,0 +1,21 @@
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { BaseService } from '@/service/base/BaseService';
+import { runScheduleTaskOnce } from '@/schedule';
+import { INNER_SCHEDULE_NAMES } from '@/schedule/scheduleNames';
+import { RedisKeys } from '@/models/RedisKeys';
+
+@Provide()
+export class AsyncTaskService extends BaseService {
+  @Inject()
+  protected ctx: Context;
+
+  async startTask() {
+    await this.redisService.set(RedisKeys.ASYNC_TASK_UPDATE_TIME, `${Date.now()}`);
+    runScheduleTaskOnce(INNER_SCHEDULE_NAMES.asyncTaskRunnerService).then(schedule => {
+      console.log(schedule);
+    });
+  }
+
+  async cancelTask(id: number) {}
+}

package/src/service/base/BaseService.ts

@@ -3,8 +3,8 @@ import { Context } from '@midwayjs/koa';
 import { RedisService } from '@midwayjs/redis';
 import { OSSService, OSSServiceFactory } from '@midwayjs/oss';
 import * as koa from '@midwayjs/koa';
-import { consoleLogger, ContextLogger, ILoggerContext } from '../../models/contextLogger';
-import { isEnableDebug, isLocalEnv } from '../../libs/utils/fatcms-request';
+import { consoleLogger, ContextLogger, ILoggerContext } from '@/models/contextLogger';
+import { isEnableDebug, isLocalEnv } from '@/libs/utils/fatcms-request';
 
 
 @Provide()

package/src/service/crudstd/CrudStdService.ts

@@ -2,17 +2,19 @@ import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { CurdMixService } from '../curd/CurdMixService';
 import { IRequestCfgModel, IRequestModel } from '../../libs/crud-pro/interfaces';
-import { KeysOfAuthType, KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
+import { KeysOfAuthType, KeysOfSimpleSQL, SqlDbType } from '../../libs/crud-pro/models/keys';
 import { parseJsonObject } from '../../libs/utils/functions';
 import { ICrudStdAppInfo, ICrudStdAppInfoForSettingKey } from '../../models/bizmodels';
 import { BizException } from '../../models/devops';
 import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables } from '../../models/SystemTables';
 import { CrudStdActionService } from './CrudStdActionService';
 import { CrudStdRelationService } from './CrudStdRelationService';
 import * as _ from 'lodash';
 import { ApiBaseService } from '../base/ApiBaseService';
-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 { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
 
 export const SPECIAL_SETTING_KEY = {
   QUERY_LIST: 'QUERY_LIST',
@@ -50,7 +52,7 @@ export class CrudStdService extends ApiBaseService {
 
     const cfgModel: IRequestCfgModel = {
       sqlDatabase: dbName,
-      sqlDdType: dbType,
+      sqlDbType: dbType,
       sqlTable: stdCrudCfgObj.tableBaseInfo.tableName,
       sqlSimpleName,
     };
@@ -67,6 +69,13 @@ export class CrudStdService extends ApiBaseService {
 
     // 根据用户配置，设置关联查询的数据信息。
     await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
+
+    // 根据表结构的数据类型，修正数据类型
+    await this.fixDataFieldTypeBySqlTableField(params, cfgModel, appInfo, { dbType, dbName });
+
+    // 业务系统自定义的修改cfgModel
+    await GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
+
     return await this.curdMixService.executeCrudByCfg(params, cfgModel);
   }
 
@@ -133,13 +142,15 @@ export class CrudStdService extends ApiBaseService {
    * @private
    */
   private async getCrudStdAppInfo(appCode?: string) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     this.logInfo('getCrudStdAppInfo', appCode);
 
     const ss = {
       sqlTable: SystemTables.sys_app,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
     return await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, ss);
   }
@@ -185,4 +196,31 @@ export class CrudStdService extends ApiBaseService {
     }
     return true; // 无需鉴权
   }
+
+  private async fixDataFieldTypeBySqlTableField(params: IRequestModel, cfgModel: IRequestCfgModel, appInfo: ICrudStdAppInfoForSettingKey, arg3: { dbType: SqlDbType; dbName: string }) {
+    const tableFields = _.get(appInfo, 'stdCrudCfgObj.tableFields');
+
+    const tableFieldMap = MixinUtils.toMap(tableFields, (e: any) => {
+      return e.fieldIndex;
+    });
+
+    if (arg3.dbType === SqlDbType.postgres) {
+      if (cfgModel.sqlSimpleName === KeysOfSimpleSQL.SIMPLE_INSERT || cfgModel.sqlSimpleName === 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 = parseJsonObject(dataValue);
+            if (Array.isArray(dataValueArray)) {
+              data[dataKey] = `{${dataValueArray.map(v => `"${v}"`).join(',')}}`;
+            }
+          }
+        }
+      }
+    }
+  }
 }

package/src/service/curd/CrudProQuick.ts

@@ -0,0 +1,137 @@
+import { KeysOfSimpleSQL, SqlDbType } from "@/libs/crud-pro/models/keys";
+import { IRequestCfgModel, IRequestModel, ISqlCfgModel } 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 class CrudProQuick {
+  private readonly curdPro: CrudPro;
+  private readonly sqlDbType: SqlDbType;
+  private readonly sqlDatabase: string;
+  private readonly sqlTable?: string;
+  private baseCfgModel: IRequestCfgModel2 = {};
+
+  constructor(curdPro: CrudPro, sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string) {
+    this.sqlDatabase = sqlDatabase;
+    this.sqlDbType = sqlDbType;
+    this.curdPro = curdPro;
+    this.sqlTable = sqlTable; // 全局sqlTable为空时，单独调用时就必须传sqlTable参数。
+  }
+
+  public setBaseCfgModel(baseCfgModel: IRequestCfgModel2) {
+    Object.assign(this.baseCfgModel, baseCfgModel);
+  }
+
+  private async executeCrudByCfg(reqJson: IRequestModel, cfgModel2: IRequestCfgModel2) {
+
+    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);
+  }
+
+
+  public async getOne(reqJson: IRequestModel, sqlTable?: string): Promise<any> {
+    const cfgModel: IRequestCfgModel = {
+      sqlTable,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+    };
+    const res = await this.executeCrudByCfg(reqJson, cfgModel);
+    return res.getOneObj();
+  }
+
+  public async getList(reqJson: IRequestModel, sqlTable?: string): Promise<any[]> {
+    const cfgModel: IRequestCfgModel = {
+      sqlTable,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+    };
+    const res = await this.executeCrudByCfg(reqJson, cfgModel);
+    return res.getResRows();
+  }
+
+  public async getListPage(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard> {
+    const cfgModel: IRequestCfgModel = {
+      sqlTable,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
+    };
+    const res = await this.executeCrudByCfg(reqJson, cfgModel);
+    return res.getResModel();  // 因为它有2个返回值
+  }
+
+  public async getTotalCount(reqJson: IRequestModel, sqlTable?: string): Promise<number> {
+    const cfgModel: IRequestCfgModel = {
+      sqlTable,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_COUNT,
+    };
+    const res = await this.executeCrudByCfg(reqJson, cfgModel);
+    return res.getResModel().total_count;
+  }
+
+  public async insertObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected> {
+    const cfgModel: IRequestCfgModel = {
+      sqlTable,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
+    };
+    const res = await this.executeCrudByCfg(reqJson, cfgModel);
+    return res.getResModel().affected;
+  }
+
+  public async updateObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected> {
+    const cfgModel: IRequestCfgModel = {
+      sqlTable,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
+    };
+    const res = await this.executeCrudByCfg(reqJson, cfgModel);
+    return res.getResModel().affected;
+  }
+
+  public async insertOrUpdate(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard> {
+    const cfgModel: IRequestCfgModel = {
+      sqlTable,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE,
+    };
+    const res = await this.executeCrudByCfg(reqJson, cfgModel);
+    return res.getResModel(); // 因为它有三个返回值
+  }
+
+  public async deleteObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected> {
+    const cfgModel: IRequestCfgModel = {
+      sqlTable,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_DELETE,
+    };
+    const res = await this.executeCrudByCfg(reqJson, cfgModel);
+    return res.getResModel().affected;
+  }
+
+
+  public async executeSQL(executeSql: string, args?: any[]): Promise<any> {
+    const sqlCfgModel: ISqlCfgModel = {
+      executeSql: executeSql,
+      executeSqlArgs: args,
+      sqlDatabase: this.sqlDatabase,
+      sqlDbType: this.sqlDbType,
+    };
+    return await this.curdPro.executeSQL(sqlCfgModel);
+  }
+
+
+
+
+}
+
+

package/src/service/curd/CurdMixByAccountService.ts

@@ -4,10 +4,11 @@ import * as _ from 'lodash';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+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);
 
@@ -22,6 +23,8 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   async handleExecuteContextPrepare(executeContext: ExecuteContext) {
+    const { SystemDbName, SystemDbType, toFatcmsUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const relations = dictMixUtils.pickColumnRelations(executeContext);
     if (!relations || relations.length === 0) {
       return;
@@ -30,10 +33,15 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
     const accountIds = new Set<string>();
     dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row: any, columnRelation: 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) {
@@ -45,7 +53,7 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
       sqlTable: SystemTables.sys_user_account,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
 
     const reqJson: IRequestModel = {
@@ -77,7 +85,7 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
           { from: 'avatar', to: `${sourceColumn}_user.avatar` },
         ];
       }
-      dictMixUtils.copyColumnRelationToRowNoRelatedCode(row, userInfoMap, columnRelation);
+      dictMixUtils.copyUserInfoToRowNoRelatedCode(row, userInfoMap, columnRelation);
     });
   }
 }

package/src/service/curd/CurdMixByDictService.ts

@@ -3,12 +3,13 @@ import { Context } from '@midwayjs/koa';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+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 { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 
@@ -46,6 +47,11 @@ export class CurdMixByDictService implements IExecuteContextHandler {
   }
 
   private async getDictItemRows(codes: string[]) {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+
+
     const noCacheCodes: string[] = [];
 
     // 从缓存里面取
@@ -72,7 +78,7 @@ export class CurdMixByDictService implements IExecuteContextHandler {
           sqlTable: SystemTables.sys_data_dict_item,
           sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
           sqlDatabase: SystemDbName,
-          sqlDdType: SystemDbType,
+          sqlDbType: SystemDbType,
         }
       );
       selectedRows = res1.getResRows();

package/src/service/curd/CurdMixByLinkToCustomService.ts

@@ -1,19 +1,46 @@
-import {Inject, Provide} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
+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 {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 {RedisCacheService} from "../base/RedisCacheService";
-import {parseDatabaseName} from "../../libs/crud-pro/utils/DatabaseName";
+import { CurdProService } from './CurdProService';
+import { ExecuteContext, 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 { RedisCacheService } from '../base/RedisCacheService';
+import { parseDatabaseName } from '../../libs/crud-pro/utils/DatabaseName';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import { IRequestCfgModel2 } from '@/models/bizmodels';
 
 const linkToCustomMixUtils = new CrudMixUtils(RelatedType.linkToCustom);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByLinkToCustomService');
 
+function toMapObject(rows: any[], fieldsArr: string[]): Map<string, any> {
+  const valueKey = fieldsArr[0];
+  const labelKey = fieldsArr[1];
+
+  const isObjectMode = fieldsArr.length > 2 || labelKey === '*';
+
+  const map = new Map<string, any>();
+  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;
+}
 
 @Provide()
 export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
@@ -26,7 +53,6 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
   @Inject()
   protected redisCacheService: RedisCacheService;
 
-
   async handleExecuteContextPrepare(executeContext: ExecuteContext) {
     const relations = linkToCustomMixUtils.pickColumnRelations(executeContext);
 
@@ -37,7 +63,7 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
   }
 
   async handleExecuteContext(executeContext: ExecuteContext): Promise<void> {
-    const dataInfoMap = executeContext[TMP_CTX_KEY] as Map<string,Map<string,any>>
+    const dataInfoMap = executeContext[TMP_CTX_KEY] as Map<string, Map<string, any>>;
     if (!dataInfoMap || dataInfoMap.size === 0) {
       return;
     }
@@ -45,19 +71,17 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
       const relatedCode = columnRelation.relatedCode;
       const dataMap = dataInfoMap.get(relatedCode);
       if (dataMap) {
-
         const sourceColumn = columnRelation.sourceColumn;
         const targetColumns = columnRelation.targetColumns;
         if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
           columnRelation.targetColumns = [
             {
-              "from": "*",
-              "to": `${sourceColumn}_info[$ARRAY_INDEX]`
+              from: '*',
+              to: `${sourceColumn}_info[$ARRAY_INDEX]`,
             },
           ];
         }
 
-
         // this.ctx.logger.info("CurdMixByLinkToCustomService ==> dataMap", dataMap)
 
         linkToCustomMixUtils.copyColumnRelationToRowNoRelatedCode(row, dataMap, columnRelation);
@@ -65,11 +89,10 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
     });
   }
 
-
-  public async queryInfoByLinkToCustom(code: string): Promise<Map<string,any>> {
-    const cacheKey = "linkToCustom@@"+code;
+  public async queryInfoByLinkToCustom(code: string): Promise<Map<string, any>> {
+    const cacheKey = 'linkToCustom@@' + code;
     let values;
-    const expireSecond = 2 * 60 ; // 2分钟
+    const expireSecond = 2 * 60; // 2分钟
     const enumMap = await this.redisCacheService.getJsonObject(cacheKey);
     if (!enumMap || Object.keys(enumMap).length === 0) {
       values = await this.queryInfoByLinkToCustomImpl(code);
@@ -78,16 +101,21 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
     return values;
   }
 
-
   /**
    * 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 async queryInfoByLinkToCustomImpl(code: string): Promise<Map<string,any>>{
+  private async queryInfoByLinkToCustomImpl(code: string): Promise<Map<string, any>> {
+    if (code.startsWith('GET_BY_CRUD_METHOD')) {
+      return this.queryInfoByLinkToCustomByCrudMethod(code);
+    }
+
     const arr = code
       .split('~~~')
       .map(s => s.trim())
@@ -95,9 +123,10 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
     if (arr.length !== 3) {
       throw new BizException('linkToCustom枚举值查询字符串，必须符合固定格式', Exceptions.CFG_ERROR);
     }
+
     const [sqlDatabase, sqlTable, fields] = arr;
 
-    const {dbType, dbName} = parseDatabaseName(sqlDatabase);
+    const { dbType, dbName } = parseDatabaseName(sqlDatabase);
 
     const fieldsArr = fields
       .split(',')
@@ -108,15 +137,11 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
       throw new BizException('linkToCustom枚举值查询字符串，fields字段必须符合固定格式', 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,
       },
@@ -124,44 +149,70 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
         sqlTable,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: dbName,
-        sqlDdType: dbType,
+        sqlDbType: dbType,
         maxLimit: 4000,
       }
     );
     const rows = res1.getResRows();
-    const map = new Map<string, any>();
-    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
+   */
+  private async queryInfoByLinkToCustomByCrudMethod(code: string): Promise<Map<string, any>> {
+    const arr = code
+      .split('~~~')
+      .map(s => s.trim())
+      .filter(Boolean);
+    if (arr.length !== 3) {
+      throw new BizException('linkToCustom枚举值查询字符串，必须符合固定格式。', Exceptions.CFG_ERROR);
+    }
+    const [prefix, methodCode, fields] = arr;
+
+    const fieldsArr = fields
+      .split(',')
+      .map(s => s.trim())
+      .filter(Boolean);
 
+    if (fieldsArr.length < 2) {
+      throw new BizException(`linkToCustom枚举值查询字符串，fields字段必须符合固定格式。${prefix}`, Exceptions.CFG_ERROR);
+    }
+
+    const methodInfo = (await this.curdProService.getCachedCfgByMethod(methodCode)) as any;
+    if (!methodInfo || methodInfo.status !== 1) {
+      throw new Error('接口不存在或已下线: ' + methodCode);
     }
+
+    const cfgModel = methodInfo as IRequestCfgModel2;
+    const { dbType, dbName } = parseDatabaseName(cfgModel.sqlDatabase);
+    cfgModel.sqlDatabase = dbName;
+    cfgModel.sqlDbType = dbType;
+
+    const reqJson = {};
+
+    await 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;
   }
 
-
-  private async loadInfoByLinkToCustomMap(relations: ColumnRelation[]): Promise<Map<string,Map<string,any>>> {
+  private async loadInfoByLinkToCustomMap(relations: ColumnRelation[]): Promise<Map<string, Map<string, any>>> {
     const bigMap = new Map<string, Map<string, any>>();
     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);
     }
     return bigMap;
   }
-
 }

package/src/service/curd/CurdMixBySysConfigService.ts

@@ -4,11 +4,12 @@ import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
 import * as _ from 'lodash';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+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);
 
@@ -25,6 +26,10 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   async handleExecuteContextPrepare(executeContext: ExecuteContext) {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    
     const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
     if (!codes || codes.length === 0) {
       return;
@@ -38,7 +43,7 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
         sqlTable: SystemTables.sys_configs,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const rows = res1.getResRows();