midway-fatcms 0.0.1-beta.7 → 0.0.1-beta.70

package/src/libs/crud-pro/services/CrudProFieldUpdateService.ts

@@ -1,60 +1,60 @@
-import { RequestModel } from '../models/RequestModel';
-import { CrudProServiceBase } from './CrudProServiceBase';
-import { RequestCfgModel } from '../models/RequestCfgModel';
-import { MixinUtils } from '../utils/MixinUtils';
-import { IFuncCfgModel } from '../interfaces';
-import * as _ from 'lodash';
-import { ModelUtils } from '../utils/ModelUtils';
-import { CommonException, Exceptions } from '../exceptions';
-import { FuncContext } from '../models/FuncContext';
-const { checkFuncCfgValid } = ModelUtils;
-const { isEmpty } = MixinUtils;
-
-class CrudProFieldUpdateService extends CrudProServiceBase {
-  updateByCfg(cfgModel: RequestCfgModel, reqModel: RequestModel) {
-    const updateCfgMap = cfgModel.updateCfg;
-    if (isEmpty(updateCfgMap)) {
-      return;
-    }
-
-    const keys = Object.keys(updateCfgMap);
-    for (let i = 0; i < keys.length; i++) {
-      const key = keys[i]; // data.name
-      const updateCfg = updateCfgMap[key];
-      this.updateByJsonObject(updateCfg, key, reqModel);
-    }
-  }
-
-  private updateByJsonObject(updateCfg: IFuncCfgModel, key: string, reqModel: RequestModel) {
-    if (isEmpty(updateCfg)) {
-      return;
-    }
-    const itemOldValue = _.get(reqModel, key);
-    const newValue = this.getUpdateNewValueByCfg(updateCfg, itemOldValue, key, reqModel);
-    _.set(reqModel, key, newValue);
-  }
-
-  private getUpdateNewValueByCfg(updateCfg: IFuncCfgModel, itemOldValue: any, key: string, reqModel: RequestModel) {
-    if (!checkFuncCfgValid(updateCfg)) {
-      throw new CommonException(Exceptions.CFG_UPDATE_ITEM_MUST_FUNC_CFG, 'updateCfg配置项必须是满足IFuncCfgModel' + key);
-    }
-
-    let result;
-
-    try {
-      const exeFunCtx = new FuncContext();
-
-      exeFunCtx.currentValue = itemOldValue;
-      exeFunCtx.reqModel = reqModel;
-
-      result = this.serviceHub.executeFuncCfg(updateCfg, exeFunCtx);
-    } catch (e) {
-      this.logger.error('getUpdateNewValueByCfg->executeFuncCfg', e);
-      throw new CommonException(Exceptions.UPDATE_EXCEPTION, key + '.' + e);
-    }
-
-    return result;
-  }
-}
-
-export { CrudProFieldUpdateService };
+import { RequestModel } from '../models/RequestModel';
+import { CrudProServiceBase } from './CrudProServiceBase';
+import { RequestCfgModel } from '../models/RequestCfgModel';
+import { MixinUtils } from '../utils/MixinUtils';
+import { IFuncCfgModel } from '../interfaces';
+import * as _ from 'lodash';
+import { ModelUtils } from '../utils/ModelUtils';
+import { CommonException, Exceptions } from '../exceptions';
+import { FuncContext } from '../models/FuncContext';
+const { checkFuncCfgValid } = ModelUtils;
+const { isEmpty } = MixinUtils;
+
+class CrudProFieldUpdateService extends CrudProServiceBase {
+  updateByCfg(cfgModel: RequestCfgModel, reqModel: RequestModel) {
+    const updateCfgMap = cfgModel.updateCfg;
+    if (isEmpty(updateCfgMap)) {
+      return;
+    }
+
+    const keys = Object.keys(updateCfgMap);
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i]; // data.name
+      const updateCfg = updateCfgMap[key];
+      this.updateByJsonObject(updateCfg, key, reqModel);
+    }
+  }
+
+  private updateByJsonObject(updateCfg: IFuncCfgModel, key: string, reqModel: RequestModel) {
+    if (isEmpty(updateCfg)) {
+      return;
+    }
+    const itemOldValue = _.get(reqModel, key);
+    const newValue = this.getUpdateNewValueByCfg(updateCfg, itemOldValue, key, reqModel);
+    _.set(reqModel, key, newValue);
+  }
+
+  private getUpdateNewValueByCfg(updateCfg: IFuncCfgModel, itemOldValue: any, key: string, reqModel: RequestModel) {
+    if (!checkFuncCfgValid(updateCfg)) {
+      throw new CommonException(Exceptions.CFG_UPDATE_ITEM_MUST_FUNC_CFG, 'updateCfg配置项必须是满足IFuncCfgModel' + key);
+    }
+
+    let result;
+
+    try {
+      const exeFunCtx = new FuncContext();
+
+      exeFunCtx.currentValue = itemOldValue;
+      exeFunCtx.reqModel = reqModel;
+
+      result = this.serviceHub.executeFuncCfg(updateCfg, exeFunCtx);
+    } catch (e) {
+      this.logger.error('getUpdateNewValueByCfg->executeFuncCfg', e);
+      throw new CommonException(Exceptions.UPDATE_EXCEPTION, key + '.' + e);
+    }
+
+    return result;
+  }
+}
+
+export { CrudProFieldUpdateService };

