@farris/jit-engine 1.3.223 → 1.3.227

package/lib/template/devkit/entity.pug

@@ -1,119 +1,119 @@
-//- -var variable = {name: 'XSDDEntity', fields: [{dataField: 'DDNM', type: 'string', dataField: 'DDNM', primary: true, validRules: [1,2]},{dataField: 'DDBH', type: 'string', defaultValue: 'DDBH'}], ngLists: [{dataField: 'WLList', dataField: 'WLList', type: 'WlEntity'},{dataField: 'WLList', dataField: 'WLList', type: 'WlEntity'}], ngObjects: [{dataField: 'WLList', dataField: 'WLList', type: 'WlEntity'},{dataField: 'WLList', dataField: 'WLList', type: 'WlEntity'}]};
-//- -var variable = {"name":"SalesOrderEntity","fields":[{"id":"fc1f2ca8-085f-4369-82f5-b5b4040a2a96","type":"String","defaultValue":"","name":"ID","primary":false,"dataField":"ID","validRules":[{"type":"required","message":"required"}]},{"id":"595c2908-8652-4dd0-bbbb-58b0a4a4562b","type":"String","defaultValue":"","name":"订单编号","primary":false,"dataField":"Code"},{"id":"ebc2fc89-1fae-4232-a585-eaee46d7efe8","type":"Date","defaultValue":"","name":"订单日期","primary":false,"dataField":"PlaceDate"},{"id":"448fb69d-a331-4f1c-bd13-11e00673fee4","type":"String","defaultValue":"","name":"销售组织","primary":false,"dataField":"SalesOrg"},{"id":"f42a2e6f-9f28-4d52-907b-ae1e5838f450","type":"String","defaultValue":"","name":"销售公司","primary":false,"dataField":"Company","refObject":{"id":"5d1d590f-4c5f-436e-a731-bae663512f89","dataField":"SalesCompany","name":"销售公司实体","fields":{}}},{"id":"a6b2224c-ed6a-48e1-9ae5-1fb91df0f2fd","type":"String","defaultValue":"","name":"销售人员","primary":false,"dataField":"Employee"},{"id":"f6ad7013-239e-4ab4-8c96-3fa4e4b4aac2","type":"String","defaultValue":"","name":"售达方","primary":false,"dataField":"SoldToParty"},{"id":"de565ef5-fe1a-4f69-81b2-a00ff6ae7d2c","type":"String","defaultValue":"","name":"联系人","primary":false,"dataField":"Contact"},{"id":"54602105-d851-4eea-ba95-93fb4989ca81","type":"String","defaultValue":"","name":"联系电话","primary":false,"dataField":"ContactNumber"},{"id":"c77b8fa2-3dbb-42f5-b528-9f815d3860cd","type":"String","defaultValue":"","name":"币种","primary":false,"dataField":"Currency"},{"id":"78bdf92e-5657-4d06-9883-1f4dd8efded5","type":"Decimal","defaultValue":"","name":"总金额","primary":false,"dataField":"TotalAmount"},{"id":"24197e28-5518-4ab6-a047-b2373d95e477","type":"Text","defaultValue":"","name":"备注","primary":false,"dataField":"Note"},{"id":"39e179ed-aa15-4fe8-b45d-bf9646a1b8bc","type":"String","defaultValue":"","name":"审核状态","primary":false,"dataField":"AuditState"}],"ngLists":[{"dataField":"OrderItem","dataField":"OrderItem","type":"OrderItemEntity"},{"dataField":"Delivery","dataField":"Delivery","type":"DeliveryEntity"}],"ngObjects":[{"dataField":"SalesCompany","dataField":"SalesCompany","type":"SalesCompanyEntity"}]};
-
-include ./common/validrules.pug
-
-| import { Entity, NgField, NgObject, EntityList, NgList, NgDynamic, DynamicEntity } from '@farris/devkit';
-= '\n'
-if variable.ngLists && variable.ngLists.length
--var entities = ',';
-  each ngList in variable.ngLists
-    if (entities.indexOf(',' + ngList.type + ',') < 0)
-      | import { #{variable.externalPrefix}#{ngList.type} } from './#{ngList.type.toLowerCase()}';
-      = '\n'
-    -entities += ngList.type +  ','
-if variable.ngObjects && variable.ngObjects.length
-  each ngObject in variable.ngObjects
-    if (entities.indexOf(',' + ngObject.type + ',') < 0)
-      | import { #{variable.externalPrefix}#{ngObject.type} } from './#{ngObject.generatedType?ngObject.generatedType.toLowerCase():ngObject.type.toLowerCase()}';
-      = '\n'
-    -entities += ngObject.type +  ','
-= '\n'
-| export class  #{variable.externalPrefix}#{variable.name} extends Entity {
-= '\n'
-each field in variable.fields
-  |   @NgField({
-  = '\n'
-  if field.property
-    |     property: '#{field.property}'
-    if field.code || field.dataField || field.primary || field.foreign || field.defaultValue || (field.validRules && field.validRules.length)
-      | ,
-      = '\n'
-  if field.code
-    |     originalDataField: '#{field.code}'
-    if field.dataField || field.primary || field.foreign || field.defaultValue || (field.validRules && field.validRules.length)
-      | ,
-      = '\n'
-  if field.dataField
-    |     dataField: '#{field.dataField}'
-    if field.primary || field.foreign || field.defaultValue || (field.validRules && field.validRules.length)
-      | ,
-      = '\n'
-  if field.primary
-    |     primary: #{field.primary}
-    if field.foreign || field.defaultValue || (field.validRules && field.validRules.length)
-      | ,
-      = '\n'
-  if field.foreign
-    |     foreign: #{field.foreign}
-    if field.defaultValue || (field.validRules && field.validRules.length)
-      | ,
-      = '\n'
-  if field.defaultValue
-    |     defaultValue: #{field.defaultValue}
-    if (field.validRules && field.validRules.length)
-      | ,
-      = '\n'
-  if field.validRules && field.validRules.length
-    //- != '    validRules: ' + JSON.stringify(field.validRules)
-    +validRules(field.validRules, 4)
-  = '\n'
-  |   })
-  = '\n'
-  if field.type 
-    |   #{field.dataField}: #{field.type};
-  else
-    |   #{field.dataField}: any;
-  = '\n'
-  = '\n'
-if variable.ngLists && variable.ngLists.length
-  each ngList in variable.ngLists
-    |   @NgList({
-    |     dataField: '#{ngList.dataField}',
-    |     originalDataField: '#{ngList.code}',
-    = '\n'
-    if ngList.tableName
-      |     tableName: '#{ngList.tableName}',
-      = '\n'
-    if ngList.type
-      |     type: #{variable.externalPrefix}#{ngList.type}
-      = '\n'
-    |   })
-    |   #{ngList.dataField}: EntityList<#{variable.externalPrefix}#{ngList.type}>;
-    = '\n'
-    = '\n'
-if variable.ngObjects && variable.ngObjects.length
-  each ngObject in variable.ngObjects
-    |   @NgObject({
-    |     dataField: '#{ngObject.dataField}',
-    |     originalDataField: '#{ngObject.code}',
-    = '\n'
-    if ngObject.tableName
-      |     tableName: '#{ngObject.tableName}',
-      = '\n'
-    if ngObject.hierarchyType
-      |     hierarchyType:'#{ngObject.hierarchyType}',
-      = '\n'
-    if ngObject.type
-      |     type: #{variable.externalPrefix}#{ngObject.type}
-      = '\n'
-    |   })
-    |   #{ngObject.dataField}: #{variable.externalPrefix}#{ngObject.type};
-    = '\n'
-    = '\n'
-if variable.ngDynamicObjects && variable.ngDynamicObjects.length
-  each ngDynamicObject in variable.ngDynamicObjects
-    |   @NgDynamic({
-    |     dataField: '#{ngDynamicObject.dataField}',
-    |     originalDataField: '#{ngDynamicObject.code}',
-    = '\n'
-    if ngDynamicObject.type
-      |     type: #{ngDynamicObject.type}
-      = '\n'
-    |   })
-    |   #{ngDynamicObject.dataField}: #{ngDynamicObject.type};
-    = '\n'
-    = '\n'
-| }
-= '\n'
-= '\n'
+//- -var variable = {name: 'XSDDEntity', fields: [{dataField: 'DDNM', type: 'string', dataField: 'DDNM', primary: true, validRules: [1,2]},{dataField: 'DDBH', type: 'string', defaultValue: 'DDBH'}], ngLists: [{dataField: 'WLList', dataField: 'WLList', type: 'WlEntity'},{dataField: 'WLList', dataField: 'WLList', type: 'WlEntity'}], ngObjects: [{dataField: 'WLList', dataField: 'WLList', type: 'WlEntity'},{dataField: 'WLList', dataField: 'WLList', type: 'WlEntity'}]};
+//- -var variable = {"name":"SalesOrderEntity","fields":[{"id":"fc1f2ca8-085f-4369-82f5-b5b4040a2a96","type":"String","defaultValue":"","name":"ID","primary":false,"dataField":"ID","validRules":[{"type":"required","message":"required"}]},{"id":"595c2908-8652-4dd0-bbbb-58b0a4a4562b","type":"String","defaultValue":"","name":"订单编号","primary":false,"dataField":"Code"},{"id":"ebc2fc89-1fae-4232-a585-eaee46d7efe8","type":"Date","defaultValue":"","name":"订单日期","primary":false,"dataField":"PlaceDate"},{"id":"448fb69d-a331-4f1c-bd13-11e00673fee4","type":"String","defaultValue":"","name":"销售组织","primary":false,"dataField":"SalesOrg"},{"id":"f42a2e6f-9f28-4d52-907b-ae1e5838f450","type":"String","defaultValue":"","name":"销售公司","primary":false,"dataField":"Company","refObject":{"id":"5d1d590f-4c5f-436e-a731-bae663512f89","dataField":"SalesCompany","name":"销售公司实体","fields":{}}},{"id":"a6b2224c-ed6a-48e1-9ae5-1fb91df0f2fd","type":"String","defaultValue":"","name":"销售人员","primary":false,"dataField":"Employee"},{"id":"f6ad7013-239e-4ab4-8c96-3fa4e4b4aac2","type":"String","defaultValue":"","name":"售达方","primary":false,"dataField":"SoldToParty"},{"id":"de565ef5-fe1a-4f69-81b2-a00ff6ae7d2c","type":"String","defaultValue":"","name":"联系人","primary":false,"dataField":"Contact"},{"id":"54602105-d851-4eea-ba95-93fb4989ca81","type":"String","defaultValue":"","name":"联系电话","primary":false,"dataField":"ContactNumber"},{"id":"c77b8fa2-3dbb-42f5-b528-9f815d3860cd","type":"String","defaultValue":"","name":"币种","primary":false,"dataField":"Currency"},{"id":"78bdf92e-5657-4d06-9883-1f4dd8efded5","type":"Decimal","defaultValue":"","name":"总金额","primary":false,"dataField":"TotalAmount"},{"id":"24197e28-5518-4ab6-a047-b2373d95e477","type":"Text","defaultValue":"","name":"备注","primary":false,"dataField":"Note"},{"id":"39e179ed-aa15-4fe8-b45d-bf9646a1b8bc","type":"String","defaultValue":"","name":"审核状态","primary":false,"dataField":"AuditState"}],"ngLists":[{"dataField":"OrderItem","dataField":"OrderItem","type":"OrderItemEntity"},{"dataField":"Delivery","dataField":"Delivery","type":"DeliveryEntity"}],"ngObjects":[{"dataField":"SalesCompany","dataField":"SalesCompany","type":"SalesCompanyEntity"}]};
+
+include ./common/validrules.pug
+
+| import { Entity, NgField, NgObject, EntityList, NgList, NgDynamic, DynamicEntity } from '@farris/devkit';
+= '\n'
+if variable.ngLists && variable.ngLists.length
+-var entities = ',';
+  each ngList in variable.ngLists
+    if (entities.indexOf(',' + ngList.type + ',') < 0)
+      | import { #{variable.externalPrefix}#{ngList.type} } from './#{ngList.type.toLowerCase()}';
+      = '\n'
+    -entities += ngList.type +  ','
+if variable.ngObjects && variable.ngObjects.length
+  each ngObject in variable.ngObjects
+    if (entities.indexOf(',' + ngObject.type + ',') < 0)
+      | import { #{variable.externalPrefix}#{ngObject.type} } from './#{ngObject.generatedType?ngObject.generatedType.toLowerCase():ngObject.type.toLowerCase()}';
+      = '\n'
+    -entities += ngObject.type +  ','
+= '\n'
+| export class  #{variable.externalPrefix}#{variable.name} extends Entity {
+= '\n'
+each field in variable.fields
+  |   @NgField({
+  = '\n'
+  if field.property
+    |     property: '#{field.property}'
+    if field.code || field.dataField || field.primary || field.foreign || field.defaultValue || (field.validRules && field.validRules.length)
+      | ,
+      = '\n'
+  if field.code
+    |     originalDataField: '#{field.code}'
+    if field.dataField || field.primary || field.foreign || field.defaultValue || (field.validRules && field.validRules.length)
+      | ,
+      = '\n'
+  if field.dataField
+    |     dataField: '#{field.dataField}'
+    if field.primary || field.foreign || field.defaultValue || (field.validRules && field.validRules.length)
+      | ,
+      = '\n'
+  if field.primary
+    |     primary: #{field.primary}
+    if field.foreign || field.defaultValue || (field.validRules && field.validRules.length)
+      | ,
+      = '\n'
+  if field.foreign
+    |     foreign: #{field.foreign}
+    if field.defaultValue || (field.validRules && field.validRules.length)
+      | ,
+      = '\n'
+  if field.defaultValue
+    |     defaultValue: #{field.defaultValue}
+    if (field.validRules && field.validRules.length)
+      | ,
+      = '\n'
+  if field.validRules && field.validRules.length
+    //- != '    validRules: ' + JSON.stringify(field.validRules)
+    +validRules(field.validRules, 4)
+  = '\n'
+  |   })
+  = '\n'
+  if field.type 
+    |   #{field.dataField}: #{field.type};
+  else
+    |   #{field.dataField}: any;
+  = '\n'
+  = '\n'
+if variable.ngLists && variable.ngLists.length
+  each ngList in variable.ngLists
+    |   @NgList({
+    |     dataField: '#{ngList.dataField}',
+    |     originalDataField: '#{ngList.code}',
+    = '\n'
+    if ngList.tableName
+      |     tableName: '#{ngList.tableName}',
+      = '\n'
+    if ngList.type
+      |     type: #{variable.externalPrefix}#{ngList.type}
+      = '\n'
+    |   })
+    |   #{ngList.dataField}: EntityList<#{variable.externalPrefix}#{ngList.type}>;
+    = '\n'
+    = '\n'
+if variable.ngObjects && variable.ngObjects.length
+  each ngObject in variable.ngObjects
+    |   @NgObject({
+    |     dataField: '#{ngObject.dataField}',
+    |     originalDataField: '#{ngObject.code}',
+    = '\n'
+    if ngObject.tableName
+      |     tableName: '#{ngObject.tableName}',
+      = '\n'
+    if ngObject.hierarchyType
+      |     hierarchyType:'#{ngObject.hierarchyType}',
+      = '\n'
+    if ngObject.type
+      |     type: #{variable.externalPrefix}#{ngObject.type}
+      = '\n'
+    |   })
+    |   #{ngObject.dataField}: #{variable.externalPrefix}#{ngObject.type};
+    = '\n'
+    = '\n'
+if variable.ngDynamicObjects && variable.ngDynamicObjects.length
+  each ngDynamicObject in variable.ngDynamicObjects
+    |   @NgDynamic({
+    |     dataField: '#{ngDynamicObject.dataField}',
+    |     originalDataField: '#{ngDynamicObject.code}',
+    = '\n'
+    if ngDynamicObject.type
+      |     type: #{ngDynamicObject.type}
+      = '\n'
+    |   })
+    |   #{ngDynamicObject.dataField}: #{ngDynamicObject.type};
+    = '\n'
+    = '\n'
+| }
+= '\n'
+= '\n'

package/lib/template/devkit/event.pug

@@ -1,29 +1,29 @@
-| import { Injectable } from "@angular/core";
-| import { NgDeclaration, Declaration } from "@farris/devkit";
-
-| @Injectable()
-| export class #{variable.externalPrefix}EventDeclaration extends Declaration {
-= '\n'
-if (variable.events && variable.events.length)
-  each eventItem in variable.events
-    = '\n'
-    |    /* #{eventItem.name} */
-    = '\n'
-    |    @NgDeclaration({
-    |      name: '#{eventItem.code}',
-    |      token: '#{eventItem.token}',
-    |      params: {
-    if (eventItem.params)
-      each param, index in eventItem.params
-        = '\n'
-        |       "#{param.code}":"#{param.value}"
-        if (index < eventItem.params.length-1)
-          | ,
-          = '\n'
-      = '\n'
-    |       }
-    |    })
-    |    public #{eventItem.code}() { }
-  = '\n'
-= '\n'
-| }
+| import { Injectable } from "@angular/core";
+| import { NgDeclaration, Declaration } from "@farris/devkit";
+
+| @Injectable()
+| export class #{variable.externalPrefix}EventDeclaration extends Declaration {
+= '\n'
+if (variable.events && variable.events.length)
+  each eventItem in variable.events
+    = '\n'
+    |    /* #{eventItem.name} */
+    = '\n'
+    |    @NgDeclaration({
+    |      name: '#{eventItem.code}',
+    |      token: '#{eventItem.token}',
+    |      params: {
+    if (eventItem.params)
+      each param, index in eventItem.params
+        = '\n'
+        |       "#{param.code}":"#{param.value}"
+        if (index < eventItem.params.length-1)
+          | ,
+          = '\n'
+      = '\n'
+    |       }
+    |    })
+    |    public #{eventItem.code}() { }
+  = '\n'
+= '\n'
+| }

