@farris/jit-engine 1.3.294 → 1.3.296

package/lib/template/ui/kendo/table/numericbox.pug

@@ -1,49 +1,59 @@
-
-div(class="farris-input-wrap")
-  -var attrs = {};
-  if (variable.binding && variable.binding.type == 'Variable')
-    -attrs['[(ngModel)]'] = variable.binding.value;
-    -attrs['name'] = variable.replacedId;
-    -attrs['[ngModelOptions]'] = "{standalone:true}";
-  else if (variable.includeInLoopContainer==false)
-    -attrs['formControlName'] = (variable.binding && variable.binding.path);
-  else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
-    -attrs['name'] = variable.replacedId;
-    -attrs['[ngModelOptions]'] = "{standalone:true}";
-
-  -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
-  if(variable.isTextArea)
-    if(variable.readonly && variable.readonly.isComposite)
-      -attrs["*ngIf"]="!"+variable.readonly.value;
-    else
-      -attrs["*ngIf"]="viewModel.stateMachine['editable']";
-  if(variable.hasDefaultFocus)
-    -attrs["farris-set-focus"]="";
-    if(variable.focusState)
-      -attrs["[focusState]"]=variable.focusState+"";
-  kendo-numerictextbox(id=variable.replacedId "input-end-edit" class="form-control k-widget k-numerictextbox" '[format]'=variable.format?"'"+variable.format+"'":undefined '[decimals]'=(variable.precision || variable.precision==0)? variable.precision+'':undefined '[disabled]'!=variable.disable?variable.disable.toString():undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined  '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[value]'=variable.value?variable.value:undefined '[step]'=variable.step?variable.step:undefined '[min]'=variable.minValue!=null?variable.minValue:undefined '[max]'=variable.maxValue!=null?variable.maxValue:undefined '[autoCorrect]'="true"  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.originalType?"'"+variable.originalType+"'":undefined )&attributes(attrs)
-    kendo-numerictextbox-messages('[decrement]'="'减少'" '[increment]'="'增加'")
-  div(class="farris-feedback")
-  if(variable.isTextArea)
-    -var areaAttrs = {};
-    if(variable.readonly && variable.readonly.isComposite)
-      -areaAttrs["*ngIf"]=variable.readonly.value;
-    else
-      -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
-    if (variable.binding && variable.binding.type == 'Variable')
-      -areaAttrs['[(ngModel)]'] = variable.binding.value;
-      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    else if (variable.includeInLoopContainer==false)
-      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-    else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
-      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    farris-text('[type]'="'number'" '[format]'=variable.format?"'"+variable.format+"'":undefined '[inputAppendControlType]'="'StaticText'" '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
-if(variable.titleTipsTemplate)
-  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-    i(class="f-icon f-icon-description-tips")
-  -var tipsAttrs= {};
-  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-  ng-template()&attributes(tipsAttrs)
-    | !{variable.titleTipsTemplate}
+
+div(class="farris-input-wrap")
+  -var attrs = {};
+  if (variable.binding && variable.binding.type == 'Variable')
+    -attrs['[(ngModel)]'] = variable.binding.value;
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  else if (variable.includeInLoopContainer==false)
+    -attrs['formControlName'] = (variable.binding && variable.binding.path);
+  else
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+
+  -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
+  if(variable.isTextArea)
+    if(variable.readonly && variable.readonly.isComposite)
+      -attrs["*ngIf"]="!"+variable.readonly.value;
+    else
+      -attrs["*ngIf"]="viewModel.stateMachine['editable']";
+  if(variable.hasDefaultFocus)
+    -attrs["farris-set-focus"]="";
+    if(variable.focusState)
+      -attrs["[focusState]"]=variable.focusState+"";
+  kendo-numerictextbox(id=variable.replacedId "input-end-edit" class="form-control k-widget k-numerictextbox" '[format]'=variable.format?"'"+variable.format+"'":undefined
+    '[decimals]'=(variable.precision || variable.precision==0)? variable.precision+'':undefined '[disabled]'!=variable.disable?variable.disable.toString():undefined
+    '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined
+    '[readonly]'!=variable.readonly?variable.readonlyPipeSuffix?""+variable.readonly.value+variable.readonlyPipeSuffix:""+variable.readonly.value:undefined
+    '[value]'=variable.value?variable.value:undefined '[step]'=variable.step?variable.step:undefined
+    '[min]'=variable.minValue!=null?variable.minValue:undefined '[max]'=variable.maxValue!=null?variable.maxValue:undefined '[autoCorrect]'="true"
+    '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined
+    'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined
+    '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined
+    '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined
+    '[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined)&attributes(attrs)
+    kendo-numerictextbox-messages('[decrement]'="'减少'" '[increment]'="'增加'")
+  div(class="farris-feedback")
+  if(variable.isTextArea)
+    -var areaAttrs = {};
+    if(variable.readonly && variable.readonly.isComposite)
+      -areaAttrs["*ngIf"]=variable.readonly.value;
+    else
+      -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
+    if (variable.binding && variable.binding.type == 'Variable')
+      -areaAttrs['[(ngModel)]'] = variable.binding.value;
+      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+    else if (variable.includeInLoopContainer==false)
+      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+    else
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
+      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+    farris-text('[type]'="'number'" '[format]'=variable.format?"'"+variable.format+"'":undefined '[inputAppendControlType]'=variable.enableAppend?"'StaticText'":undefined '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
+if(variable.titleTipsTemplate)
+  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+    i(class="f-icon f-icon-description-tips")
+  -var tipsAttrs= {};
+  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+  ng-template()&attributes(tipsAttrs)
+    | !{variable.titleTipsTemplate}

package/lib/template/ui/kendo/table/organization-selector.pug

@@ -1,75 +1,75 @@
-div(class="farris-input-wrap")
-  -var attrs = {};
-  if (variable.binding && variable.binding.type == 'Variable')
-    -attrs['[(ngModel)]'] = variable.binding.value;
-    -attrs['name'] = variable.replacedId;
-    -attrs['[ngModelOptions]'] = "{standalone:true}";
-  else
-    -attrs['formControlName'] = (variable.binding && variable.binding.path);
-  if (variable.valueChange)
-    -attrs['(valueChange)'] = variable.valueChange ;
-
-  -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
-
-  if(variable.isTextArea)
-    if(variable.readonly && variable.readonly.isComposite)
-      -attrs["*ngIf"]="!"+variable.readonly.value;
-    else
-      -attrs["*ngIf"]="viewModel.stateMachine['editable']";
-  if(variable.hasDefaultFocus)
-    -attrs["farris-set-focus"]="";
-    if(variable.focusState)
-      -attrs["[focusState]"]=variable.focusState+"";
-  farris-organization-selector(          
-    organization-selector-data-mapping
-    input-end-edit
-    '[searchPlaceholder]'=variable.searchPlaceholder?"'"+variable.searchPlaceholder+"'":undefined
-    '[disabled]'!=variable.disable?variable.disable.toString():undefined  
-    '[primaryField]'=variable.primaryField?"'"+variable.primaryField+"'":undefined
-    '[displayField]'=variable.displayField?"'"+variable.displayField+"'":undefined
-    '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined
-    '[viewType]'!=variable.viewType?"'"+variable.viewType+"'":undefined
-    '[busNum]'!=variable.busNum?"'"+variable.busNum+"'":undefined
-    '[absOrgType]'=variable.absOrgType?"'"+variable.absOrgType+"'":undefined
-    '[layer]'= (variable.expandLevel || variable.expandLevel==0)?""+variable.expandLevel:undefined
-    '[multiSelect]'!=variable.multiSelect?""+variable.multiSelect.value:undefined
-    '[mapFields]'=variable.mapFields?variable.mapFields:undefined
-    '(tagRemoved)'!=variable.tagRemoved?variable.tagRemoved+"":undefined
-    '(selectionsChange)'!=variable.selectionsChange?variable.selectionsChange+"":undefined
-    '[showTabIds]'=variable.showTabIds?"'"+variable.showTabIds+"'":undefined
-    '[activeTabId]'=variable.activeTabId?"'"+variable.activeTabId+"'":undefined
-    '[enableHierarchicalLoading]'=variable.enableHierarchicalLoading?""+variable.enableHierarchicalLoading.value:undefined
-    '[showCheckAll]'=variable.showAllCheckBox?""+variable.showAllCheckBox.value:undefined
-    '[cascadeCheck]'=variable.cascadeCheck?""+variable.cascadeCheck.value:undefined
-    '[cascadeDown]'=variable.cascadeDown?""+variable.cascadeDown.value:undefined
-    '[cascadeUp]'=variable.cascadeUp?""+variable.cascadeUp.value:undefined
-    "[formatFn]"=variable.formatterName?""+variable.formatterName:undefined
-    '(inputClear)'!=variable.inputClear?variable.inputClear+"":undefined
-    'tab-index'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined 
-    '[requiredOn]'=(variable.isCustomRequire && variable.require  && !variable.require.isExpression)?""+variable.require.value:undefined 
-    'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined 
-
-  )&attributes(attrs)
-  if (variable.needValid && variable.binding && variable.binding.path)
-    -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-    validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
-  div(class="farris-feedback")
-  if(variable.isTextArea)
-    -var areaAttrs = {};
-    if(variable.readonly && variable.readonly.isComposite)
-      -areaAttrs["*ngIf"]=variable.readonly.value;
-    else
-      -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
-    if (variable.binding && variable.binding.type == 'Variable')
-      -areaAttrs['[(ngModel)]'] = variable.binding.value;
-      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    else
-      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-    farris-text('[type]'="'string'"  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
-if(variable.titleTipsTemplate)
-  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-    i(class="f-icon f-icon-description-tips")
-  -var tipsAttrs= {};
-  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-  ng-template()&attributes(tipsAttrs)
-    | !{variable.titleTipsTemplate}
+div(class="farris-input-wrap")
+  -var attrs = {};
+  if (variable.binding && variable.binding.type == 'Variable')
+    -attrs['[(ngModel)]'] = variable.binding.value;
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  else
+    -attrs['formControlName'] = (variable.binding && variable.binding.path);
+  if (variable.valueChange)
+    -attrs['(valueChange)'] = variable.valueChange ;
+
+  -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
+
+  if(variable.isTextArea)
+    if(variable.readonly && variable.readonly.isComposite)
+      -attrs["*ngIf"]="!"+variable.readonly.value;
+    else
+      -attrs["*ngIf"]="viewModel.stateMachine['editable']";
+  if(variable.hasDefaultFocus)
+    -attrs["farris-set-focus"]="";
+    if(variable.focusState)
+      -attrs["[focusState]"]=variable.focusState+"";
+  farris-organization-selector(          
+    organization-selector-data-mapping
+    input-end-edit
+    '[searchPlaceholder]'=variable.searchPlaceholder?"'"+variable.searchPlaceholder+"'":undefined
+    '[disabled]'!=variable.disable?variable.disable.toString():undefined  
+    '[primaryField]'=variable.primaryField?"'"+variable.primaryField+"'":undefined
+    '[displayField]'=variable.displayField?"'"+variable.displayField+"'":undefined
+    '[readonly]'!=variable.readonly?variable.readonlyPipeSuffix?variable.readonly.value+variable.readonlyPipeSuffix+"":variable.readonly.value+"":undefined
+    '[viewType]'!=variable.viewType?"'"+variable.viewType+"'":undefined
+    '[busNum]'!=variable.busNum?"'"+variable.busNum+"'":undefined
+    '[absOrgType]'=variable.absOrgType?"'"+variable.absOrgType+"'":undefined
+    '[layer]'= (variable.expandLevel || variable.expandLevel==0)?""+variable.expandLevel:undefined
+    '[multiSelect]'!=variable.multiSelect?""+variable.multiSelect.value:undefined
+    '[mapFields]'=variable.mapFields?variable.mapFields:undefined
+    '(tagRemoved)'!=variable.tagRemoved?variable.tagRemoved+"":undefined
+    '(selectionsChange)'!=variable.selectionsChange?variable.selectionsChange+"":undefined
+    '[showTabIds]'=variable.showTabIds?"'"+variable.showTabIds+"'":undefined
+    '[activeTabId]'=variable.activeTabId?"'"+variable.activeTabId+"'":undefined
+    '[enableHierarchicalLoading]'=variable.enableHierarchicalLoading?""+variable.enableHierarchicalLoading.value:undefined
+    '[showCheckAll]'=variable.showAllCheckBox?""+variable.showAllCheckBox.value:undefined
+    '[cascadeCheck]'=variable.cascadeCheck?""+variable.cascadeCheck.value:undefined
+    '[cascadeDown]'=variable.cascadeDown?""+variable.cascadeDown.value:undefined
+    '[cascadeUp]'=variable.cascadeUp?""+variable.cascadeUp.value:undefined
+    "[formatFn]"=variable.formatterName?""+variable.formatterName:undefined
+    '(inputClear)'!=variable.inputClear?variable.inputClear+"":undefined
+    'tab-index'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined 
+    '[requiredOn]'=(variable.isCustomRequire && variable.require  && !variable.require.isExpression)?""+variable.require.value:undefined 
+    'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined 
+
+  )&attributes(attrs)
+  if (variable.needValid && variable.binding && variable.binding.path)
+    -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
+    validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
+  div(class="farris-feedback")
+  if(variable.isTextArea)
+    -var areaAttrs = {};
+    if(variable.readonly && variable.readonly.isComposite)
+      -areaAttrs["*ngIf"]=variable.readonly.value;
+    else
+      -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
+    if (variable.binding && variable.binding.type == 'Variable')
+      -areaAttrs['[(ngModel)]'] = variable.binding.value;
+      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+    else
+      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+    farris-text('[type]'="'string'"  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
+if(variable.titleTipsTemplate)
+  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+    i(class="f-icon f-icon-description-tips")
+  -var tipsAttrs= {};
+  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+  ng-template()&attributes(tipsAttrs)
+    | !{variable.titleTipsTemplate}

package/lib/template/ui/kendo/table/radiobox.pug

@@ -1,27 +1,27 @@
-
-div(class="farris-input-wrap")
-  div(class="custom-control custom-radio")
-  -var attrs = {};
-  if (variable.binding && variable.binding.type == 'Variable')
-    -attrs['[(ngModel)]'] = variable.binding.value;
-    -attrs['name'] = variable.replacedId;
-    -attrs['[ngModelOptions]'] = "{standalone:true}";
-  else if (variable.includeInLoopContainer==false)
-    -attrs['formControlName'] = (variable.binding && variable.binding.path);
-  else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
-    -attrs['name'] = variable.replacedId;
-    -attrs['[ngModelOptions]'] = "{standalone:true}";
-  if(variable.hasDefaultFocus)
-    -attrs["farris-set-focus"]="";
-    if(variable.focusState)
-      -attrs["[focusState]"]=variable.focusState+"";
-  input(class="custom-control-input" "input-end-edit" type="radio" id=variable.replacedId '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined   '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.originalType?"'"+variable.originalType+"'":undefined )&attributes(attrs)
-  label(class="custom-control-label" for=variable.replacedId)
-if(variable.titleTipsTemplate)
-  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-    i(class="f-icon f-icon-description-tips")
-  -var tipsAttrs= {};
-  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-  ng-template()&attributes(tipsAttrs)
-    | !{variable.titleTipsTemplate}
+
+div(class="farris-input-wrap")
+  div(class="custom-control custom-radio")
+  -var attrs = {};
+  if (variable.binding && variable.binding.type == 'Variable')
+    -attrs['[(ngModel)]'] = variable.binding.value;
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  else if (variable.includeInLoopContainer==false)
+    -attrs['formControlName'] = (variable.binding && variable.binding.path);
+  else
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  if(variable.hasDefaultFocus)
+    -attrs["farris-set-focus"]="";
+    if(variable.focusState)
+      -attrs["[focusState]"]=variable.focusState+"";
+  input(class="custom-control-input" "input-end-edit" type="radio" id=variable.replacedId '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonlyPipeSuffix?variable.readonly.value+variable.readonlyPipeSuffix+"":variable.readonly.value+"":undefined tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined   '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined)&attributes(attrs)
+  label(class="custom-control-label" for=variable.replacedId)
+if(variable.titleTipsTemplate)
+  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+    i(class="f-icon f-icon-description-tips")
+  -var tipsAttrs= {};
+  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+  ng-template()&attributes(tipsAttrs)
+    | !{variable.titleTipsTemplate}

package/lib/template/ui/kendo/table/radioboxgroup.pug

@@ -1,47 +1,47 @@
-
--var attrs = {};
-if (variable.binding && variable.binding.type == 'Variable')
-  -attrs['[(ngModel)]'] = variable.binding.value;
-  -attrs['name'] = variable.replacedId;
-  -attrs['[ngModelOptions]'] = "{standalone:true}";
-else if (variable.includeInLoopContainer==false)
-  -attrs['formControlName'] = (variable.binding && variable.binding.path);
-else
-  -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
-  -attrs['name'] = variable.replacedId;
-  -attrs['[ngModelOptions]'] = "{standalone:true}";
-if(variable.isTextArea)
-  if(variable.readonly && variable.readonly.isComposite)
-    -attrs["*ngIf"]="!"+variable.readonly.value;
-  else
-    -attrs["*ngIf"]="viewModel.stateMachine['editable']";
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-div('class'='farris-input-wrap')
-  farris-radiogroup(id=variable.replacedId?""+variable.replacedId:undefined "input-end-edit" '[disabled]'!=variable.readonly?""+variable.readonly.value:undefined '[horizontal]'= ""+variable.isHorizontal+"" '[data]'=variable.enumDataLang?""+variable.enumDataLang:undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined   '(setRadioData)'=variable.setRadioData?""+variable.setRadioData:undefined     '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined   '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.originalType?"'"+variable.originalType+"'":undefined )&attributes(attrs)
-  div(class="farris-feedback")
-  if(variable.isTextArea)
-    -var areaAttrs = {};
-    if(variable.readonly && variable.readonly.isComposite)
-      -areaAttrs["*ngIf"]=variable.readonly.value;
-    else
-      -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
-    if (variable.binding && variable.binding.type == 'Variable')
-      -areaAttrs['[(ngModel)]'] = variable.binding.value;
-      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    else if (variable.includeInLoopContainer==false)
-      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-    else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
-      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-    farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang?""+variable.enumDataLang:undefined '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined  '[inputAppendControlType]'="'StaticText'" '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
-if(variable.titleTipsTemplate)
-  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-    i(class="f-icon f-icon-description-tips")
-  -var tipsAttrs= {};
-  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-  ng-template()&attributes(tipsAttrs)
-    | !{variable.titleTipsTemplate}
-
+
+-var attrs = {};
+if (variable.binding && variable.binding.type == 'Variable')
+  -attrs['[(ngModel)]'] = variable.binding.value;
+  -attrs['name'] = variable.replacedId;
+  -attrs['[ngModelOptions]'] = "{standalone:true}";
+else if (variable.includeInLoopContainer==false)
+  -attrs['formControlName'] = (variable.binding && variable.binding.path);
+else
+  -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
+  -attrs['name'] = variable.replacedId;
+  -attrs['[ngModelOptions]'] = "{standalone:true}";
+if(variable.isTextArea)
+  if(variable.readonly && variable.readonly.isComposite)
+    -attrs["*ngIf"]="!"+variable.readonly.value;
+  else
+    -attrs["*ngIf"]="viewModel.stateMachine['editable']";
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
+div('class'='farris-input-wrap')
+  farris-radiogroup(id=variable.replacedId?""+variable.replacedId:undefined "input-end-edit" '[disabled]'!=variable.readonly?variable.readonlyPipeSuffix?""+variable.readonly.value+variable.readonlyPipeSuffix:""+variable.readonly.value:undefined '[horizontal]'= ""+variable.isHorizontal+"" '[data]'=variable.enumDataLang?""+variable.enumDataLang:undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined   '(setRadioData)'=variable.setRadioData?""+variable.setRadioData:undefined     '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined   '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined)&attributes(attrs)
+  div(class="farris-feedback")
+  if(variable.isTextArea)
+    -var areaAttrs = {};
+    if(variable.readonly && variable.readonly.isComposite)
+      -areaAttrs["*ngIf"]=variable.readonly.value;
+    else
+      -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
+    if (variable.binding && variable.binding.type == 'Variable')
+      -areaAttrs['[(ngModel)]'] = variable.binding.value;
+      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+    else if (variable.includeInLoopContainer==false)
+      -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+    else
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
+      -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+    farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang?""+variable.enumDataLang:undefined '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined  '[inputAppendControlType]'=variable.enableAppend?"'StaticText'":undefined '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
+if(variable.titleTipsTemplate)
+  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+    i(class="f-icon f-icon-description-tips")
+  -var tipsAttrs= {};
+  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+  ng-template()&attributes(tipsAttrs)
+    | !{variable.titleTipsTemplate}
+

package/lib/template/ui/kendo/table/richtextbox.pug

@@ -1,31 +1,31 @@
-
-div(class="farris-input-wrap")
-  -var attrs = {};
-  if (variable.binding && variable.binding.type == 'Variable')
-    -attrs['[(ngModel)]'] = variable.binding.value;
-    -attrs['name'] = variable.replacedId;
-    -attrs['[ngModelOptions]'] = "{standalone:true}";
-  else if (variable.includeInLoopContainer==false)
-    -attrs['formControlName'] = (variable.binding && variable.binding.path);
-  else
-    -attrs['[(ngModel)]'] =variable.rowPrefix+ variable.ngModelPath;
-    -attrs['name'] = variable.replacedId;
-    -attrs['[ngModelOptions]'] = "{standalone:true}";
-
-  -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
-
-  if(variable.hasDefaultFocus)
-    -attrs["farris-set-focus"]="";
-    if(variable.focusState)
-      -attrs["[focusState]"]=variable.focusState+"";
-  farris-html-editor(id=variable.replacedId "html-editor-end-edit" class="form-control"   '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[value]'=variable.value?variable.value:undefined  '[format]'=variable.format?"'"+variable.format+"'":undefined '[theme]'=variable.theme?"'"+variable.theme+"'":undefined  '[maxLength]'=variable.maxLength?"'"+variable.maxLength+"'":undefined '[minLength]'=variable.minLength?"'"+variable.minLength+"'":undefined  '[required]'=variable.require?""+variable.require.value:undefined  '[customToolbarPosition]'=variable.customToolbarPosition?"'"+variable.customToolbarPosition+"'":undefined  '(onEditorCreated)'=variable.onEditorCreated?variable.onEditorCreated+"(param)":undefined '(onContentChanged)'=variable.onContentChanged?variable.onContentChanged+"(param)":undefined  '(onSelectionChanged)'=variable.onSelectionChanged?variable.onSelectionChanged+"":undefined  '(onFocus)'=variable.onFocus?variable.onFocus+"(param)":undefined  '(onBlur)'=variable.onBlur?variable.onBlur+"(param)":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[styles]'=variable.customEditorStyle?""+variable.customEditorStyle:undefined   '[showBorder]'=(variable.isTextArea ||variable.isTextArea==false)?""+variable.isTextArea:undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  
-                    '[limitImageSize]'=variable.limitImageSize?""+variable.limitImageSize.value:undefined  '[maxImgSize]'=variable.maxImgSize?""+variable.maxImgSize:undefined 
-                    )&attributes(attrs)
-  div(class="farris-feedback")
-if(variable.titleTipsTemplate)
-  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-    i(class="f-icon f-icon-description-tips")
-  -var tipsAttrs= {};
-  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-  ng-template()&attributes(tipsAttrs)
+
+div(class="farris-input-wrap")
+  -var attrs = {};
+  if (variable.binding && variable.binding.type == 'Variable')
+    -attrs['[(ngModel)]'] = variable.binding.value;
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+  else if (variable.includeInLoopContainer==false)
+    -attrs['formControlName'] = (variable.binding && variable.binding.path);
+  else
+    -attrs['[(ngModel)]'] =variable.rowPrefix+ variable.ngModelPath;
+    -attrs['name'] = variable.replacedId;
+    -attrs['[ngModelOptions]'] = "{standalone:true}";
+
+  -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
+
+  if(variable.hasDefaultFocus)
+    -attrs["farris-set-focus"]="";
+    if(variable.focusState)
+      -attrs["[focusState]"]=variable.focusState+"";
+  farris-html-editor(id=variable.replacedId "html-editor-end-edit" class="form-control"   '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonlyPipeSuffix?variable.readonly.value+variable.readonlyPipeSuffix+"":variable.readonly.value+"":undefined '[value]'=variable.value?variable.value:undefined  '[format]'=variable.format?"'"+variable.format+"'":undefined '[theme]'=variable.theme?"'"+variable.theme+"'":undefined  '[maxLength]'=variable.maxLength?"'"+variable.maxLength+"'":undefined '[minLength]'=variable.minLength?"'"+variable.minLength+"'":undefined  '[required]'=variable.require?""+variable.require.value:undefined  '[customToolbarPosition]'=variable.customToolbarPosition?"'"+variable.customToolbarPosition+"'":undefined  '(onEditorCreated)'=variable.onEditorCreated?variable.onEditorCreated+"(param)":undefined '(onContentChanged)'=variable.onContentChanged?variable.onContentChanged+"(param)":undefined  '(onSelectionChanged)'=variable.onSelectionChanged?variable.onSelectionChanged+"":undefined  '(onFocus)'=variable.onFocus?variable.onFocus+"(param)":undefined  '(onBlur)'=variable.onBlur?variable.onBlur+"(param)":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[styles]'=variable.customEditorStyle?""+variable.customEditorStyle:undefined   '[showBorder]'=(variable.isTextArea ||variable.isTextArea==false)?""+variable.isTextArea:undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  
+                    '[limitImageSize]'=variable.limitImageSize?""+variable.limitImageSize.value:undefined  '[maxImgSize]'=variable.maxImgSize?""+variable.maxImgSize:undefined 
+                    )&attributes(attrs)
+  div(class="farris-feedback")
+if(variable.titleTipsTemplate)
+  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+    i(class="f-icon f-icon-description-tips")
+  -var tipsAttrs= {};
+  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+  ng-template()&attributes(tipsAttrs)
     | !{variable.titleTipsTemplate}

package/lib/template/ui/kendo/table/select.pug

@@ -1,14 +1,22 @@
-
-div(class="farris-input-wrap")
-  if (variable.mulitSelect)
-    kendo-multiselect(id=variable.replacedId "input-end-edit" class="form-control k-widget k-multiselect k-header" '[data]'=variable.dataSource?variable.dataSource:undefined '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&attributes(attrs)
-  else
-    kendo-dropdownlist(id=variable.replacedId "input-end-edit" class="form-control k-widget k-dropdown k-header" '[data]'=variable.dataSource?variable.dataSource:undefined '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&attributes(attrs)
-  div(class="farris-feedback")
-if(variable.titleTipsTemplate)
-  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-    i(class="f-icon f-icon-description-tips")
-  -var tipsAttrs= {};
-  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-  ng-template()&attributes(tipsAttrs)
+
+div(class="farris-input-wrap")
+  if (variable.mulitSelect)
+    kendo-multiselect(id=variable.replacedId "input-end-edit" class="form-control k-widget k-multiselect k-header" '[data]'=variable.dataSource?variable.dataSource:undefined
+      '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonlyPipeSuffix?""+variable.readonly.value+variable.readonlyPipeSuffix:""+variable.readonly.value:undefined
+      '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
+      '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined
+      'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&attributes(attrs)
+  else
+    kendo-dropdownlist(id=variable.replacedId "input-end-edit" class="form-control k-widget k-dropdown k-header" '[data]'=variable.dataSource?variable.dataSource:undefined
+    '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonlyPipeSuffix?""+variable.readonly.value+variable.readonlyPipeSuffix:""+variable.readonly.value:undefined
+    '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
+    '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined
+    'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&attributes(attrs)
+  div(class="farris-feedback")
+if(variable.titleTipsTemplate)
+  span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+    i(class="f-icon f-icon-description-tips")
+  -var tipsAttrs= {};
+  -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+  ng-template()&attributes(tipsAttrs)
     | !{variable.titleTipsTemplate}