midway-fatcms 0.0.1-beta.63 → 0.0.1-beta.65

package/dist/libs/crud-pro/models/keys.js

@@ -1,154 +1,154 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeysOfConditions = exports.KeysOfCustomSQL = exports.KeysOfSqlResPicker = exports.KeysOfSimpleSQL = exports.KeyOfCrudTypes = exports.KeysOfValidators = exports.KeysOfAuthType = exports.KeysOfFunCtx = exports.SqlDbType = void 0;
-var SqlDbType;
-(function (SqlDbType) {
-    SqlDbType["mysql"] = "mysql";
-    SqlDbType["postgres"] = "postgres";
-    SqlDbType["sqlserver"] = "sqlserver";
-})(SqlDbType = exports.SqlDbType || (exports.SqlDbType = {}));
-var KeysOfFunCtx;
-(function (KeysOfFunCtx) {
-    KeysOfFunCtx["FUNC_CTX"] = "$";
-    KeysOfFunCtx["CURRENT_VALUE"] = "$current";
-    KeysOfFunCtx["VISITOR"] = "visitor";
-    KeysOfFunCtx["VISITOR_ATTR"] = "visitor.";
-    KeysOfFunCtx["REQUEST"] = "req.";
-    KeysOfFunCtx["RESULT"] = "res.";
-})(KeysOfFunCtx = exports.KeysOfFunCtx || (exports.KeysOfFunCtx = {}));
-//鉴权类型；free无需鉴权，login仅登录即可，byRoleCode校验角色，byFuncCode校验功能点
-var KeysOfAuthType;
-(function (KeysOfAuthType) {
-    KeysOfAuthType["free"] = "free";
-    KeysOfAuthType["login"] = "login";
-    KeysOfAuthType["byRoleCode"] = "byRoleCode";
-    KeysOfAuthType["byFuncCode"] = "byFuncCode";
-})(KeysOfAuthType = exports.KeysOfAuthType || (exports.KeysOfAuthType = {}));
-var KeysOfValidators;
-(function (KeysOfValidators) {
-    KeysOfValidators["REQUIRED"] = "required";
-    KeysOfValidators["BOOLEAN"] = "boolean";
-    KeysOfValidators["OBJECT"] = "object";
-    KeysOfValidators["ARRAY"] = "array";
-    KeysOfValidators["ARRAY_STRING"] = "array:string";
-    KeysOfValidators["ARRAY_NUMBER"] = "array:number";
-    KeysOfValidators["STRING"] = "string";
-    KeysOfValidators["EMAIL"] = "email";
-    KeysOfValidators["NAME"] = "name";
-    KeysOfValidators["PHONE_CN"] = "phone:cn";
-    KeysOfValidators["INTEGER"] = "integer";
-    KeysOfValidators["NUMBER"] = "number";
-    KeysOfValidators["NUMERIC"] = "numeric";
-    KeysOfValidators["MOMENT"] = "moment:";
-    KeysOfValidators["SCALE"] = "scale:";
-    KeysOfValidators["LENGTH"] = "length:";
-    KeysOfValidators["REG_EXP"] = "regexp:";
-    KeysOfValidators["ENUM"] = "enum:";
-})(KeysOfValidators = exports.KeysOfValidators || (exports.KeysOfValidators = {}));
-var KeyOfCrudTypes;
-(function (KeyOfCrudTypes) {
-    KeyOfCrudTypes["SELECT"] = "SELECT";
-    KeyOfCrudTypes["UPDATE"] = "UPDATE";
-    KeyOfCrudTypes["INSERT"] = "INSERT";
-    KeyOfCrudTypes["DELETE"] = "DELETE";
-    KeyOfCrudTypes["NOT_CRUD"] = "NOT_CRUD";
-    KeyOfCrudTypes["EMPTY_SQL"] = "EMPTY_SQL";
-    KeyOfCrudTypes["SYS_QUERY"] = "SYS_QUERY";
-})(KeyOfCrudTypes = exports.KeyOfCrudTypes || (exports.KeyOfCrudTypes = {}));
-var KeysOfSimpleSQL;
-(function (KeysOfSimpleSQL) {
-    KeysOfSimpleSQL["SIMPLE_QUERY"] = "SIMPLE_QUERY";
-    KeysOfSimpleSQL["SIMPLE_QUERY_ONE"] = "SIMPLE_QUERY_ONE";
-    KeysOfSimpleSQL["SIMPLE_QUERY_PAGE"] = "SIMPLE_QUERY_PAGE";
-    KeysOfSimpleSQL["SIMPLE_QUERY_COUNT"] = "SIMPLE_QUERY_COUNT";
-    KeysOfSimpleSQL["SIMPLE_UPDATE"] = "SIMPLE_UPDATE";
-    KeysOfSimpleSQL["SIMPLE_INSERT"] = "SIMPLE_INSERT";
-    KeysOfSimpleSQL["SIMPLE_DELETE"] = "SIMPLE_DELETE";
-    KeysOfSimpleSQL["SIMPLE_INSERT_ON_DUPLICATE_UPDATE"] = "SIMPLE_INSERT_ON_DUPLICATE_UPDATE";
-    KeysOfSimpleSQL["SIMPLE_INSERT_OR_UPDATE"] = "SIMPLE_INSERT_OR_UPDATE";
-    KeysOfSimpleSQL["CUSTOM"] = "CUSTOM";
-})(KeysOfSimpleSQL = exports.KeysOfSimpleSQL || (exports.KeysOfSimpleSQL = {}));
-var KeysOfSqlResPicker;
-(function (KeysOfSqlResPicker) {
-    KeysOfSqlResPicker["UPDATE_RESULT"] = "UPDATE_RESULT";
-    KeysOfSqlResPicker["RESULT_FIRST_ROW"] = "RESULT_FIRST_ROW";
-    KeysOfSqlResPicker["RESULT_TOTAL_COUNT"] = "RESULT_TOTAL_COUNT";
-    KeysOfSqlResPicker["RESULT_ONE_VALUE"] = "RESULT_ONE_VALUE";
-})(KeysOfSqlResPicker = exports.KeysOfSqlResPicker || (exports.KeysOfSqlResPicker = {}));
-exports.KeysOfCustomSQL = {
-    SQL_COLUMNS: '@@columns',
-    SQL_TABLE: '@@table',
-    SQL_OFFSET_LIMIT: '@@offsetLimit',
-    SQL_ORDER_BYS: '@@orderBys',
-    SQL_AS_WHERE: '@@asWhere:',
-    SQL_AS_UPDATE: '@@asUpdate:',
-    SQL_AS_INSERT_KEYS: '@@asInsertKeys:',
-    SQL_AS_INSERT_VALUES: '@@asInsertValues:',
-    // 从Req中取值：单独取Data中的某个字段：获取单个值。
-    SQL_GET_DATA_ATTR_START: '@@data',
-    SQL_GET_CONDITION_ATTR_START: '@@condition',
-    // 从Res中取值
-    SQL_PICK_RES_AS_NUMBER: '@@pickResAsNumber:',
-    SQL_PICK_RES_AS_STRING: '@@pickResAsString:',
-    // 使用java函数：获取单个值
-    SQL_FUNCTION: '@@function:', // @@function:aaa
-};
-/**
- * 查询条件中允许出现的关键词
- * 与MongoDB的语法完全一致
- */
-exports.KeysOfConditions = {
-    $OR: '$or',
-    $NE: '$ne',
-    $LT: '$lt',
-    $LTE: '$lte',
-    $GT: '$gt',
-    $GTE: '$gte',
-    $IN: '$in',
-    $NIN: '$nin',
-    $NOT_NULL: '$notNull',
-    $NULL: '$null',
-    $RANGE: '$range',
-    $LIKE: '$like',
-    $NOT_LIKE: '$notLike',
-    $LIKE_INCLUDE: '$likeInclude',
-    $NOT_LIKE_INCLUDE: '$notLikeInclude',
-    $MATCH: '$match',
-    $MATCH_BOOL: '$matchBool',
-    /**
-     * SELECT * FROM tms_biz.表 WHERE JSON_CONTAINS(`related_user1`, JSON_ARRAY('2512274'), '$');
-     */
-    $JSON_ARRAY_CONTAINS: '$jsonArrayContains',
-    COMPARE_KEYS: new Set([]),
-    ALL_KEYS: new Set([]),
-};
-function initKeysOfConditions() {
-    const addIgnoreCase = (keys, key) => {
-        keys.add(key);
-        keys.add(key.toUpperCase());
-        keys.add(key.toLowerCase());
-    };
-    // 比较操作符, 支持忽略大小写
-    exports.KeysOfConditions.COMPARE_KEYS = new Set([]);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NE);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$LT);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$LTE);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$GT);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$GTE);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$IN);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NIN);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$LIKE);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$LIKE_INCLUDE);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NOT_LIKE);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NOT_LIKE_INCLUDE);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$JSON_ARRAY_CONTAINS);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$MATCH);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$MATCH_BOOL);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$RANGE);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NULL);
-    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NOT_NULL);
-    // 所有操作符
-    exports.KeysOfConditions.ALL_KEYS = new Set([...exports.KeysOfConditions.COMPARE_KEYS]);
-    addIgnoreCase(exports.KeysOfConditions.ALL_KEYS, exports.KeysOfConditions.$OR);
-}
-initKeysOfConditions();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeysOfConditions = exports.KeysOfCustomSQL = exports.KeysOfSqlResPicker = exports.KeysOfSimpleSQL = exports.KeyOfCrudTypes = exports.KeysOfValidators = exports.KeysOfAuthType = exports.KeysOfFunCtx = exports.SqlDbType = void 0;
+var SqlDbType;
+(function (SqlDbType) {
+    SqlDbType["mysql"] = "mysql";
+    SqlDbType["postgres"] = "postgres";
+    SqlDbType["sqlserver"] = "sqlserver";
+})(SqlDbType = exports.SqlDbType || (exports.SqlDbType = {}));
+var KeysOfFunCtx;
+(function (KeysOfFunCtx) {
+    KeysOfFunCtx["FUNC_CTX"] = "$";
+    KeysOfFunCtx["CURRENT_VALUE"] = "$current";
+    KeysOfFunCtx["VISITOR"] = "visitor";
+    KeysOfFunCtx["VISITOR_ATTR"] = "visitor.";
+    KeysOfFunCtx["REQUEST"] = "req.";
+    KeysOfFunCtx["RESULT"] = "res.";
+})(KeysOfFunCtx = exports.KeysOfFunCtx || (exports.KeysOfFunCtx = {}));
+//鉴权类型；free无需鉴权，login仅登录即可，byRoleCode校验角色，byFuncCode校验功能点
+var KeysOfAuthType;
+(function (KeysOfAuthType) {
+    KeysOfAuthType["free"] = "free";
+    KeysOfAuthType["login"] = "login";
+    KeysOfAuthType["byRoleCode"] = "byRoleCode";
+    KeysOfAuthType["byFuncCode"] = "byFuncCode";
+})(KeysOfAuthType = exports.KeysOfAuthType || (exports.KeysOfAuthType = {}));
+var KeysOfValidators;
+(function (KeysOfValidators) {
+    KeysOfValidators["REQUIRED"] = "required";
+    KeysOfValidators["BOOLEAN"] = "boolean";
+    KeysOfValidators["OBJECT"] = "object";
+    KeysOfValidators["ARRAY"] = "array";
+    KeysOfValidators["ARRAY_STRING"] = "array:string";
+    KeysOfValidators["ARRAY_NUMBER"] = "array:number";
+    KeysOfValidators["STRING"] = "string";
+    KeysOfValidators["EMAIL"] = "email";
+    KeysOfValidators["NAME"] = "name";
+    KeysOfValidators["PHONE_CN"] = "phone:cn";
+    KeysOfValidators["INTEGER"] = "integer";
+    KeysOfValidators["NUMBER"] = "number";
+    KeysOfValidators["NUMERIC"] = "numeric";
+    KeysOfValidators["MOMENT"] = "moment:";
+    KeysOfValidators["SCALE"] = "scale:";
+    KeysOfValidators["LENGTH"] = "length:";
+    KeysOfValidators["REG_EXP"] = "regexp:";
+    KeysOfValidators["ENUM"] = "enum:";
+})(KeysOfValidators = exports.KeysOfValidators || (exports.KeysOfValidators = {}));
+var KeyOfCrudTypes;
+(function (KeyOfCrudTypes) {
+    KeyOfCrudTypes["SELECT"] = "SELECT";
+    KeyOfCrudTypes["UPDATE"] = "UPDATE";
+    KeyOfCrudTypes["INSERT"] = "INSERT";
+    KeyOfCrudTypes["DELETE"] = "DELETE";
+    KeyOfCrudTypes["NOT_CRUD"] = "NOT_CRUD";
+    KeyOfCrudTypes["EMPTY_SQL"] = "EMPTY_SQL";
+    KeyOfCrudTypes["SYS_QUERY"] = "SYS_QUERY";
+})(KeyOfCrudTypes = exports.KeyOfCrudTypes || (exports.KeyOfCrudTypes = {}));
+var KeysOfSimpleSQL;
+(function (KeysOfSimpleSQL) {
+    KeysOfSimpleSQL["SIMPLE_QUERY"] = "SIMPLE_QUERY";
+    KeysOfSimpleSQL["SIMPLE_QUERY_ONE"] = "SIMPLE_QUERY_ONE";
+    KeysOfSimpleSQL["SIMPLE_QUERY_PAGE"] = "SIMPLE_QUERY_PAGE";
+    KeysOfSimpleSQL["SIMPLE_QUERY_COUNT"] = "SIMPLE_QUERY_COUNT";
+    KeysOfSimpleSQL["SIMPLE_UPDATE"] = "SIMPLE_UPDATE";
+    KeysOfSimpleSQL["SIMPLE_INSERT"] = "SIMPLE_INSERT";
+    KeysOfSimpleSQL["SIMPLE_DELETE"] = "SIMPLE_DELETE";
+    KeysOfSimpleSQL["SIMPLE_INSERT_ON_DUPLICATE_UPDATE"] = "SIMPLE_INSERT_ON_DUPLICATE_UPDATE";
+    KeysOfSimpleSQL["SIMPLE_INSERT_OR_UPDATE"] = "SIMPLE_INSERT_OR_UPDATE";
+    KeysOfSimpleSQL["CUSTOM"] = "CUSTOM";
+})(KeysOfSimpleSQL = exports.KeysOfSimpleSQL || (exports.KeysOfSimpleSQL = {}));
+var KeysOfSqlResPicker;
+(function (KeysOfSqlResPicker) {
+    KeysOfSqlResPicker["UPDATE_RESULT"] = "UPDATE_RESULT";
+    KeysOfSqlResPicker["RESULT_FIRST_ROW"] = "RESULT_FIRST_ROW";
+    KeysOfSqlResPicker["RESULT_TOTAL_COUNT"] = "RESULT_TOTAL_COUNT";
+    KeysOfSqlResPicker["RESULT_ONE_VALUE"] = "RESULT_ONE_VALUE";
+})(KeysOfSqlResPicker = exports.KeysOfSqlResPicker || (exports.KeysOfSqlResPicker = {}));
+exports.KeysOfCustomSQL = {
+    SQL_COLUMNS: '@@columns',
+    SQL_TABLE: '@@table',
+    SQL_OFFSET_LIMIT: '@@offsetLimit',
+    SQL_ORDER_BYS: '@@orderBys',
+    SQL_AS_WHERE: '@@asWhere:',
+    SQL_AS_UPDATE: '@@asUpdate:',
+    SQL_AS_INSERT_KEYS: '@@asInsertKeys:',
+    SQL_AS_INSERT_VALUES: '@@asInsertValues:',
+    // 从Req中取值：单独取Data中的某个字段：获取单个值。
+    SQL_GET_DATA_ATTR_START: '@@data',
+    SQL_GET_CONDITION_ATTR_START: '@@condition',
+    // 从Res中取值
+    SQL_PICK_RES_AS_NUMBER: '@@pickResAsNumber:',
+    SQL_PICK_RES_AS_STRING: '@@pickResAsString:',
+    // 使用java函数：获取单个值
+    SQL_FUNCTION: '@@function:', // @@function:aaa
+};
+/**
+ * 查询条件中允许出现的关键词
+ * 与MongoDB的语法完全一致
+ */
+exports.KeysOfConditions = {
+    $OR: '$or',
+    $NE: '$ne',
+    $LT: '$lt',
+    $LTE: '$lte',
+    $GT: '$gt',
+    $GTE: '$gte',
+    $IN: '$in',
+    $NIN: '$nin',
+    $NOT_NULL: '$notNull',
+    $NULL: '$null',
+    $RANGE: '$range',
+    $LIKE: '$like',
+    $NOT_LIKE: '$notLike',
+    $LIKE_INCLUDE: '$likeInclude',
+    $NOT_LIKE_INCLUDE: '$notLikeInclude',
+    $MATCH: '$match',
+    $MATCH_BOOL: '$matchBool',
+    /**
+     * SELECT * FROM tms_biz.表 WHERE JSON_CONTAINS(`related_user1`, JSON_ARRAY('2512274'), '$');
+     */
+    $JSON_ARRAY_CONTAINS: '$jsonArrayContains',
+    COMPARE_KEYS: new Set([]),
+    ALL_KEYS: new Set([]),
+};
+function initKeysOfConditions() {
+    const addIgnoreCase = (keys, key) => {
+        keys.add(key);
+        keys.add(key.toUpperCase());
+        keys.add(key.toLowerCase());
+    };
+    // 比较操作符, 支持忽略大小写
+    exports.KeysOfConditions.COMPARE_KEYS = new Set([]);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NE);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$LT);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$LTE);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$GT);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$GTE);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$IN);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NIN);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$LIKE);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$LIKE_INCLUDE);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NOT_LIKE);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NOT_LIKE_INCLUDE);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$JSON_ARRAY_CONTAINS);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$MATCH);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$MATCH_BOOL);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$RANGE);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NULL);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NOT_NULL);
+    // 所有操作符
+    exports.KeysOfConditions.ALL_KEYS = new Set([...exports.KeysOfConditions.COMPARE_KEYS]);
+    addIgnoreCase(exports.KeysOfConditions.ALL_KEYS, exports.KeysOfConditions.$OR);
+}
+initKeysOfConditions();

