@shys/crud 1.0.1-beta.2 → 1.0.1-beta.4

package/dist/generator.js

@@ -72,6 +72,9 @@ function joiRuleOf(field, opts = {}) {
         default:
             j = 'Joi.string()' + (field.len ? `.max(${field.len})` : '');
     }
+    const label = field.comment || field.camel;
+    if (label)
+        j += `.label(${JSON.stringify(label)})`;
     if (allowNull)
         j += '.allow(null)';
     if (required)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shys/crud",
-  "version": "1.0.1-beta.2",
+  "version": "1.0.1-beta.4",
   "description": "MidwayJS v4 模块化 CRUD CLI 生成器",
   "license": "MIT",
   "author": {

package/templates/controller.njk

@@ -1,5 +1,5 @@
-import { Controller, Inject } from '@midwayjs/core';
-import { CrudPiped } from '@shys/crud-piped';
+import { Inject } from '@midwayjs/core';
+import { YSController, CrudPiped } from '@shys/core';
 import { {{ Pascal }} } from '../entity/{{ Camel }}.entity';
 import { {{ ServiceName }} } from '../service/{{ Camel }}.service';
 import {
@@ -10,7 +10,7 @@ import {
 } from '../dto/{{ Camel }}';
 import { {{ VOName }}, {{ ListVOName }} } from '../vo/{{ Camel }}';
 
-@Controller({{ ('/api/' + pluralKebab) | json }}, {
+@YSController({
   tagName: {{ tagName | json }},
   description: {{ desc | json }},
 })

package/templates/entity.njk

@@ -24,7 +24,7 @@ export class {{ Pascal }} extends BaseEntity {
     description: {{ (pkInfo.comment or '主键ID') | json }},
   })
   @Expose()
-  @Rule(Joi.number().integer().required())
+  @Rule(Joi.number().integer().label({{ (pkInfo.comment or '主键ID') | json }}).required())
   {{ pkInfo.camel }}: number;
 
 {% endif -%}