midway-fatcms 0.0.1-beta.71 → 0.0.1-beta.72

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

@@ -1,148 +1,148 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CrudProFieldValidateService = void 0;
-const CrudProServiceBase_1 = require("./CrudProServiceBase");
-const MixinUtils_1 = require("../utils/MixinUtils");
-const keys_1 = require("../models/keys");
-const exceptions_1 = require("../exceptions");
-const ModelUtils_1 = require("../utils/ModelUtils");
-const FuncContext_1 = require("../models/FuncContext");
-const ValidateUtils_1 = require("../utils/ValidateUtils");
-const { checkFuncCfgValid } = ModelUtils_1.ModelUtils;
-const { isEmpty, isNotEmpty, deepTravelObject } = MixinUtils_1.MixinUtils;
-class CrudProFieldValidateService extends CrudProServiceBase_1.CrudProServiceBase {
-    validateByAllow(cfgModel, reqModel) {
-        const allowCfg = cfgModel.allowCfg; //  allowCfg: {data: ['login_name', 'nick_name', 'avatar', 'status'],},
-        if (isEmpty(allowCfg)) {
-            return;
-        }
-        const keys = Object.keys(allowCfg);
-        const validateAllowByJsonObject = (allowList, targetObj, key) => {
-            if (isEmpty(allowList)) {
-                return;
-            }
-            const isCondition = key.startsWith('condition');
-            // 任意一个key，不在allow列表中，就不合法
-            deepTravelObject(targetObj, (value, key, index, keyPath) => {
-                if (isCondition) {
-                    if (!keys_1.KeysOfConditions.ALL_KEYS.has(key) && !allowList.includes(key)) {
-                        throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ALLOW_ERR, keyPath);
-                    }
-                }
-                else {
-                    if (!allowList.includes(key)) {
-                        throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ALLOW_ERR, keyPath);
-                    }
-                }
-            }, key);
-        };
-        for (let i = 0; i < keys.length; i++) {
-            const key = keys[i]; // demo: data or condition
-            const allowList = MixinUtils_1.MixinUtils.parseStringArray(allowCfg[key]);
-            if (Array.isArray(allowList) && allowList.length > 0) {
-                const targetObj = reqModel.getCondOrDataJsonObject(key);
-                validateAllowByJsonObject(allowList, targetObj, key);
-            }
-        }
-    }
-    validateByReject(cfgModel, reqModel) {
-        const rejectCfgMap = cfgModel.rejectCfg;
-        if (isEmpty(rejectCfgMap)) {
-            return;
-        }
-        const keys = Object.keys(rejectCfgMap);
-        const validateRejectByJsonObject = (rejectList, targetObj, conditionName) => {
-            if (isEmpty(rejectList)) {
-                return;
-            }
-            // 任意一个key，出现在reject列表中，就不合法
-            deepTravelObject(targetObj, (value, key, index, keyPath) => {
-                if (rejectList.includes(key)) {
-                    throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_REJECT_ERR, keyPath);
-                }
-            }, conditionName);
-        };
-        for (let i = 0; i < keys.length; i++) {
-            const conditionName = keys[i];
-            const rejectList = MixinUtils_1.MixinUtils.parseStringArray(rejectCfgMap[conditionName]);
-            if (Array.isArray(rejectList) && rejectList.length > 0) {
-                const targetObj = reqModel.getCondOrDataJsonObject(conditionName);
-                validateRejectByJsonObject(rejectList, targetObj, conditionName);
-            }
-        }
-    }
-    validateByCfg(cfgModel, reqModel) {
-        const validateCfg = cfgModel.validateCfg;
-        if (isEmpty(validateCfg)) {
-            return;
-        }
-        const keys = Object.keys(validateCfg);
-        for (const key of keys) {
-            const itemValue = reqModel.getJsonObjectValue(key);
-            const cfgList = validateCfg[key];
-            if (isNotEmpty(cfgList)) {
-                // 先校验是否必填。
-                this.validateRequired(cfgList, itemValue, key);
-                // 除REQUIRED之外的其他配置
-                const cfgList2 = cfgList.filter(cfg => {
-                    return cfg !== keys_1.KeysOfValidators.REQUIRED;
-                });
-                // 只有数值不为空时，才需要校验。非必填情况下：内容为空，不需要校验
-                if (isNotEmpty(itemValue)) {
-                    for (const cfg of cfgList2) {
-                        if (typeof cfg === 'string') {
-                            this.validateByCfgString(cfg, reqModel, itemValue, key);
-                        }
-                        else if (typeof cfg === 'function') {
-                            this.validateByCfgCustomFunction(cfg, reqModel, itemValue, key);
-                        }
-                        else {
-                            this.validateByCfgFunc(cfg, reqModel, itemValue, key);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    validateByCfgCustomFunction(cfg, reqModel, itemValue, key) {
-        // 使用自定义函数校验
-        cfg(itemValue);
-    }
-    validateByCfgString(itemCfg, reqModel, itemValue, errPath) {
-        return (0, ValidateUtils_1.validateByCfgString)(itemCfg, itemValue, errPath);
-    }
-    validateByCfgFunc(funcCfg, reqModel, itemValue, errPath) {
-        if (!checkFuncCfgValid(funcCfg)) {
-            throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_VALIDATE_CUSTOM_FUNCTION_EMPTY);
-        }
-        let result;
-        try {
-            const exeFunCtx = new FuncContext_1.FuncContext();
-            exeFunCtx.currentValue = itemValue;
-            exeFunCtx.reqModel = reqModel;
-            result = this.serviceHub.executeFuncCfg(funcCfg, exeFunCtx);
-        }
-        catch (e) {
-            this.logger.error('validateByCfgFunc', e);
-            throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_EXCEPTION, errPath + '.' + e);
-        }
-        if (!(typeof result === 'boolean')) {
-            // 自定义的校验函数，必须返回boolean类型的树枝
-            throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_VALIDATE_CUSTOM_FUNCTION_MUST_RETURN_BOOL, errPath);
-        }
-        if (result === false) {
-            throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, funcCfg.message || errPath);
-        }
-    }
-    validateRequired(cfgList, itemValue, errPath) {
-        const required = cfgList.find(cfg => {
-            return cfg === keys_1.KeysOfValidators.REQUIRED;
-        });
-        if (required) {
-            if (isEmpty(itemValue)) {
-                throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, '参数校验错误，缺少必填字段：' + errPath);
-            }
-        }
-    }
-}
-exports.CrudProFieldValidateService = CrudProFieldValidateService;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrudProFieldValidateService = void 0;
+const CrudProServiceBase_1 = require("./CrudProServiceBase");
+const MixinUtils_1 = require("../utils/MixinUtils");
+const keys_1 = require("../models/keys");
+const exceptions_1 = require("../exceptions");
+const ModelUtils_1 = require("../utils/ModelUtils");
+const FuncContext_1 = require("../models/FuncContext");
+const ValidateUtils_1 = require("../utils/ValidateUtils");
+const { checkFuncCfgValid } = ModelUtils_1.ModelUtils;
+const { isEmpty, isNotEmpty, deepTravelObject } = MixinUtils_1.MixinUtils;
+class CrudProFieldValidateService extends CrudProServiceBase_1.CrudProServiceBase {
+    validateByAllow(cfgModel, reqModel) {
+        const allowCfg = cfgModel.allowCfg; //  allowCfg: {data: ['login_name', 'nick_name', 'avatar', 'status'],},
+        if (isEmpty(allowCfg)) {
+            return;
+        }
+        const keys = Object.keys(allowCfg);
+        const validateAllowByJsonObject = (allowList, targetObj, key) => {
+            if (isEmpty(allowList)) {
+                return;
+            }
+            const isCondition = key.startsWith('condition');
+            // 任意一个key，不在allow列表中，就不合法
+            deepTravelObject(targetObj, (value, key, index, keyPath) => {
+                if (isCondition) {
+                    if (!keys_1.KeysOfConditions.ALL_KEYS.has(key) && !allowList.includes(key)) {
+                        throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ALLOW_ERR, keyPath);
+                    }
+                }
+                else {
+                    if (!allowList.includes(key)) {
+                        throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ALLOW_ERR, keyPath);
+                    }
+                }
+            }, key);
+        };
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i]; // demo: data or condition
+            const allowList = MixinUtils_1.MixinUtils.parseStringArray(allowCfg[key]);
+            if (Array.isArray(allowList) && allowList.length > 0) {
+                const targetObj = reqModel.getCondOrDataJsonObject(key);
+                validateAllowByJsonObject(allowList, targetObj, key);
+            }
+        }
+    }
+    validateByReject(cfgModel, reqModel) {
+        const rejectCfgMap = cfgModel.rejectCfg;
+        if (isEmpty(rejectCfgMap)) {
+            return;
+        }
+        const keys = Object.keys(rejectCfgMap);
+        const validateRejectByJsonObject = (rejectList, targetObj, conditionName) => {
+            if (isEmpty(rejectList)) {
+                return;
+            }
+            // 任意一个key，出现在reject列表中，就不合法
+            deepTravelObject(targetObj, (value, key, index, keyPath) => {
+                if (rejectList.includes(key)) {
+                    throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_REJECT_ERR, keyPath);
+                }
+            }, conditionName);
+        };
+        for (let i = 0; i < keys.length; i++) {
+            const conditionName = keys[i];
+            const rejectList = MixinUtils_1.MixinUtils.parseStringArray(rejectCfgMap[conditionName]);
+            if (Array.isArray(rejectList) && rejectList.length > 0) {
+                const targetObj = reqModel.getCondOrDataJsonObject(conditionName);
+                validateRejectByJsonObject(rejectList, targetObj, conditionName);
+            }
+        }
+    }
+    validateByCfg(cfgModel, reqModel) {
+        const validateCfg = cfgModel.validateCfg;
+        if (isEmpty(validateCfg)) {
+            return;
+        }
+        const keys = Object.keys(validateCfg);
+        for (const key of keys) {
+            const itemValue = reqModel.getJsonObjectValue(key);
+            const cfgList = validateCfg[key];
+            if (isNotEmpty(cfgList)) {
+                // 先校验是否必填。
+                this.validateRequired(cfgList, itemValue, key);
+                // 除REQUIRED之外的其他配置
+                const cfgList2 = cfgList.filter(cfg => {
+                    return cfg !== keys_1.KeysOfValidators.REQUIRED;
+                });
+                // 只有数值不为空时，才需要校验。非必填情况下：内容为空，不需要校验
+                if (isNotEmpty(itemValue)) {
+                    for (const cfg of cfgList2) {
+                        if (typeof cfg === 'string') {
+                            this.validateByCfgString(cfg, reqModel, itemValue, key);
+                        }
+                        else if (typeof cfg === 'function') {
+                            this.validateByCfgCustomFunction(cfg, reqModel, itemValue, key);
+                        }
+                        else {
+                            this.validateByCfgFunc(cfg, reqModel, itemValue, key);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    validateByCfgCustomFunction(cfg, reqModel, itemValue, key) {
+        // 使用自定义函数校验
+        cfg(itemValue);
+    }
+    validateByCfgString(itemCfg, reqModel, itemValue, errPath) {
+        return (0, ValidateUtils_1.validateByCfgString)(itemCfg, itemValue, errPath);
+    }
+    validateByCfgFunc(funcCfg, reqModel, itemValue, errPath) {
+        if (!checkFuncCfgValid(funcCfg)) {
+            throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_VALIDATE_CUSTOM_FUNCTION_EMPTY);
+        }
+        let result;
+        try {
+            const exeFunCtx = new FuncContext_1.FuncContext();
+            exeFunCtx.currentValue = itemValue;
+            exeFunCtx.reqModel = reqModel;
+            result = this.serviceHub.executeFuncCfg(funcCfg, exeFunCtx);
+        }
+        catch (e) {
+            this.logger.error('validateByCfgFunc', e);
+            throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_EXCEPTION, errPath + '.' + e);
+        }
+        if (!(typeof result === 'boolean')) {
+            // 自定义的校验函数，必须返回boolean类型的树枝
+            throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_VALIDATE_CUSTOM_FUNCTION_MUST_RETURN_BOOL, errPath);
+        }
+        if (result === false) {
+            throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, funcCfg.message || errPath);
+        }
+    }
+    validateRequired(cfgList, itemValue, errPath) {
+        const required = cfgList.find(cfg => {
+            return cfg === keys_1.KeysOfValidators.REQUIRED;
+        });
+        if (required) {
+            if (isEmpty(itemValue)) {
+                throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, '参数校验错误，缺少必填字段：' + errPath);
+            }
+        }
+    }
+}
+exports.CrudProFieldValidateService = CrudProFieldValidateService;

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

