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

package/dist/service/curd/CurdMixByDictService.js

@@ -18,6 +18,7 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
 const _ = require("lodash");
 const RedisCacheService_1 = require("../base/RedisCacheService");
+const global_config_1 = require("../../libs/global-config/global-config");
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.dict);
 let CurdMixByDictService = class CurdMixByDictService {
@@ -38,6 +39,7 @@ let CurdMixByDictService = class CurdMixByDictService {
         executeContext[TMP_CTX_KEY] = new MultiKeyMap_1.MultiKeyMap(rows, 'dict_code', 'value');
     }
     async getDictItemRows(codes) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const noCacheCodes = [];
         // 从缓存里面取
         let cachedRows = [];
@@ -60,8 +62,8 @@ let CurdMixByDictService = class CurdMixByDictService {
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
             });
             selectedRows = res1.getResRows();
             //放到缓存里

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

@@ -1,7 +1,7 @@
 import { Context } from '@midwayjs/koa';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-import { RedisCacheService } from "../base/RedisCacheService";
+import { RedisCacheService } from '../base/RedisCacheService';
 export declare class CurdMixByLinkToCustomService implements IExecuteContextHandler {
     protected ctx: Context;
     protected curdProService: CurdProService;
@@ -13,10 +13,19 @@ export declare class CurdMixByLinkToCustomService implements IExecuteContextHand
      * 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 queryInfoByLinkToCustomImpl;
+    /**
+     *
+     * @param code
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,name
+     */
+    private queryInfoByLinkToCustomByCrudMethod;
     private loadInfoByLinkToCustomMap;
 }

package/dist/service/curd/CurdMixByLinkToCustomService.js

@@ -19,8 +19,32 @@ const devops_1 = require("../../models/devops");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const RedisCacheService_1 = require("../base/RedisCacheService");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
+const global_config_1 = require("../../libs/global-config/global-config");
 const linkToCustomMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.linkToCustom);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByLinkToCustomService');
+function toMapObject(rows, fieldsArr) {
+    const valueKey = fieldsArr[0];
+    const labelKey = fieldsArr[1];
+    const isObjectMode = fieldsArr.length > 2 || labelKey === '*';
+    const map = new Map();
+    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;
+}
 let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
     async handleExecuteContextPrepare(executeContext) {
         const relations = linkToCustomMixUtils.pickColumnRelations(executeContext);
@@ -43,8 +67,8 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
                 if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
                     columnRelation.targetColumns = [
                         {
-                            "from": "*",
-                            "to": `${sourceColumn}_info[$ARRAY_INDEX]`
+                            from: '*',
+                            to: `${sourceColumn}_info[$ARRAY_INDEX]`,
                         },
                     ];
                 }
@@ -54,7 +78,7 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
         });
     }
     async queryInfoByLinkToCustom(code) {
-        const cacheKey = "linkToCustom@@" + code;
+        const cacheKey = 'linkToCustom@@' + code;
         let values;
         const expireSecond = 2 * 60; // 2分钟
         const enumMap = await this.redisCacheService.getJsonObject(cacheKey);
@@ -68,11 +92,16 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
      * 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
      */
     async queryInfoByLinkToCustomImpl(code) {
+        if (code.startsWith('GET_BY_CRUD_METHOD')) {
+            return this.queryInfoByLinkToCustomByCrudMethod(code);
+        }
         const arr = code
             .split('~~~')
             .map(s => s.trim())
@@ -89,46 +118,65 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
         if (fieldsArr.length < 2) {
             throw new devops_1.BizException('linkToCustom枚举值查询字符串，fields字段必须符合固定格式', exceptions_1.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,
         }, {
             sqlTable,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             maxLimit: 4000,
         });
         const rows = res1.getResRows();
-        const map = new Map();
-        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
+     */
+    async queryInfoByLinkToCustomByCrudMethod(code) {
+        const arr = code
+            .split('~~~')
+            .map(s => s.trim())
+            .filter(Boolean);
+        if (arr.length !== 3) {
+            throw new devops_1.BizException('linkToCustom枚举值查询字符串，必须符合固定格式。', exceptions_1.Exceptions.CFG_ERROR);
+        }
+        const [prefix, methodCode, fields] = arr;
+        const fieldsArr = fields
+            .split(',')
+            .map(s => s.trim())
+            .filter(Boolean);
+        if (fieldsArr.length < 2) {
+            throw new devops_1.BizException(`linkToCustom枚举值查询字符串，fields字段必须符合固定格式。${prefix}`, exceptions_1.Exceptions.CFG_ERROR);
+        }
+        const methodInfo = (await this.curdProService.getCachedCfgByMethod(methodCode));
+        if (!methodInfo || methodInfo.status !== 1) {
+            throw new Error('接口不存在或已下线: ' + methodCode);
         }
+        const cfgModel = methodInfo;
+        const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(cfgModel.sqlDatabase);
+        cfgModel.sqlDatabase = dbName;
+        cfgModel.sqlDbType = dbType;
+        const reqJson = {};
+        await global_config_1.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;
     }
     async loadInfoByLinkToCustomMap(relations) {
         const bigMap = new Map();
         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);

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.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

@@ -10,7 +10,7 @@ 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>;

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

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

@@ -24,5 +24,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

@@ -46,40 +46,47 @@ function copyBySingleSourceValue(row, sourceValue, targetColumns, getValue) {
         }
     }
 }
-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) {
@@ -197,5 +204,35 @@ class CrudMixUtils {
             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

@@ -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;
@@ -33,7 +26,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>;
 }