|
@@ -5,7 +5,7 @@ const getModelType = (type, interf = false) => {
|
|
|
if (!interf) modelType = 'Decimal128';
|
|
|
else modelType = 'number';
|
|
|
} else if (type === 'ObjectId') modelType = 'ObjectId';
|
|
|
- else if (type === 'Array') modelType = 'Array';
|
|
|
+ else if (type === 'Array') modelType = 'Array<any>';
|
|
|
else modelType = _.lowerFirst(type);
|
|
|
return modelType;
|
|
|
};
|
|
@@ -136,8 +136,11 @@ const getInterfaceColumn = (col, needReq = false) => {
|
|
|
fc.push(` @ApiProperty({ description: '${title}' })`);
|
|
|
if (needReq) {
|
|
|
let ruleStr = '';
|
|
|
- if (required) ruleStr = `@Rule(RuleType['${modelType}']().required().error(new ServiceError('缺少${zh}',FrameworkErrorEnum.${needReq ? 'NEED_BODY' : 'NEED_QUERY'})))`;
|
|
|
- else ruleStr = `@Rule(RuleType['${modelType}']().empty())`;
|
|
|
+ let rt = '';
|
|
|
+ if (type === 'Money' || type === 'money') rt = 'number';
|
|
|
+ else rt = _.lowerFirst(type);
|
|
|
+ if (required) ruleStr = `@Rule(RuleType['${rt}']().required().error(new ServiceError('缺少${zh}',FrameworkErrorEnum.${needReq ? 'NEED_BODY' : 'NEED_QUERY'})))`;
|
|
|
+ else ruleStr = `@Rule(RuleType['${rt}']().empty())`;
|
|
|
fc.push(ruleStr);
|
|
|
}
|
|
|
fc.push(` '${title}': ${modelType} = undefined;`);
|