package/dist/libs/crud-pro/services/CrudProCachedCfgService.d.ts

@@ -1,11 +1,11 @@
-import { CrudProServiceBase } from './CrudProServiceBase';
-import { IRequestCfgModel } from '../interfaces';
-import { ICurdProServiceHub } from '../models/ServiceHub';
-declare class CrudProCachedCfgService extends CrudProServiceBase {
-    constructor(serviceHub: ICurdProServiceHub);
-    getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel | null>;
-    private getCachedCfgByMethodInner;
-    private loadMethodInfo;
-    private loadMethodInfoList;
-}
-export { CrudProCachedCfgService };
+import { CrudProServiceBase } from './CrudProServiceBase';
+import { IRequestCfgModel } from '../interfaces';
+import { ICurdProServiceHub } from '../models/ServiceHub';
+declare class CrudProCachedCfgService extends CrudProServiceBase {
+    constructor(serviceHub: ICurdProServiceHub);
+    getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel | null>;
+    private getCachedCfgByMethodInner;
+    private loadMethodInfo;
+    private loadMethodInfoList;
+}
+export { CrudProCachedCfgService };

package/dist/libs/crud-pro/services/CrudProCachedCfgService.js

@@ -1,73 +1,73 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CrudProCachedCfgService = void 0;
-const humps_1 = require("humps");
-const CrudProServiceBase_1 = require("./CrudProServiceBase");
-const MixinUtils_1 = require("../utils/MixinUtils");
-const convertMix_1 = require("../utils/sqlConvert/convertMix");
-const MemoryRefreshCache_1 = require("../utils/MemoryRefreshCache");
-const methodCache = new MemoryRefreshCache_1.default();
-function parseMethodInfo(methodInfo) {
-    const row = (0, humps_1.camelizeKeys)(methodInfo); //转换成驼峰
-    const configObject = MixinUtils_1.MixinUtils.parseJsonObject(row.moreConfig) || {};
-    const sqlCfgList = MixinUtils_1.MixinUtils.parseJsonObject(row.sqlCfgList) || [];
-    return { ...configObject, ...row, sqlCfgList };
-}
-class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
-    constructor(serviceHub) {
-        super(serviceHub);
-    }
-    async getCachedCfgByMethod(method, isEnableCache) {
-        const methodInfo = await this.getCachedCfgByMethodInner(method, isEnableCache);
-        if (!methodInfo) {
-            return null;
-        }
-        return { ...methodInfo };
-    }
-    async getCachedCfgByMethodInner(method, isEnableCache) {
-        // 不使用缓存
-        if (!isEnableCache) {
-            return await this.loadMethodInfo(method);
-        }
-        methodCache.setProps({
-            keepTime: 1000 * 60 * 2,
-            requestFn: () => this.loadMethodInfoList(),
-            getKeyFn: item => item.method,
-        });
-        const methodInfo = await methodCache.getItem(method);
-        if (methodInfo) {
-            return methodInfo;
-        }
-        return await this.loadMethodInfo(method);
-    }
-    async loadMethodInfo(method) {
-        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
-        const sql = `select * from ${methodsTableName} where method = ? `; // 全部加载到内存
-        const baseInfo = {
-            sqlTable: methodsTableName,
-            sqlDatabase: sysDatabaseName,
-            sqlDbType: sysDatabaseDbType,
-        };
-        const queryRes = await this.executeUnsafeQuery(baseInfo, sql, [method]);
-        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
-        if (rows2.length > 0) {
-            return parseMethodInfo(rows2[0]);
-        }
-        return null;
-    }
-    async loadMethodInfoList() {
-        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
-        const sql = `select * from ${methodsTableName}`; // 全部加载到内存
-        const baseInfo = {
-            sqlTable: methodsTableName,
-            sqlDatabase: sysDatabaseName,
-            sqlDbType: sysDatabaseDbType,
-        };
-        const queryRes = await this.executeUnsafeQuery(baseInfo, sql);
-        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
-        return rows2.map(row => {
-            return parseMethodInfo(row);
-        });
-    }
-}
-exports.CrudProCachedCfgService = CrudProCachedCfgService;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrudProCachedCfgService = void 0;
+const humps_1 = require("humps");
+const CrudProServiceBase_1 = require("./CrudProServiceBase");
+const MixinUtils_1 = require("../utils/MixinUtils");
+const convertMix_1 = require("../utils/sqlConvert/convertMix");
+const MemoryRefreshCache_1 = require("../utils/MemoryRefreshCache");
+const methodCache = new MemoryRefreshCache_1.default();
+function parseMethodInfo(methodInfo) {
+    const row = (0, humps_1.camelizeKeys)(methodInfo); //转换成驼峰
+    const configObject = MixinUtils_1.MixinUtils.parseJsonObject(row.moreConfig) || {};
+    const sqlCfgList = MixinUtils_1.MixinUtils.parseJsonObject(row.sqlCfgList) || [];
+    return { ...configObject, ...row, sqlCfgList };
+}
+class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
+    constructor(serviceHub) {
+        super(serviceHub);
+    }
+    async getCachedCfgByMethod(method, isEnableCache) {
+        const methodInfo = await this.getCachedCfgByMethodInner(method, isEnableCache);
+        if (!methodInfo) {
+            return null;
+        }
+        return { ...methodInfo };
+    }
+    async getCachedCfgByMethodInner(method, isEnableCache) {
+        // 不使用缓存
+        if (!isEnableCache) {
+            return await this.loadMethodInfo(method);
+        }
+        methodCache.setProps({
+            keepTime: 1000 * 60 * 2,
+            requestFn: () => this.loadMethodInfoList(),
+            getKeyFn: item => item.method,
+        });
+        const methodInfo = await methodCache.getItem(method);
+        if (methodInfo) {
+            return methodInfo;
+        }
+        return await this.loadMethodInfo(method);
+    }
+    async loadMethodInfo(method) {
+        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
+        const sql = `select * from ${methodsTableName} where method = ? `; // 全部加载到内存
+        const baseInfo = {
+            sqlTable: methodsTableName,
+            sqlDatabase: sysDatabaseName,
+            sqlDbType: sysDatabaseDbType,
+        };
+        const queryRes = await this.executeUnsafeQuery(baseInfo, sql, [method]);
+        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
+        if (rows2.length > 0) {
+            return parseMethodInfo(rows2[0]);
+        }
+        return null;
+    }
+    async loadMethodInfoList() {
+        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
+        const sql = `select * from ${methodsTableName}`; // 全部加载到内存
+        const baseInfo = {
+            sqlTable: methodsTableName,
+            sqlDatabase: sysDatabaseName,
+            sqlDbType: sysDatabaseDbType,
+        };
+        const queryRes = await this.executeUnsafeQuery(baseInfo, sql);
+        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
+        return rows2.map(row => {
+            return parseMethodInfo(row);
+        });
+    }
+}
+exports.CrudProCachedCfgService = CrudProCachedCfgService;

package/dist/libs/crud-pro/services/CrudProExecuteFuncService.d.ts

@@ -1,9 +1,9 @@
-import { CrudProServiceBase } from './CrudProServiceBase';
-import { IFuncCfgModel } from '../interfaces';
-import { FuncContext } from '../models/FuncContext';
-declare class CrudProExecuteFuncService extends CrudProServiceBase {
-    executeFuncCfg(funCfg: IFuncCfgModel, funcContext: FuncContext): any;
-    private pickContextValue;
-    private getFunctionParamValues;
-}
-export { CrudProExecuteFuncService };
+import { CrudProServiceBase } from './CrudProServiceBase';
+import { IFuncCfgModel } from '../interfaces';
+import { FuncContext } from '../models/FuncContext';
+declare class CrudProExecuteFuncService extends CrudProServiceBase {
+    executeFuncCfg(funCfg: IFuncCfgModel, funcContext: FuncContext): any;
+    private pickContextValue;
+    private getFunctionParamValues;
+}
+export { CrudProExecuteFuncService };