@@ -1,24 +1,24 @@
-import { SqlSegArg } from '../models/SqlSegArg';
-import { SqlCfgModel } from '../models/SqlCfgModel';
-declare class CrudProGenSqlCondition {
-    private readonly sqlCfg;
-    constructor(sqlCfg: SqlCfgModel);
-    generateCondition(condition: any): SqlSegArg;
-    /**
-     * condition = {$or:[{name:'zhangsan'},{name:'lisi'},{age: {$gt:18}}],sex:1}
-     * where (name = 'zhangsan' or name = 'lisi' or age > 18) and sex = 1
-     * @param condition
-     * @private
-     */
-    private generateByLogicalKey;
-    private generateByLogicalOR;
-    private generateByCompareKey;
-    /**
-     * 参数校验
-     * @param key
-     * @param map
-     * @private
-     */
-    private generateByCompareKeyCheckParam;
-}
-export { CrudProGenSqlCondition };
+import { SqlSegArg } from '../models/SqlSegArg';
+import { SqlCfgModel } from '../models/SqlCfgModel';
+declare class CrudProGenSqlCondition {
+    private readonly sqlCfg;
+    constructor(sqlCfg: SqlCfgModel);
+    generateCondition(condition: any): SqlSegArg;
+    /**
+     * condition = {$or:[{name:'zhangsan'},{name:'lisi'},{age: {$gt:18}}],sex:1}
+     * where (name = 'zhangsan' or name = 'lisi' or age > 18) and sex = 1
+     * @param condition
+     * @private
+     */
+    private generateByLogicalKey;
+    private generateByLogicalOR;
+    private generateByCompareKey;
+    /**
+     * 参数校验
+     * @param key
+     * @param map
+     * @private
+     */
+    private generateByCompareKeyCheckParam;
+}
+export { CrudProGenSqlCondition };