package/lib/template/devkit/form.pug

@@ -1,56 +1,56 @@
-//- -var variable = {name: 'SaleOrderDetailForm', binding: 'SaleOrderDetailBindingData', controls: [{name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: ''}, {name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: 'new DateConverter()'}, {name: 'DDBH', type: 'ChildForm', ref: 'DeliveryForm'}, {name: 'DDBH', type: 'ChildForm', ref: 'DeliveryForm'}], childForms: [{name: 'DeliveryForm', controls: [{name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: ''}, {name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: 'new DateConverter()'}]}, {name: 'DeliveryForm', controls: [{name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: ''}, {name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: 'new DateConverter()'}]}]};
-//- -var variable = {"name":"BasicFormViewmodelForm","controls":[{"name":"Code","type":"FormContrl","binding":"Code","validRules":[{"type":"required","message":"required"}]},{"name":"PlaceDate","type":"FormContrl","binding":"PlaceDate"},{"name":"SalesOrg","type":"FormContrl","binding":"SalesOrg"},{"name":"Company","type":"FormContrl","binding":"Company"},{"name":"Company_Code","type":"FormContrl","binding":"Company.Company_Code"},{"name":"Company_Name","type":"FormContrl","binding":"Company.Company_Name"},{"name":"Employee","type":"FormContrl","binding":"Employee"},{"name":"SoldToParty","type":"FormContrl","binding":"SoldToParty"},{"name":"Contract","type":"FormContrl","binding":"Contract"},{"name":"ContractNumber","type":"FormContrl","binding":"ContractNumber"},{"name":"Currency","type":"FormContrl","binding":"Currency"},{"name":"TotalAmount","type":"FormContrl","binding":"TotalAmount"},{"name":"Note","type":"FormContrl","binding":"Note"},{"name":"AuditState","type":"FormContrl","binding":"AuditState"}]}
-
-include ./common/validrules.pug
-
-| import { Injectable } from '@angular/core';
-| import { FormControl } from '@angular/forms';
-| import { Form, NgFormControl, NgChildForm, NgChildFormArray } from '@farris/devkit';
-| import { DateConverter } from '@farris/kendo-binding';
-= '\n'
-= '\n'
-| @Injectable()
-| export class #{variable.externalPrefix}#{variable.name} extends Form {
-= '\n'
-each ctl in variable.controls
-  if ctl.type == 'FormContrl'
-    |   @NgFormControl({
-    = '\n'
-    if ctl.binding
-      |     binding: '#{ctl.binding}'
-    if ctl.updateOn
-      |  ,
-      |     updateOn:'#{ctl.updateOn}'  
-    if ctl.valueChanging
-      |  ,
-      = '\n'
-      |     valueChanging:'#{ctl.valueChanging}'  
-    if ctl.valueChanged
-      | ,
-      = '\n'
-      |     valueChanged:'#{ctl.valueChanged}'
-    if ctl.converter
-      | ,
-      = '\n'
-    if ctl.converter
-      |     valueConverter: !{ctl.converter}
-    if ctl.validRules && ctl.validRules.length
-      | ,
-      = '\n'
-      +validRules(ctl.validRules, 4)
-    = '\n'
-    |   })
-    |   #{ctl.name}: FormControl;
-    = '\n'
-    = '\n'
-  else if ctl.type == 'ChildForm'
-    |   @NgChildForm({
-    |     name: '#{ctl.name}',
-    |     formType: #{ctl.ref}
-    |   })
-    |   #{ctl.name}: #{ctl.ref};
-    = '\n'
-    = '\n'
-| }
-= '\n'
-= '\n'
+//- -var variable = {name: 'SaleOrderDetailForm', binding: 'SaleOrderDetailBindingData', controls: [{name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: ''}, {name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: 'new DateConverter()'}, {name: 'DDBH', type: 'ChildForm', ref: 'DeliveryForm'}, {name: 'DDBH', type: 'ChildForm', ref: 'DeliveryForm'}], childForms: [{name: 'DeliveryForm', controls: [{name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: ''}, {name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: 'new DateConverter()'}]}, {name: 'DeliveryForm', controls: [{name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: ''}, {name: 'DDBH', type: 'FormControl', binding: 'DDBH', converter: 'new DateConverter()'}]}]};
+//- -var variable = {"name":"BasicFormViewmodelForm","controls":[{"name":"Code","type":"FormContrl","binding":"Code","validRules":[{"type":"required","message":"required"}]},{"name":"PlaceDate","type":"FormContrl","binding":"PlaceDate"},{"name":"SalesOrg","type":"FormContrl","binding":"SalesOrg"},{"name":"Company","type":"FormContrl","binding":"Company"},{"name":"Company_Code","type":"FormContrl","binding":"Company.Company_Code"},{"name":"Company_Name","type":"FormContrl","binding":"Company.Company_Name"},{"name":"Employee","type":"FormContrl","binding":"Employee"},{"name":"SoldToParty","type":"FormContrl","binding":"SoldToParty"},{"name":"Contract","type":"FormContrl","binding":"Contract"},{"name":"ContractNumber","type":"FormContrl","binding":"ContractNumber"},{"name":"Currency","type":"FormContrl","binding":"Currency"},{"name":"TotalAmount","type":"FormContrl","binding":"TotalAmount"},{"name":"Note","type":"FormContrl","binding":"Note"},{"name":"AuditState","type":"FormContrl","binding":"AuditState"}]}
+
+include ./common/validrules.pug
+
+| import { Injectable } from '@angular/core';
+| import { FormControl } from '@angular/forms';
+| import { Form, NgFormControl, NgChildForm, NgChildFormArray } from '@farris/devkit';
+| import { DateConverter } from '@farris/kendo-binding';
+= '\n'
+= '\n'
+| @Injectable()
+| export class #{variable.externalPrefix}#{variable.name} extends Form {
+= '\n'
+each ctl in variable.controls
+  if ctl.type == 'FormContrl'
+    |   @NgFormControl({
+    = '\n'
+    if ctl.binding
+      |     binding: '#{ctl.binding}'
+    if ctl.updateOn
+      |  ,
+      |     updateOn:'#{ctl.updateOn}'  
+    if ctl.valueChanging
+      |  ,
+      = '\n'
+      |     valueChanging:'#{ctl.valueChanging}'  
+    if ctl.valueChanged
+      | ,
+      = '\n'
+      |     valueChanged:'#{ctl.valueChanged}'
+    if ctl.converter
+      | ,
+      = '\n'
+    if ctl.converter
+      |     valueConverter: !{ctl.converter}
+    if ctl.validRules && ctl.validRules.length
+      | ,
+      = '\n'
+      +validRules(ctl.validRules, 4)
+    = '\n'
+    |   })
+    |   #{ctl.name}: FormControl;
+    = '\n'
+    = '\n'
+  else if ctl.type == 'ChildForm'
+    |   @NgChildForm({
+    |     name: '#{ctl.name}',
+    |     formType: #{ctl.ref}
+    |   })
+    |   #{ctl.name}: #{ctl.ref};
+    = '\n'
+    = '\n'
+| }
+= '\n'
+= '\n'

