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

package/dist/service/curd/CurdMixUtils.js

@@ -1,238 +1,275 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RelatedType = exports.CrudMixUtils = void 0;
-const keys_1 = require("../../libs/crud-pro/models/keys");
-const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
-const _ = require("lodash");
-const functions_1 = require("../../libs/utils/functions");
-var RelatedType;
-(function (RelatedType) {
-    RelatedType["dict"] = "dict";
-    RelatedType["sysCfgEnum"] = "sysCfgEnum";
-    RelatedType["linkToCustom"] = "linkToCustom";
-    RelatedType["accountBasic"] = "accountBasic";
-    RelatedType["workbenchBasic"] = "workbenchBasic";
-})(RelatedType || (RelatedType = {}));
-exports.RelatedType = RelatedType;
-const { isNotEmpty } = MixinUtils_1.MixinUtils;
-function getColumnsRelationAll(sqlCfg, cfgModel) {
-    if (sqlCfg && Array.isArray(sqlCfg.columnsRelation) && sqlCfg.columnsRelation.length > 0) {
-        return sqlCfg.columnsRelation;
-    }
-    if (cfgModel && Array.isArray(cfgModel.columnsRelation) && cfgModel.columnsRelation.length > 0) {
-        return cfgModel.columnsRelation;
-    }
-    return [];
-}
-function copyBySingleSourceValue(row, sourceValue, targetColumns, getValue) {
-    // const codeObject = map.get(sourceValue);
-    const codeObject = getValue(sourceValue);
-    if (typeof codeObject === 'undefined' || codeObject === null) {
-        return;
-    }
-    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 === "*") {
-                _.set(row, toStr, codeObject);
-            }
-            else {
-                const dictAttrValue = _.get(codeObject, targetColumn.from);
-                if (typeof dictAttrValue !== "undefined" && dictAttrValue !== null) {
-                    _.set(row, toStr, dictAttrValue);
-                }
-            }
-        }
-    }
-}
-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;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-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) {
-        this.relatedType = relatedType;
-    }
-    getColumnsRelation(sqlCfg, cfgModel) {
-        const ss = getColumnsRelationAll(sqlCfg, cfgModel);
-        const relatedType = this.relatedType;
-        return ss.filter(s => s.relatedType === relatedType);
-    }
-    pickColumnRelations(exeCtx) {
-        const relationResult = [];
-        const cfgModel = exeCtx.getCfgModel();
-        const sqlModels = exeCtx.getSqlCfgModels();
-        if (Array.isArray(sqlModels) && sqlModels.length > 0) {
-            for (let i = 0; i < sqlModels.length; i++) {
-                const sqlModel = sqlModels[i];
-                // 只有Select语句需要
-                if (sqlModel && sqlModel.getCrudType() === keys_1.KeyOfCrudTypes.SELECT) {
-                    const columnsRelation = this.getColumnsRelation(sqlModel, cfgModel);
-                    for (let j = 0; j < columnsRelation.length; j++) {
-                        const relation = columnsRelation[j];
-                        if (relation.relatedType === this.relatedType) {
-                            relationResult.push(relation);
-                        }
-                    }
-                }
-            }
-        }
-        return _.uniqBy(relationResult, (obj) => {
-            return `${obj.relatedCode}_${obj.relatedType}_${obj.sourceColumn}_${JSON.stringify(obj.targetColumns)}`;
-        });
-    }
-    pickColumnRelationCodes(exeCtx) {
-        const relationResult = this.pickColumnRelations(exeCtx);
-        const codes = relationResult.map(e => e.relatedCode);
-        if (!codes || codes.length === 0) {
-            return [];
-        }
-        return [...new Set(codes)]; // 去重
-    }
-    forEachRowAndColumnsRelation(exeCtx, func) {
-        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语句需要
-            if (sqlCfg && sqlCfg.getCrudType() === keys_1.KeyOfCrudTypes.SELECT) {
-                const columnsRelation = this.getColumnsRelation(sqlCfg, cfgModel);
-                if (isNotEmpty(columnsRelation)) {
-                    const resValue = resModel[sqlCfg.resName];
-                    if (Array.isArray(resValue) && isNotEmpty(resValue)) {
-                        // 多行查询时
-                        for (const row of resValue) {
-                            forEachColumnsRelation(row, columnsRelation);
-                        }
-                    }
-                    else if (typeof resValue === 'object' && isNotEmpty(resValue)) {
-                        // 单行查询时
-                        forEachColumnsRelation(resValue, columnsRelation);
-                    }
-                }
-            }
-        }
-    }
-    copyColumnRelationToRow(row, multiKeyMap, columnRelation) {
-        const { relatedCode, sourceColumn, targetColumns } = columnRelation;
-        if (!sourceColumn || !targetColumns) {
-            return;
-        }
-        const sourceValue = _.get(row, sourceColumn);
-        if (typeof sourceValue === 'undefined' || sourceValue === null) {
-            return;
-        }
-        const getValue = (code) => {
-            return multiKeyMap.getValue(relatedCode, code);
-        };
-        const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
-        if (!isSetArray) {
-            copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
-        }
-    }
-    /**
-     * 无relatedCode模式
-     * @param row
-     * @param map
-     * @param columnRelation
-     */
-    copyColumnRelationToRowNoRelatedCode(row, map, columnRelation) {
-        const { sourceColumn, targetColumns } = columnRelation;
-        if (!sourceColumn || !targetColumns) {
-            return;
-        }
-        const sourceValue = _.get(row, sourceColumn);
-        if (!sourceValue) {
-            return;
-        }
-        const getValue = (code) => {
-            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);
-        }
-    }
-    /**
-    * 专门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];
-        };
-        const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
-        if (!isSetArray) {
-            copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
-        }
-    }
-}
-exports.CrudMixUtils = CrudMixUtils;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RelatedType = exports.CrudMixUtils = void 0;
+const keys_1 = require("../../libs/crud-pro/models/keys");
+const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
+const _ = require("lodash");
+const functions_1 = require("../../libs/utils/functions");
+var RelatedType;
+(function (RelatedType) {
+    RelatedType["dict"] = "dict";
+    RelatedType["sysCfgEnum"] = "sysCfgEnum";
+    RelatedType["linkToCustom"] = "linkToCustom";
+    RelatedType["accountBasic"] = "accountBasic";
+    RelatedType["workbenchBasic"] = "workbenchBasic";
+})(RelatedType || (RelatedType = {}));
+exports.RelatedType = RelatedType;
+const { isNotEmpty } = MixinUtils_1.MixinUtils;
+function getColumnsRelationAll(sqlCfg, cfgModel) {
+    if (sqlCfg && Array.isArray(sqlCfg.columnsRelation) && sqlCfg.columnsRelation.length > 0) {
+        return sqlCfg.columnsRelation;
+    }
+    if (cfgModel && Array.isArray(cfgModel.columnsRelation) && cfgModel.columnsRelation.length > 0) {
+        return cfgModel.columnsRelation;
+    }
+    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);
+    if (typeof codeObject === 'undefined' || codeObject === null) {
+        return;
+    }
+    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 === '*') {
+                _.set(row, toStr, codeObject);
+            }
+            else {
+                const dictAttrValue = _.get(codeObject, targetColumn.from);
+                if (typeof dictAttrValue !== 'undefined' && dictAttrValue !== null) {
+                    _.set(row, toStr, dictAttrValue);
+                }
+            }
+        }
+    }
+}
+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;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+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) {
+        this.relatedType = relatedType;
+    }
+    getColumnsRelation(sqlCfg, cfgModel) {
+        const ss = getColumnsRelationAll(sqlCfg, cfgModel);
+        const relatedType = this.relatedType;
+        return ss.filter(s => s.relatedType === relatedType);
+    }
+    /**
+     * 从执行上下文，获取所有的关联关系
+     * @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) {
+            for (let i = 0; i < sqlModels.length; i++) {
+                const sqlModel = sqlModels[i];
+                // 只有Select语句需要
+                if (sqlModel && sqlModel.getCrudType() === keys_1.KeyOfCrudTypes.SELECT) {
+                    const columnsRelation = this.getColumnsRelation(sqlModel, cfgModel);
+                    for (let j = 0; j < columnsRelation.length; j++) {
+                        const relation = columnsRelation[j];
+                        if (relation.relatedType === this.relatedType) {
+                            relationResult.push(relation);
+                        }
+                    }
+                }
+            }
+        }
+        return _.uniqBy(relationResult, (obj) => {
+            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);
+        if (!codes || codes.length === 0) {
+            return [];
+        }
+        return [...new Set(codes)]; // 去重
+    }
+    /**
+     * 遍历每一行，每一个关联列
+     * @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();
+        for (let i = 0; i < sqlCfgList.length; i++) {
+            const sqlCfg = sqlCfgList[i];
+            // 只有Select语句需要
+            if (sqlCfg && sqlCfg.getCrudType() === keys_1.KeyOfCrudTypes.SELECT) {
+                const columnsRelation = this.getColumnsRelation(sqlCfg, cfgModel);
+                if (isNotEmpty(columnsRelation)) {
+                    const resValue = resModel[sqlCfg.resName];
+                    if (Array.isArray(resValue) && isNotEmpty(resValue)) {
+                        // 多行查询时
+                        for (const row of resValue) {
+                            forEachColumnsRelation(row, columnsRelation, func);
+                        }
+                    }
+                    else if (typeof resValue === 'object' && isNotEmpty(resValue)) {
+                        // 单行查询时
+                        forEachColumnsRelation(resValue, columnsRelation, func);
+                    }
+                }
+            }
+        }
+    }
+    copyColumnRelationToRow(row, multiKeyMap, columnRelation) {
+        const { relatedCode, sourceColumn, targetColumns } = columnRelation;
+        if (!sourceColumn || !targetColumns) {
+            return;
+        }
+        const sourceValue = _.get(row, sourceColumn);
+        if (typeof sourceValue === 'undefined' || sourceValue === null) {
+            return;
+        }
+        const getValue = (code) => {
+            return multiKeyMap.getValue(relatedCode, code);
+        };
+        const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
+        if (!isSetArray) {
+            copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
+        }
+    }
+    /**
+     * 无relatedCode模式
+     * @param row
+     * @param map
+     * @param columnRelation
+     */
+    copyColumnRelationToRowNoRelatedCode(row, map, columnRelation) {
+        const { sourceColumn, targetColumns } = columnRelation;
+        if (!sourceColumn || !targetColumns) {
+            return;
+        }
+        const sourceValue = _.get(row, sourceColumn);
+        if (!sourceValue) {
+            return;
+        }
+        const getValue = (code) => {
+            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);
+        }
+    }
+    /**
+     * 专门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];
+        };
+        const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
+        if (!isSetArray) {
+            copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
+        }
+    }
+}
+exports.CrudMixUtils = CrudMixUtils;

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

@@ -1,31 +1,32 @@
-import { Context } from '@midwayjs/koa';
-import { IRequestCfgModel, IRequestModel, ISqlCfgModel } from '../../libs/crud-pro/interfaces';
-import { SqlDbType } from '../../libs/crud-pro/models/keys';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-import { RelatedType } from './CurdMixUtils';
-import { BaseService } from '../base/BaseService';
-import { IRequestCfgModel2 } from '../../models/bizmodels';
-import { CrudProQuick } from "../../service/curd/CrudProQuick";
-export declare class CurdProService extends BaseService {
-    protected ctx: Context;
-    private mysql2Config;
-    private postgres2Config;
-    private sqlserver2Config;
-    private crudProCfg;
-    private responseCfgHandlers;
-    setResponseCfgHandlers(key: RelatedType, handler: IExecuteContextHandler): void;
-    /**
-     * Execute级别：每次调用都会产生新的
-     * @private
-     */
-    private getCrudPro;
-    /**
-     * 依赖缓存中与加载的配置
-     * @param reqJson
-     */
-    executeCrud(reqJson: IRequestModel): Promise<ExecuteContext>;
-    executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
-    executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext>;
-    getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick;
-    getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;
-}
+import { Context } from '@midwayjs/koa';
+import { IRequestCfgModel, IRequestModel, ISqlCfgModel } from '../../libs/crud-pro/interfaces';
+import { SqlDbType } from '../../libs/crud-pro/models/keys';
+import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+import { RelatedType } from './CurdMixUtils';
+import { BaseService } from '../base/BaseService';
+import { IRequestCfgModel2 } from '../../models/bizmodels';
+import { CrudProQuick } from '../../service/curd/CrudProQuick';
+export declare class CurdProService extends BaseService {
+    protected ctx: Context;
+    private mysql2Config;
+    private postgres2Config;
+    private sqlserver2Config;
+    private crudProCfg;
+    private responseCfgHandlers;
+    setResponseCfgHandlers(key: RelatedType, handler: IExecuteContextHandler): void;
+    getResponseCfgHandlers(): Record<RelatedType, IExecuteContextHandler>;
+    /**
+     * Execute级别：每次调用都会产生新的
+     * @private
+     */
+    private getCrudPro;
+    /**
+     * 依赖缓存中与加载的配置
+     * @param reqJson
+     */
+    executeCrud(reqJson: IRequestModel): Promise<ExecuteContext>;
+    executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
+    executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext>;
+    getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick;
+    getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;
+}