package/src/libs/crud-pro/services/CrudProFieldValidateService.ts

@@ -1,180 +1,180 @@
-import { RequestModel } from '../models/RequestModel';
-import { CrudProServiceBase } from './CrudProServiceBase';
-import { RequestCfgModel } from '../models/RequestCfgModel';
-import { MixinUtils } from '../utils/MixinUtils';
-import { KeysOfConditions, KeysOfValidators } from '../models/keys';
-import { CommonException, Exceptions } from '../exceptions';
-import { ModelUtils } from '../utils/ModelUtils';
-import { ICustomValidateFunc, IFuncCfgModel, IValidatorCfgItem } from '../interfaces';
-import { FuncContext } from '../models/FuncContext';
-import { validateByCfgString } from '../utils/ValidateUtils';
-
-const { checkFuncCfgValid } = ModelUtils;
-
-const { isEmpty, isNotEmpty, deepTravelObject } = MixinUtils;
-
-class CrudProFieldValidateService extends CrudProServiceBase {
-  validateByAllow(cfgModel: RequestCfgModel, reqModel: RequestModel) {
-    const allowCfg = cfgModel.allowCfg; //  allowCfg: {data: ['login_name', 'nick_name', 'avatar', 'status'],},
-    if (isEmpty(allowCfg)) {
-      return;
-    }
-
-    const keys = Object.keys(allowCfg);
-
-    const validateAllowByJsonObject = (allowList: string[], targetObj: any, key: string) => {
-      if (isEmpty(allowList)) {
-        return;
-      }
-
-      const isCondition = key.startsWith('condition');
-
-      // 任意一个key，不在allow列表中，就不合法
-      deepTravelObject(
-        targetObj,
-        (value, key, index, keyPath) => {
-          if (isCondition) {
-            if (!KeysOfConditions.ALL_KEYS.has(key) && !allowList.includes(key)) {
-              throw new CommonException(Exceptions.VALIDATE_ALLOW_ERR, keyPath);
-            }
-          } else {
-            if (!allowList.includes(key)) {
-              throw new CommonException(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.parseStringArray(allowCfg[key]);
-      if (Array.isArray(allowList) && allowList.length > 0) {
-        const targetObj = reqModel.getCondOrDataJsonObject(key);
-        validateAllowByJsonObject(allowList, targetObj, key);
-      }
-    }
-  }
-
-  validateByReject(cfgModel: RequestCfgModel, reqModel: RequestModel) {
-    const rejectCfgMap = cfgModel.rejectCfg;
-    if (isEmpty(rejectCfgMap)) {
-      return;
-    }
-
-    const keys = Object.keys(rejectCfgMap);
-
-    const validateRejectByJsonObject = (rejectList: string[], targetObj: any, conditionName: string) => {
-      if (isEmpty(rejectList)) {
-        return;
-      }
-      // 任意一个key，出现在reject列表中，就不合法
-      deepTravelObject(
-        targetObj,
-        (value, key, index, keyPath) => {
-          if (rejectList.includes(key)) {
-            throw new CommonException(Exceptions.VALIDATE_REJECT_ERR, keyPath);
-          }
-        },
-        conditionName
-      );
-    };
-
-    for (let i = 0; i < keys.length; i++) {
-      const conditionName = keys[i];
-      const rejectList = MixinUtils.parseStringArray(rejectCfgMap[conditionName]);
-      if (Array.isArray(rejectList) && rejectList.length > 0) {
-        const targetObj = reqModel.getCondOrDataJsonObject(conditionName);
-        validateRejectByJsonObject(rejectList, targetObj, conditionName);
-      }
-    }
-  }
-
-  validateByCfg(cfgModel: RequestCfgModel, reqModel: RequestModel) {
-    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 !== 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);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  private validateByCfgCustomFunction(cfg: ICustomValidateFunc, reqModel: RequestModel, itemValue: any, key: string) {
-    // 使用自定义函数校验
-    cfg(itemValue);
-  }
-
-  private validateByCfgString(itemCfg: KeysOfValidators | string, reqModel: RequestModel, itemValue: any, errPath: string) {
-    return validateByCfgString(itemCfg, itemValue, errPath);
-  }
-
-  private validateByCfgFunc(funcCfg: IFuncCfgModel, reqModel: RequestModel, itemValue: any, errPath: string) {
-    if (!checkFuncCfgValid(funcCfg)) {
-      throw new CommonException(Exceptions.CFG_VALIDATE_CUSTOM_FUNCTION_EMPTY);
-    }
-
-    let result;
-
-    try {
-      const exeFunCtx = new FuncContext();
-
-      exeFunCtx.currentValue = itemValue;
-      exeFunCtx.reqModel = reqModel;
-
-      result = this.serviceHub.executeFuncCfg(funcCfg, exeFunCtx);
-    } catch (e) {
-      this.logger.error('validateByCfgFunc', e);
-      throw new CommonException(Exceptions.VALIDATE_EXCEPTION, errPath + '.' + e);
-    }
-
-    if (!(typeof result === 'boolean')) {
-      // 自定义的校验函数，必须返回boolean类型的树枝
-      throw new CommonException(Exceptions.CFG_VALIDATE_CUSTOM_FUNCTION_MUST_RETURN_BOOL, errPath);
-    }
-
-    if (result === false) {
-      throw new CommonException(Exceptions.VALIDATE_ERR, funcCfg.message || errPath);
-    }
-  }
-
-  private validateRequired(cfgList: IValidatorCfgItem[], itemValue: any, errPath: string) {
-    const required = cfgList.find(cfg => {
-      return cfg === KeysOfValidators.REQUIRED;
-    });
-
-    if (required) {
-      if (isEmpty(itemValue)) {
-        throw new CommonException(Exceptions.VALIDATE_ERR, '参数校验错误，缺少必填字段：' + errPath);
-      }
-    }
-  }
-}
-
-export { CrudProFieldValidateService };
+import { RequestModel } from '../models/RequestModel';
+import { CrudProServiceBase } from './CrudProServiceBase';
+import { RequestCfgModel } from '../models/RequestCfgModel';
+import { MixinUtils } from '../utils/MixinUtils';
+import { KeysOfConditions, KeysOfValidators } from '../models/keys';
+import { CommonException, Exceptions } from '../exceptions';
+import { ModelUtils } from '../utils/ModelUtils';
+import { ICustomValidateFunc, IFuncCfgModel, IValidatorCfgItem } from '../interfaces';
+import { FuncContext } from '../models/FuncContext';
+import { validateByCfgString } from '../utils/ValidateUtils';
+
+const { checkFuncCfgValid } = ModelUtils;
+
+const { isEmpty, isNotEmpty, deepTravelObject } = MixinUtils;
+
+class CrudProFieldValidateService extends CrudProServiceBase {
+  validateByAllow(cfgModel: RequestCfgModel, reqModel: RequestModel) {
+    const allowCfg = cfgModel.allowCfg; //  allowCfg: {data: ['login_name', 'nick_name', 'avatar', 'status'],},
+    if (isEmpty(allowCfg)) {
+      return;
+    }
+
+    const keys = Object.keys(allowCfg);
+
+    const validateAllowByJsonObject = (allowList: string[], targetObj: any, key: string) => {
+      if (isEmpty(allowList)) {
+        return;
+      }
+
+      const isCondition = key.startsWith('condition');
+
+      // 任意一个key，不在allow列表中，就不合法
+      deepTravelObject(
+        targetObj,
+        (value, key, index, keyPath) => {
+          if (isCondition) {
+            if (!KeysOfConditions.ALL_KEYS.has(key) && !allowList.includes(key)) {
+              throw new CommonException(Exceptions.VALIDATE_ALLOW_ERR, keyPath);
+            }
+          } else {
+            if (!allowList.includes(key)) {
+              throw new CommonException(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.parseStringArray(allowCfg[key]);
+      if (Array.isArray(allowList) && allowList.length > 0) {
+        const targetObj = reqModel.getCondOrDataJsonObject(key);
+        validateAllowByJsonObject(allowList, targetObj, key);
+      }
+    }
+  }
+
+  validateByReject(cfgModel: RequestCfgModel, reqModel: RequestModel) {
+    const rejectCfgMap = cfgModel.rejectCfg;
+    if (isEmpty(rejectCfgMap)) {
+      return;
+    }
+
+    const keys = Object.keys(rejectCfgMap);
+
+    const validateRejectByJsonObject = (rejectList: string[], targetObj: any, conditionName: string) => {
+      if (isEmpty(rejectList)) {
+        return;
+      }
+      // 任意一个key，出现在reject列表中，就不合法
+      deepTravelObject(
+        targetObj,
+        (value, key, index, keyPath) => {
+          if (rejectList.includes(key)) {
+            throw new CommonException(Exceptions.VALIDATE_REJECT_ERR, keyPath);
+          }
+        },
+        conditionName
+      );
+    };
+
+    for (let i = 0; i < keys.length; i++) {
+      const conditionName = keys[i];
+      const rejectList = MixinUtils.parseStringArray(rejectCfgMap[conditionName]);
+      if (Array.isArray(rejectList) && rejectList.length > 0) {
+        const targetObj = reqModel.getCondOrDataJsonObject(conditionName);
+        validateRejectByJsonObject(rejectList, targetObj, conditionName);
+      }
+    }
+  }
+
+  validateByCfg(cfgModel: RequestCfgModel, reqModel: RequestModel) {
+    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 !== 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);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  private validateByCfgCustomFunction(cfg: ICustomValidateFunc, reqModel: RequestModel, itemValue: any, key: string) {
+    // 使用自定义函数校验
+    cfg(itemValue);
+  }
+
+  private validateByCfgString(itemCfg: KeysOfValidators | string, reqModel: RequestModel, itemValue: any, errPath: string) {
+    return validateByCfgString(itemCfg, itemValue, errPath);
+  }
+
+  private validateByCfgFunc(funcCfg: IFuncCfgModel, reqModel: RequestModel, itemValue: any, errPath: string) {
+    if (!checkFuncCfgValid(funcCfg)) {
+      throw new CommonException(Exceptions.CFG_VALIDATE_CUSTOM_FUNCTION_EMPTY);
+    }
+
+    let result;
+
+    try {
+      const exeFunCtx = new FuncContext();
+
+      exeFunCtx.currentValue = itemValue;
+      exeFunCtx.reqModel = reqModel;
+
+      result = this.serviceHub.executeFuncCfg(funcCfg, exeFunCtx);
+    } catch (e) {
+      this.logger.error('validateByCfgFunc', e);
+      throw new CommonException(Exceptions.VALIDATE_EXCEPTION, errPath + '.' + e);
+    }
+
+    if (!(typeof result === 'boolean')) {
+      // 自定义的校验函数，必须返回boolean类型的树枝
+      throw new CommonException(Exceptions.CFG_VALIDATE_CUSTOM_FUNCTION_MUST_RETURN_BOOL, errPath);
+    }
+
+    if (result === false) {
+      throw new CommonException(Exceptions.VALIDATE_ERR, funcCfg.message || errPath);
+    }
+  }
+
+  private validateRequired(cfgList: IValidatorCfgItem[], itemValue: any, errPath: string) {
+    const required = cfgList.find(cfg => {
+      return cfg === KeysOfValidators.REQUIRED;
+    });
+
+    if (required) {
+      if (isEmpty(itemValue)) {
+        throw new CommonException(Exceptions.VALIDATE_ERR, '参数校验错误，缺少必填字段：' + errPath);
+      }
+    }
+  }
+}
+
+export { CrudProFieldValidateService };