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

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();

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -5,10 +5,11 @@ import { LRUCache } from 'lru-cache';
 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 } 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>({
   max: 500,
@@ -29,6 +30,9 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   private async loadWorkbenchListMap() {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     let workbenchListMap = lruCache.get('workbenchListMap');
     if (!workbenchListMap) {
       const reqJson = {
@@ -39,7 +43,7 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
         sqlTable: SystemTables.sys_workbench,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       });
       const workbenchList = res.getResRows();
       workbenchListMap = MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);

package/src/service/curd/CurdMixService.ts

@@ -8,7 +8,7 @@ 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 {SqlDbType} from "@/libs/crud-pro/models/keys";
 
 @Provide()
 export class CurdMixService {
@@ -44,9 +44,9 @@ export class CurdMixService {
     return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
   }
 
-  getBbUtil(database: string, sqlDdType: SqlDbType) {
+  getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string) {
     this.prepare();
-    return this.curdProService.getBbUtil(database, sqlDdType);
+    return this.curdProService.getBbUtil(sqlDatabase, sqlDbType, sqlTable);
   }
 
   async executeSQL(sqlCfgModel: ISqlCfgModel) {

package/src/service/curd/CurdMixUtils.ts

@@ -1,12 +1,12 @@
-import {ColumnRelation, CopyAttr} from '../../libs/crud-pro/interfaces';
-import { ExecuteContext } 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';
-import { RequestCfgModel } from '../../libs/crud-pro/models/RequestCfgModel';
+import { ColumnRelation, CopyAttr } from '@/libs/crud-pro/interfaces';
+import { ExecuteContext } 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';
+import { RequestCfgModel } from '@/libs/crud-pro/models/RequestCfgModel';
 import * as _ from 'lodash';
-import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
-import { parseJsonObject } from '../../libs/utils/functions';
+import { MultiKeyMap } from '@/libs/crud-pro/utils/MultiKeyMap';
+import { parseJsonObject } from '@/libs/utils/functions';
 
 enum RelatedType {
   dict = 'dict', // 关联数据字典
@@ -33,7 +33,7 @@ function getColumnsRelationAll(sqlCfg: SqlCfgModel, cfgModel: RequestCfgModel):
 
 
 
-function copyBySingleSourceValue(row: any, sourceValue:any, targetColumns: CopyAttr[], getValue: any ){
+function copyBySingleSourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any) {
   // const codeObject = map.get(sourceValue);
   const codeObject = getValue(sourceValue);
   if (typeof codeObject === 'undefined' || codeObject === null) {
@@ -59,46 +59,54 @@ function copyBySingleSourceValue(row: any, sourceValue:any, targetColumns: CopyA
 
 
 
-function copyByArraySourceValue(row: any, sourceValue:any, targetColumns: CopyAttr[], getValue: any ): boolean {
-  let isSetArray = false;
-  // 支持关联JSON数组
-  if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
-    const codes = parseJsonObject(sourceValue);
-    if (Array.isArray(codes)) {
-      for (let codeIndex = 0; codeIndex < codes.length; codeIndex++) {
-        const code = codes[codeIndex];
-        // const codeObject = map.get(code);
-        const codeObject = getValue(code);
-        if (codeObject) {
-          if (Array.isArray(targetColumns)) {
-            for (let i = 0; i < targetColumns.length; i++) {
-              const targetColumn = targetColumns[i];
 
-              if (targetColumn.from === '*') {
 
-                const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
-                _.set(row, toStr, codeObject);
 
-                isSetArray = true;
 
-              } else {
+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);
+    const codeObject = getValue(code);
+    if (codeObject) {
+      if (Array.isArray(targetColumns)) {
+        for (let i = 0; i < targetColumns.length; i++) {
+          const targetColumn = targetColumns[i];
+
+          if (targetColumn.from === '*') {
 
-                const dictAttrValue = _.get(codeObject, targetColumn.from);
-                if (typeof dictAttrValue !== "undefined" && dictAttrValue !== null) {
-                  const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
-                  _.set(row, toStr, dictAttrValue);
-                  isSetArray = true;
+            const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
+            _.set(row, toStr, codeObject);
 
-                }
-              }
+            resultObj.isSetArray = true;
+          } else {
+            const dictAttrValue = _.get(codeObject, targetColumn.from);
+            if (typeof dictAttrValue !== 'undefined' && dictAttrValue !== null) {
+              const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
+              _.set(row, toStr, dictAttrValue);
+              resultObj.isSetArray = true;
             }
           }
         }
       }
     }
   }
+}
 
-  return isSetArray;
+function copyByArraySourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any): boolean {
+  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)) {
+    // 直接使用JSON或者postgres的数组存储的类型
+    copyByArraySourceValueInner(row, sourceValue, targetColumns, getValue, resultObj);
+  }
+  return resultObj.isSetArray;
 }
 
 
@@ -134,7 +142,7 @@ class CrudMixUtils {
         }
       }
     }
-    return _.uniqBy(relationResult,(obj: ColumnRelation)=> {
+    return _.uniqBy(relationResult, (obj: ColumnRelation) => {
       return `${obj.relatedCode}_${obj.relatedType}_${obj.sourceColumn}_${JSON.stringify(obj.targetColumns)}`;
     });
   }
@@ -191,7 +199,7 @@ class CrudMixUtils {
     }
 
     const sourceValue = _.get(row, sourceColumn);
-    if (typeof sourceValue ==='undefined' || sourceValue ===null) {
+    if (typeof sourceValue === 'undefined' || sourceValue === null) {
       return;
     }
 
@@ -216,7 +224,7 @@ class CrudMixUtils {
    * @param columnRelation
    */
   public copyColumnRelationToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation) {
-    const {sourceColumn, targetColumns} = columnRelation;
+    const { sourceColumn, targetColumns } = columnRelation;
     if (!sourceColumn || !targetColumns) {
       return;
     }
@@ -243,6 +251,41 @@ class CrudMixUtils {
 
   }
 
+
+  /**
+  * 专门COPY用户信息到row上面。无relatedCode模式
+  * @param row
+  * @param map
+  * @param columnRelation
+  */
+  public copyUserInfoToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation) {
+    const { targetColumns } = columnRelation;
+    if (!targetColumns) {
+      return;
+    }
+
+    const tmpSourceColumn = '__fatcmsUserAccountId__';
+
+    const sourceValue = _.get(row, tmpSourceColumn);
+    if (!sourceValue) {
+      return;
+    }
+
+    const getValue = (code: string) => {
+      if (!map) {
+        return null;
+      }
+      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);
+    }
+  }
 }
 
 export { CrudMixUtils, RelatedType, FuncRowColumnRelation };