midway-fatcms 0.0.1-beta.4 → 0.0.1-beta.41

package/dist/service/curd/CurdMixBySysConfigService.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 CurdMixBySysConfigService implements IExecuteContextHandler {
     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/CurdMixBySysConfigService.js

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

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

@@ -1,10 +1,10 @@
 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 CurdMixByWorkbenchService implements IExecuteContextHandler {
     ctx: Context;
     protected curdProService: CurdProService;
     private loadWorkbenchListMap;
-    handleExecuteContextPrepare(executeContext: ExecuteContext): Promise<void>;
-    handleExecuteContext(executeContext: ExecuteContext): Promise<void>;
+    handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
+    handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
 }

package/dist/service/curd/CurdMixByWorkbenchService.js

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

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

@@ -1,6 +1,9 @@
-import { IRequestCfgModel, IRequestModel, ISqlCfgModel } from '../../libs/crud-pro/interfaces';
+import { ColumnRelation, IRequestCfgModel, IRequestModel, ISqlCfgModel } from '../../libs/crud-pro/interfaces';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
-import { SqlDbType } from "../../libs/crud-pro/models/keys";
+import { SqlDbType } from '../../libs/crud-pro/models/keys';
+export interface ILinkColumnRelationParam {
+    columnsRelations: ColumnRelation[];
+}
 export declare class CurdMixService {
     private curdProService;
     private curdMixByDictService;
@@ -10,8 +13,15 @@ export declare class CurdMixService {
     private curdMixByLinkToCustomService;
     private prepare;
     executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
-    getBbUtil(database: string, sqlDdType: SqlDbType): import("./CurdProService").DBUtils;
+    getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): import("./CrudProQuick").CrudProQuick;
     executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
     executeCrud(reqJson: IRequestModel): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;
+    /**
+     * 根据配置的关联关系，直接关联数据
+     * @param rows
+     * @param param
+     * @returns
+     */
+    linkColumnRelationDatas(rows: any[], param: ILinkColumnRelationParam): Promise<void>;
 }

package/dist/service/curd/CurdMixService.js

@@ -30,9 +30,9 @@ let CurdMixService = class CurdMixService {
         this.prepare();
         return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
     }
-    getBbUtil(database, sqlDdType) {
+    getBbUtil(sqlDatabase, sqlDbType, sqlTable) {
         this.prepare();
-        return this.curdProService.getBbUtil(database, sqlDdType);
+        return this.curdProService.getBbUtil(sqlDatabase, sqlDbType, sqlTable);
     }
     async executeSQL(sqlCfgModel) {
         this.prepare();
@@ -45,6 +45,30 @@ let CurdMixService = class CurdMixService {
     async getCachedCfgByMethod(method) {
         return this.curdProService.getCachedCfgByMethod(method);
     }
+    /**
+     * 根据配置的关联关系，直接关联数据
+     * @param rows
+     * @param param
+     * @returns
+     */
+    async linkColumnRelationDatas(rows, param) {
+        if (!Array.isArray(rows) || rows.length === 0) {
+            return;
+        }
+        this.prepare();
+        const exeCtx = {
+            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);
+        }
+    }
 };
 __decorate([
     (0, core_1.Inject)(),

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

@@ -1,5 +1,5 @@
 import { ColumnRelation } from '../../libs/crud-pro/interfaces';
-import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
+import { HandleExecuteContextType } from '../../libs/crud-pro/models/ExecuteContext';
 import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
 declare enum RelatedType {
     dict = "dict",
@@ -13,9 +13,25 @@ declare class CrudMixUtils {
     private readonly relatedType;
     constructor(relatedType: RelatedType);
     private getColumnsRelation;
-    pickColumnRelations(exeCtx: ExecuteContext): ColumnRelation[];
-    pickColumnRelationCodes(exeCtx: ExecuteContext): string[];
-    forEachRowAndColumnsRelation(exeCtx: ExecuteContext, func: FuncRowColumnRelation): void;
+    /**
+     * 从执行上下文，获取所有的关联关系
+     * @param exeCtxType
+     * @returns
+     */
+    pickColumnRelations(exeCtxType: HandleExecuteContextType): ColumnRelation[];
+    /**
+     * 从执行上下文，获取所有的关联关系的代码
+     * @param exeCtx
+     * @returns
+     */
+    pickColumnRelationCodes(exeCtx: HandleExecuteContextType): string[];
+    /**
+     * 遍历每一行，每一个关联列
+     * @param exeCtxType
+     * @param func
+     * @returns
+     */
+    forEachRowAndColumnsRelation(exeCtxType: HandleExecuteContextType, func: FuncRowColumnRelation): void;
     copyColumnRelationToRow(row: any, multiKeyMap: MultiKeyMap, columnRelation: ColumnRelation): void;
     /**
      * 无relatedCode模式
@@ -24,5 +40,12 @@ declare class CrudMixUtils {
      * @param columnRelation
      */
     copyColumnRelationToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation): void;
+    /**
+     * 专门COPY用户信息到row上面。无relatedCode模式
+     * @param row
+     * @param map
+     * @param columnRelation
+     */
+    copyUserInfoToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation): void;
 }
 export { CrudMixUtils, RelatedType, FuncRowColumnRelation };

package/dist/service/curd/CurdMixUtils.js

@@ -24,6 +24,11 @@ function getColumnsRelationAll(sqlCfg, cfgModel) {
     }
     return [];
 }
+const forEachColumnsRelation = (row, columnsRelation, func) => {
+    for (let i = 0; i < columnsRelation.length; i++) {
+        func(row, columnsRelation[i]);
+    }
+};
 function copyBySingleSourceValue(row, sourceValue, targetColumns, getValue) {
     // const codeObject = map.get(sourceValue);
     const codeObject = getValue(sourceValue);
@@ -33,53 +38,60 @@ function copyBySingleSourceValue(row, sourceValue, targetColumns, getValue) {
     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 copyByArraySourceValue(row, sourceValue, targetColumns, getValue) {
-    let isSetArray = false;
-    // 支持关联JSON数组
-    if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
-        const codes = (0, functions_1.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 {
-                                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;
-                                }
-                            }
+function copyByArraySourceValueInner(row, codes, targetColumns, getValue, resultObj) {
+    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);
+                        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, sourceValue, targetColumns, getValue) {
+    const resultObj = { isSetArray: false };
+    // 支持关联JSON数组。使用 字符串存储的类型
+    if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
+        const codes = (0, functions_1.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;
 }
 class CrudMixUtils {
     constructor(relatedType) {
@@ -90,8 +102,21 @@ class CrudMixUtils {
         const relatedType = this.relatedType;
         return ss.filter(s => s.relatedType === relatedType);
     }
-    pickColumnRelations(exeCtx) {
+    /**
+     * 从执行上下文，获取所有的关联关系
+     * @param exeCtxType
+     * @returns
+     */
+    pickColumnRelations(exeCtxType) {
+        // 自定义的关联关系
+        const customExeCtx = exeCtxType;
+        if (customExeCtx.isCustomContext) {
+            const customExeCtx = exeCtxType;
+            return customExeCtx.columnsRelation;
+        }
+        // 默认的执行上下文
         const relationResult = [];
+        const exeCtx = exeCtxType;
         const cfgModel = exeCtx.getCfgModel();
         const sqlModels = exeCtx.getSqlCfgModels();
         if (Array.isArray(sqlModels) && sqlModels.length > 0) {
@@ -113,6 +138,11 @@ class CrudMixUtils {
             return `${obj.relatedCode}_${obj.relatedType}_${obj.sourceColumn}_${JSON.stringify(obj.targetColumns)}`;
         });
     }
+    /**
+     * 从执行上下文，获取所有的关联关系的代码
+     * @param exeCtx
+     * @returns
+     */
     pickColumnRelationCodes(exeCtx) {
         const relationResult = this.pickColumnRelations(exeCtx);
         const codes = relationResult.map(e => e.relatedCode);
@@ -121,15 +151,29 @@ class CrudMixUtils {
         }
         return [...new Set(codes)]; // 去重
     }
-    forEachRowAndColumnsRelation(exeCtx, func) {
+    /**
+     * 遍历每一行，每一个关联列
+     * @param exeCtxType
+     * @param func
+     * @returns
+     */
+    forEachRowAndColumnsRelation(exeCtxType, func) {
+        // 自定义的关联关系
+        const customExeCtx = exeCtxType;
+        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 = exeCtxType;
         const sqlCfgList = exeCtx.getSqlCfgModels();
         const resModel = exeCtx.getResModel();
         const cfgModel = exeCtx.getCfgModel();
-        const forEachColumnsRelation = (row, columnsRelation) => {
-            for (let i = 0; i < columnsRelation.length; i++) {
-                func(row, columnsRelation[i]);
-            }
-        };
         for (let i = 0; i < sqlCfgList.length; i++) {
             const sqlCfg = sqlCfgList[i];
             // 只有Select语句需要
@@ -140,12 +184,12 @@ 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);
                     }
                 }
             }
@@ -187,7 +231,37 @@ 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
+     */
+    copyUserInfoToRowNoRelatedCode(row, map, columnRelation) {
+        const { targetColumns } = columnRelation;
+        if (!targetColumns) {
+            return;
+        }
+        const tmpSourceColumn = '__fatcmsUserAccountId__';
+        const sourceValue = _.get(row, tmpSourceColumn);
+        if (!sourceValue) {
+            return;
+        }
+        const getValue = (code) => {
+            if (!map) {
+                return null;
+            }
+            if (typeof map.get === 'function') {
                 return map.get(`${code}`);
             }
             return map[code];

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

@@ -5,14 +5,7 @@ import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/mode
 import { RelatedType } from './CurdMixUtils';
 import { BaseService } from '../base/BaseService';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
-export declare class DBUtils {
-    private readonly sqlDatabase;
-    private readonly sqlDdType;
-    private readonly curdProService;
-    constructor(sqlDatabase: string, sqlDdType: SqlDbType, curdProService: CurdProService);
-    getOne(reqJson: IRequestModel, sqlTable: string): Promise<any>;
-    getList(reqJson: IRequestModel, sqlTable: string): Promise<any[]>;
-}
+import { CrudProQuick } from '../../service/curd/CrudProQuick';
 export declare class CurdProService extends BaseService {
     protected ctx: Context;
     private mysql2Config;
@@ -21,6 +14,7 @@ export declare class CurdProService extends BaseService {
     private crudProCfg;
     private responseCfgHandlers;
     setResponseCfgHandlers(key: RelatedType, handler: IExecuteContextHandler): void;
+    getResponseCfgHandlers(): Record<RelatedType, IExecuteContextHandler>;
     /**
      * Execute级别：每次调用都会产生新的
      * @private
@@ -33,7 +27,6 @@ export declare class CurdProService extends BaseService {
     executeCrud(reqJson: IRequestModel): Promise<ExecuteContext>;
     executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
     executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext>;
-    private applyStandardUpdateCfg;
-    getBbUtil(database: string, sqlDdType: SqlDbType): DBUtils;
+    getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick;
     getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;
 }