package/lib/template/devkit/lang.pug

@@ -1,27 +1,27 @@
-//- -var variable={config:{'ch': {'button-aa': '测试','test': '列1','grid1-norecord': '暂无记录'},'en': {'button-aa': 'abc','test': 'column1','grid1-norecord': 'No records'}}}
-
-| import { Pipe, PipeTransform, Injectable} from '@angular/core';
-|
-| export const lang = !{JSON.stringify(variable.config)};
-|
-| @Pipe({name: 'lang'})
-| export class #{variable.externalPrefix}LangPipe implements PipeTransform {
-|   transform(key: string, langCode: string) {
-|     if (langCode && lang[langCode] && lang[langCode][key]) {
-|       return lang[langCode][key];
-|     } else {
-|       return lang['ch'][key];
-|     }
-|   }
-| }
-= '\n'
-| @Injectable()
-| export class #{variable.externalPrefix}LangService {
-|   transform(key: string, langCode: string) {
-|     if (langCode && lang[langCode] && lang[langCode][key]) {
-|       return lang[langCode][key];
-|     } else {
-|       return lang['ch'][key];
-|     }
-|   }
-| }
+//- -var variable={config:{'ch': {'button-aa': '测试','test': '列1','grid1-norecord': '暂无记录'},'en': {'button-aa': 'abc','test': 'column1','grid1-norecord': 'No records'}}}
+
+| import { Pipe, PipeTransform, Injectable} from '@angular/core';
+|
+| export const lang = !{JSON.stringify(variable.config)};
+|
+| @Pipe({name: 'lang'})
+| export class #{variable.externalPrefix}LangPipe implements PipeTransform {
+|   transform(key: string, langCode: string) {
+|     if (langCode && lang[langCode] && lang[langCode][key]) {
+|       return lang[langCode][key];
+|     } else {
+|       return lang['ch'][key];
+|     }
+|   }
+| }
+= '\n'
+| @Injectable()
+| export class #{variable.externalPrefix}LangService {
+|   transform(key: string, langCode: string) {
+|     if (langCode && lang[langCode] && lang[langCode][key]) {
+|       return lang[langCode][key];
+|     } else {
+|       return lang['ch'][key];
+|     }
+|   }
+| }