@farris/jit-engine 1.3.127 → 1.3.130-dev01

package/lib/template/ui/kendo/qdpframework.pug

@@ -1,5 +1,13 @@
 //- -var variable={"appearance": {"class": "p-2", "style": "width:'20px'"}, queryId: "a", queryName: "a", qoManagerCode:"a",controlType:'',templateType:'qdpAdvancedTemplate'};
 -var attrs = {};
 -attrs['#'+variable.referenceId] = "";
-query-framework-layout(id=variable.replacedId?""+variable.replacedId:undefined  '[toolbarOption]'!=variable.toolbarOption ? variable.toolbarOption : undefined '[formPrintOption]'!=variable.formPrintOption ? variable.formPrintOption : undefined '[conditionDialog]'=(variable.templateType && variable.templateType == "qdpAdvancedTemplate") ? "conditionDialog" : undefined '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined  '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined  '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[queryName]'=variable.queryNameLang ? "" + variable.queryNameLang : undefined '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined '(contentSizeChange)'="handleSizeChange($event)"  '[isShowToolbar]'=variable.showToolbar?""+variable.showToolbar.value:undefined  '[isInit]'=variable.initFilter?""+variable.initFilter.value:undefined)&attributes(attrs)
-  | {{content}}
+if (variable.inputTemplate && variable.inputTemplate.length)
+  -var attrsReferenceId = {};
+  -attrsReferenceId['#'+variable.id.replace(/\-/g, "")]=""
+  ng-template()&attributes(attrsReferenceId)
+    | !{variable.inputTemplate}
+  query-framework-layout(id=variable.replacedId?""+variable.replacedId:undefined '[inputTemplate]'=variable.id.replace(/\-/g, "") '[toolbarOption]'!=variable.toolbarOption ? variable.toolbarOption : undefined '[formPrintOption]'!=variable.formPrintOption ? variable.formPrintOption : undefined '[conditionDialog]'=(variable.templateType && variable.templateType == "qdpAdvancedTemplate") ? "conditionDialog" : undefined '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined  '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined  '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[queryName]'=variable.queryNameLang ? "" + variable.queryNameLang : undefined '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined '(contentSizeChange)'="handleSizeChange($event)"  '[isShowToolbar]'=variable.showToolbar?""+variable.showToolbar.value:undefined  '[isInit]'=variable.initFilter?""+variable.initFilter.value:undefined)&attributes(attrs)
+    | {{content}}
+else
+  query-framework-layout(id=variable.replacedId?""+variable.replacedId:undefined '[toolbarOption]'!=variable.toolbarOption ? variable.toolbarOption : undefined '[formPrintOption]'!=variable.formPrintOption ? variable.formPrintOption : undefined '[conditionDialog]'=(variable.templateType && variable.templateType == "qdpAdvancedTemplate") ? "conditionDialog" : undefined '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined  '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined  '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[queryName]'=variable.queryNameLang ? "" + variable.queryNameLang : undefined '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined '(contentSizeChange)'="handleSizeChange($event)"  '[isShowToolbar]'=variable.showToolbar?""+variable.showToolbar.value:undefined  '[isInit]'=variable.initFilter?""+variable.initFilter.value:undefined)&attributes(attrs)
+    | {{content}}

package/lib/template/ui/kendo/section.pug

@@ -3,12 +3,12 @@ if (variable.isScrollSpyItem)
   -attrs['[fScrollSpy]'] = "'"+variable.replacedId+"'"; 
 if(variable.includeInLoopContainer)
   -attrs['[context]'] = "row"; 
-farris-section(id=variable.replacedId?""+variable.replacedId:undefined class=(variable.appearance && variable.appearance.class)  '[expandStatus]'=(variable.expanded || variable.expanded==false)?""+variable.expanded:undefined  style=(variable.appearance && variable.appearance.style) '[contentCls]'!=variable.contentCls?"'"+variable.contentCls+"'":undefined '[mainTitle]'!=variable.mainTitleLang?""+variable.mainTitleLang:undefined  '[subTitle]'!=variable.subTitleLang?""+variable.subTitleLang:undefined      '[fill]'=(variable.fill||variable.fill==false)?variable.fill+"":undefined  '[showHeader]'=(variable.showHeader||variable.showHeader==false)?variable.showHeader+'':undefined '[enableMaximize]'=(variable.enableMaximize||variable.enableMaximize==false)?variable.enableMaximize+'':undefined  '[enableAccordion]'=variable.enableAccordion?"'"+variable.enableAccordion+"'":undefined   '*ngIf'!=variable.visible ?variable.visible.value+"":undefined  '[btnStates]'=variable.toolbarStatesName?""+variable.toolbarStatesName:undefined  '[btnVisible]'=variable.toolbarVisibleName?""+variable.toolbarVisibleName:undefined  '[toolbar]'=variable.toolbarName?""+variable.toolbarName:undefined)&attributes(attrs)
+farris-section(id=variable.replacedId?""+variable.replacedId:undefined '[index]'="index" class=(variable.appearance && variable.appearance.class)  '[expandStatus]'=(variable.expanded || variable.expanded==false)?""+variable.expanded:undefined  style=(variable.appearance && variable.appearance.style) '[contentCls]'!=variable.contentCls?"'"+variable.contentCls+"'":undefined '[mainTitle]'!=variable.mainTitleLang?""+variable.mainTitleLang:undefined  '[subTitle]'!=variable.subTitleLang?""+variable.subTitleLang:undefined      '[fill]'=(variable.fill||variable.fill==false)?variable.fill+"":undefined  '[showHeader]'=(variable.showHeader||variable.showHeader==false)?variable.showHeader+'':undefined '[enableMaximize]'=(variable.enableMaximize||variable.enableMaximize==false)?variable.enableMaximize+'':undefined  '[enableAccordion]'=variable.enableAccordion?"'"+variable.enableAccordion+"'":undefined   '*ngIf'!=variable.visible ?variable.visible.value+"":undefined  '[btnStates]'=variable.toolbarStatesName?""+variable.toolbarStatesName:undefined  '[btnVisible]'=variable.toolbarVisibleName?""+variable.toolbarVisibleName:undefined  '[toolbar]'=variable.toolbarName?""+variable.toolbarName:undefined)&attributes(attrs)
   if(variable.farrisSectionHeader)
     ng-template(farrisSectionHeader '[headerCls]'!=variable.headerCls?"'"+variable.headerCls+"'":undefined )
       | !{variable.farrisSectionHeader}
   if(variable.farrisSectionTitle )
-    ng-template(farrisSectionTitle '[titleCls]'!=variable.titleCls?"'"+variable.titleCls+"'":undefined )
+    ng-template(farrisSectionTitle 'let-index'="index" '[titleCls]'!=variable.titleCls?"'"+variable.titleCls+"'":undefined )
       | !{variable.farrisSectionTitle}
   if(variable.farrisSectionHcontent)
     ng-template(farrisSectionHcontent  '[hcontentCls]'!=variable.hcontentCls?"'"+variable.hcontentCls+"'":undefined )

package/lib/template/ui/kendo/spreadsheet.pug

@@ -1,8 +1,8 @@
-//- -var variable={"appearance": {"class": "p-2", "style": "width:'20px'"}, queryId: "demo",controlType:''};
+//- -var variable={"appearance": {"class": "p-2", "style": "width:'20px'"}, queryId: "demo",controlType:'', multiSheets: ["sheet1","sheet2"]};
 -var attrs = {};
 -attrs['#'+variable.referenceId] = "";
 if(variable.isJointSearch)
-  qdp-view(id=variable.replacedId?""+variable.replacedId:undefined '[hostStyle]'="size" '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined  '(contextmenu)'="menuController.handleContextmenu($event,menuElement,qdpView,qdpViewElementRef)" '(click)'="menuController.handleClick(menuElement)"  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined  '[isInitQdpView]'=variable.initQdpView?""+variable.initQdpView.value:undefined  '[isShowDimension]'=variable.showDimension?""+variable.showDimension.value:undefined)&attributes(attrs)
+  qdp-view(id=variable.replacedId?""+variable.replacedId:undefined '[hostStyle]'="size" '[multiSheets]'=variable.multiSheets ? variable.multiSheets : undefined '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined  '(contextmenu)'="menuController.handleContextmenu($event,menuElement,qdpView,qdpViewElementRef)" '(click)'="menuController.handleClick(menuElement)"  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined  '[isInitQdpView]'=variable.initQdpView?""+variable.initQdpView.value:undefined  '[isShowDimension]'=variable.showDimension?""+variable.showDimension.value:undefined)&attributes(attrs)
   qdp-search-join-menu('[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined  '#menu')
 else
-  qdp-view(id=variable.replacedId?""+variable.replacedId:undefined '[hostStyle]'="size" '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined   '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined   '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined '[isInitQdpView]'=variable.initQdpView?""+variable.initQdpView.value:undefined  '[isShowDimension]'=variable.showDimension?""+variable.showDimension.value:undefined)&attributes(attrs)
+  qdp-view(id=variable.replacedId?""+variable.replacedId:undefined '[hostStyle]'="size" '[multiSheets]'=variable.multiSheets ? variable.multiSheets : undefined '[controlType]'=variable.controlType ? "'" + variable.controlType + "'" : undefined '[queryId]'=variable.queryId ? "'" + variable.queryId + "'" : undefined '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined   '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined   '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined  '[templateType]'=variable.templateType ? "'" + variable.templateType + "'" : undefined '[isInitQdpView]'=variable.initQdpView?""+variable.initQdpView.value:undefined  '[isShowDimension]'=variable.showDimension?""+variable.showDimension.value:undefined)&attributes(attrs)

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

@@ -15,7 +15,7 @@ div(class="farris-input-wrap")
       else if (variable.includeInLoopContainer==false)
         -attrs['formControlName'] = (variable.binding && variable.binding.path);
       else
-        -attrs['[(ngModel)]'] =variable.rowPrefix+ variable.binding && variable.binding.path;
+        -attrs['[(ngModel)]'] =variable.rowPrefix+ variable.ngModelPath;
         -attrs['name'] = variable.replacedId;
         -attrs['[ngModelOptions]'] = "{standalone:true}";
       input(id=variable.replacedId class="custom-control-input" type="checkbox" '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '(ngModelChange)'!=variable.valueChange?"!"+variable.readonly.value+"&&"+variable.valueChange+"":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)
@@ -25,9 +25,6 @@ div(class="farris-input-wrap")
       else
         label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
         label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-      if (variable.needValid && variable.binding && variable.binding.path)
-        -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-        validationMessage('[errors]'!=`${path}`  '[hidden]'="!viewModel.form.isShowValidationMsg"  )
   else
     div(class="custom-control custom-checkbox" '[ngSwitch]'=variable.readonly?variable.readonly.value+"":undefined )
       -var attrs = {};
@@ -38,7 +35,7 @@ div(class="farris-input-wrap")
       else if (variable.includeInLoopContainer==false)
         -attrs['formControlName'] = (variable.binding && variable.binding.path);
       else
-        -attrs['[(ngModel)]'] =variable.rowPrefix+ variable.binding && variable.binding.path;
+        -attrs['[(ngModel)]'] =variable.rowPrefix+ ngModelPath;
         -attrs['name'] = variable.replacedId;
         -attrs['[ngModelOptions]'] = "{standalone:true}";
       if(variable.hasDefaultFocus)
@@ -52,9 +49,6 @@ div(class="farris-input-wrap")
       else
         label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
         label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-      if (variable.needValid && variable.binding && variable.binding.path)
-        -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-        validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
 if(variable.isTextArea)
   -var areaAttrs = {};
   -var areaLabelAttrs = {};
@@ -70,7 +64,7 @@ if(variable.isTextArea)
   else if (variable.includeInLoopContainer==false)
     -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
   if(variable.title)
     -areaLabelAttrs['title'] = "viewModel.bindingData['"+ (variable.binding && variable.binding.path)+"']";

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

@@ -11,7 +11,7 @@ div(class="farris-input-wrap")
           else if (variable.includeInLoopContainer==false)
             -attrs['formControlName'] = (variable.binding && variable.binding.path);
           else
-            -attrs['[(ngModel)]'] = variable.rowPrefix+(item.binding && item.binding.path);
+            -attrs['[(ngModel)]'] = variable.rowPrefix+(item.ngModelPath);
             -attrs['name'] = variable.replacedId;
             -attrs['[ngModelOptions]'] = "{standalone:true}";
           if(variable.hasDefaultFocus)

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

@@ -6,7 +6,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(item.binding && item.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(item.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if (variable.readonly)
@@ -24,9 +24,6 @@ div(class="farris-input-wrap")
     else
       -attrs["*ngIf"]="viewModel.stateMachine['editable']";
   kendo-combobox(id=variable.replacedId "input-end-edit" '[data]'!=variable.enumDataLang+"" '[textField]'="'name'" '[valueField]'="'value'" '[valuePrimitive]'="true"  class="form-control" '(valueChange)'=variable.valueChange?variable.valueChange+"":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  '[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)
-  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 = {};
@@ -41,7 +38,7 @@ div(class="farris-input-wrap")
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang '[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)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

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

@@ -7,7 +7,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if (variable.valueChange)
@@ -24,9 +24,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   kendo-datepicker(id=variable.replacedId "input-end-edit" class="form-control k-widget k-datepicker k-header" '[format]'=variable.format?variable.format: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  '[min]'=(variable.minValue?("'"+variable.minValue+"'|parseStrToDate"):undefined)  '[max]'=(variable.maxValue?("'"+variable.maxValue+"'|parseStrToDate"):undefined)   '[formatPlaceholder]'=variable.format+"|dateFormatPlaceholder:'"+(variable.binding && variable.binding.path)+"'"  '[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)
-  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 = {};
@@ -40,7 +37,7 @@ div(class="farris-input-wrap")
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] =variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] =variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'date'" '[showTime]'=(variable.showTime || variable.showTime== false)?""+variable.showTime:undefined '[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)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/farris-avatar.pug

@@ -7,7 +7,7 @@ div(class="farris-input-wrap f-utils-hcenter-vcenter "+((variable.appearance &&
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] =variable.rowPrefix+ (variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] =variable.rowPrefix+ (variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   -attrs["*ngIf"]=variable.visible?variable.visible.value+'':undefined;

package/lib/template/ui/kendo/table/farris-checkbox-group.pug

@@ -7,7 +7,7 @@ if (variable.binding && variable.binding.type == 'Variable')
 else if (variable.includeInLoopContainer==false)
   -attrs['formControlName'] = (variable.binding && variable.binding.path);
 else
-  -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+  -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
   -attrs['name'] = variable.replacedId;
   -attrs['[ngModelOptions]'] = "{standalone:true}";
 if(variable.isTextArea)
@@ -21,9 +21,6 @@ if(variable.hasDefaultFocus)
     -attrs["[focusState]"]=variable.focusState+"";
 div('class'='farris-input-wrap')
   farris-checkboxgroup(id=variable.replacedId "input-end-edit" '(setCheckboxData)'=variable.setCheckboxData?variable.setCheckboxData+"":undefined   '(changeValue)'=variable.changeValue?variable.changeValue+"":undefined  '[disable]'!=variable.readonly ?""+variable.readonly.value:undefined '[horizontal]'= ""+variable.isHorizontal+"" '[data]'=variable.itemsLang?""+variable.itemsLang:undefined '[separator]'=variable.separator?"'"+variable.separator+"'":undefined  '[uri]'=variable.uri?"'"+variable.uri+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":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  '[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)
-  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 = {};
@@ -37,7 +34,7 @@ div('class'='farris-input-wrap')
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'enum'" '[data]'=variable.itemsLang?""+variable.itemsLang:undefined '[enumDelimiter]'=variable.separator?"'"+variable.separator+"'":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 )&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/farris-combo-list.pug

@@ -7,7 +7,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if (variable.valueChanged)
@@ -25,9 +25,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-combo-list(id=variable.replacedId "input-end-edit" '[data]'!=variable.enumDataLang?variable.enumDataLang:undefined  '(selectedValues)'=variable.selectedValues?variable.selectedValues:undefined   '[disabled]'!=(variable.disable||variable.disable==false)?variable.disable.toString():undefined '[enableCancelSelected]'=(variable.enableCancelSelected || variable.enableCancelSelected==false)?""+variable.enableCancelSelected:undefined  '[editable]'=(variable.editable||variable.editable==false)?variable.editable.toString():undefined '[panelWidth]'=variable.panelWidth?"'"+variable.panelWidth+"'":undefined '[panelHeight]'=variable.panelHeight?"'"+variable.panelHeight+"'":undefined '[idField]'=variable.idField?"'"+variable.idField+"'":undefined '[valueField]'=variable.idField?"'"+variable.idField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined '[uri]'=variable.uri?"'"+variable.uri+"'":undefined  '[multiSelect]'=(variable.multiSelect || variable.multiSelect==false)?variable.multiSelect.toString():undefined  '(showPanel)'=variable.onShown?variable.onShown:undefined '(hidePanel)'=variable.onHidden?variable.onHidden:undefined '(clear)'=variable.onClear?variable.onClear:undefined '[autoWidth]'=(variable.autoWidth||variable.autoWidth==false)?variable.autoWidth.toString():undefined '[mappingField]'=variable.mappingField?"'"+variable.mappingField+"'":undefined  '[beforeShow]'=variable.beforeShow?""+variable.beforeShow:undefined  '[beforeHide]'=variable.beforeHide?""+variable.beforeHide:undefined    '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[enableClear]'=(variable.enableClear || variable.enableClear==false)?""+variable.enableClear:undefined   '[viewType]'=variable.viewType?"'"+variable.viewType+"'":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  '[nosearch]'=variable.noSearch?""+variable.noSearch.value:undefined  '[maxLength]'=variable.maxSearchLength?""+variable.maxSearchLength: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)
-  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 = {};
@@ -41,7 +38,7 @@ div(class="farris-input-wrap")
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang?variable.enumDataLang:undefined '[valueField]'=variable.idField?"'"+variable.idField+"'":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 )&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/farris-combo-lookup.pug

@@ -7,7 +7,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if (variable.valueChanged)
@@ -21,9 +21,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-combo-lookup(id=variable.replacedId "input-end-edit" '(selectedValues)'=variable.selectedValues?variable.selectedValues:undefined  '[displayType]'=variable.displayType?"'"+variable.displayType+"'":undefined  '[disabled]'!=(variable.disable||variable.disable==false)?variable.disable.toString():undefined  '[editable]'=(variable.editable||variable.editable==false)?variable.editable.toString():undefined '[panelWidth]'=variable.panelWidth?""+variable.panelWidth:undefined '[panelHeight]'=variable.panelHeight?""+variable.panelHeight:undefined '[idField]'=variable.idField?"'"+variable.idField+"'":undefined '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined '[uri]'=variable.uri?"'"+variable.uri+"'":undefined  '[multiSelect]'=(variable.multiSelect || variable.multiSelect==false)?variable.multiSelect.toString():undefined  '(showPanel)'=variable.onShown?variable.onShown:undefined '(hidePanel)'=variable.onHidden?variable.onHidden:undefined '(clear)'=variable.clear?variable.clear:undefined '[autoWidth]'=(variable.autoWidth||variable.autoWidth==false)?variable.autoWidth.toString():undefined '[mapFields]'=variable.mapFields?""+variable.mapFields:undefined   '[beforeShow]'=variable.beforeShow?""+variable.beforeShow:undefined  '[beforeHide]'=variable.beforeHide?""+variable.beforeHide:undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined   '[enableClear]'=(variable.enableClear || variable.enableClear==false)?""+variable.enableClear:undefined    '[context]'!=variable.context?""+variable.context: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  '[nosearch]'=variable.noSearch?""+variable.noSearch.value:undefined  '[maxLength]'=variable.maxSearchLength?""+variable.maxSearchLength:undefined '[showHeader]'=variable.showHeader?""+variable.showHeader.value: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)
-  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.titleTipsTemplate)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)

package/lib/template/ui/kendo/table/farris-datepicker.pug

@@ -8,7 +8,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] =  variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] =  variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if (variable.valueChange)
@@ -31,9 +31,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-datepicker(id=variable.replacedId "input-end-edit" "farris-date-localization"=variable.localization?"":undefined '[disabled]'!=variable.disable?variable.disable.toString():undefined  '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined   '[editable]'=(variable.editable||variable.editable==false)?variable.editable+"":undefined   '[locale]'=variable.locale?"'"+variable.locale+"'":undefined  '[dateRange]'!=(variable.dateRange||variable.dateRange==false)?variable.dateRange+"":undefined '[showTime]'=(variable.showTime || variable.showTime==false)?variable.showTime+"":undefined  '[showType]'=(variable.showType || variable.showType==false)?""+variable.showType:undefined '[dateFormat]'!=variable.dateFormat?"'"+variable.dateFormat+"'":undefined   '[disableDateRangesBegin]'!=variable.disableDateRangesBegin?variable.disableDateRangesBegin:undefined '[disableDateRangesEnd]'!=variable.disableDateRangesEnd?variable.disableDateRangesEnd:undefined '[disableDates]'!=variable.disableDates?variable.disableDates:undefined '[showWeekNumbers]'=(variable.showWeekNumbers || variable.showWeekNumbers==false)?variable.showWeekNumbers+"":undefined '[dateRangeDatesDelimiter]'!=variable.dateRangeDatesDelimiter?"'"+variable.dateRangeDatesDelimiter+"'":undefined '[shortcuts]'!=variable.shortcuts?variable.shortcuts:undefined  '[returnType]'=variable.returnType?"'"+variable.returnType+"'":undefined  '[useDefault]'=(variable.useDefault || variable.useDefault==false)?variable.useDefault.toString():undefined  '[returnFormat]'=variable.returnFormat?"'"+variable.returnFormat+"'":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 '[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)
-  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 = {};
@@ -47,7 +44,7 @@ div(class="farris-input-wrap")
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'date'"  '[localization]'=variable.localization?""+true:undefined '[localizationType]'=variable.localization?"'"+variable.localizationType+"'":undefined "farris-text-localization"=variable.localization?"":undefined '[showTime]'=(variable.showTime || variable.showTime== false)?""+variable.showTime:undefined  '[showType]'=(variable.showType || variable.showType==false)?""+variable.showType:undefined  '[format]'=variable.dateFormat?"'"+variable.dateFormat+"'":undefined  '[dateRange]'!=(variable.dateRange||variable.dateRange==false)?variable.dateRange+"":undefined  '[dateRangeDelimiter]'!=variable.dateRangeDatesDelimiter?"'"+variable.dateRangeDatesDelimiter+"'":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)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/farris-number-range.pug

@@ -8,7 +8,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if(variable.isTextArea)
@@ -23,9 +23,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-number-range(id=variable.replacedId  "input-end-edit" '[disabled]'!=variable.disable?variable.disable:undefined '[editable]'=(variable.editable || variable.editable==false)?variable.editable+"":undefined '[readonly]'!=variable.readonly ?""+variable.readonly.value:undefined '[precision]'=(variable.precision || variable.precision == 0)?variable.precision+"":undefined '[textAlign]'=variable.textAlign?"'"+variable.textAlign+"'":undefined '[useThousands]'=(variable.useThousands || variable.useThousands==false)?variable.useThousands+"":undefined  '[step]'=(variable.step || variable.step == 0)?variable.step+"":undefined '[min]'=(variable.minValue||variable.minValue==0)?variable.minValue+"":undefined '[max]'=(variable.maxValue||variable.maxValue==0)?variable.maxValue+"":undefined '[formatter]'=variable.formatterName?variable.formatterName:undefined '[parser]'=variable.parserName?variable.parserName:undefined  '(valueChange)'=variable.onChange?variable.onChange:undefined '(blur)'=variable.onBlur?variable.onBlur: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  '[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)
-  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 = {};
@@ -39,7 +36,7 @@ div(class="farris-input-wrap")
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'number'"  '[textAlign]'=variable.textAlign?"'"+variable.textAlign+"'":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)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/farris-number-spinner.pug

@@ -8,7 +8,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if(variable.isTextArea)
@@ -22,9 +22,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-number-spinner(id=variable.replacedId "input-end-edit"  '[disabled]'!=variable.disable?variable.disable:undefined '[editable]'=(variable.editable || variable.editable==false)?variable.editable+"":undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '[useThousands]'=(variable.useThousands || variable.useThousands==false)?variable.useThousands+"":undefined '[textAlign]'=variable.textAlign?"'"+variable.textAlign+"'":undefined  '[step]'=(variable.step || variable.step == 0)?variable.step+"":undefined '[min]'=(variable.minValue||variable.minValue==0)?variable.minValue+"":undefined '[max]'=(variable.maxValue||variable.maxValue==0)?variable.maxValue+"":undefined '[formatter]'=variable.formatterName?variable.formatterName:undefined '[parser]'=variable.parserName?variable.parserName:undefined '[precision]'=(variable.precision || variable.precision == 0)?variable.precision+"":undefined  '(valueChange)'=variable.valueChange?variable.valueChange:undefined '(blur)'=variable.onBlur?variable.onBlur:undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[canNull]'=(variable.canNull||variable.canNull==false)?""+variable.canNull:undefined  '[bigNumber]'=(variable.bigNumber||variable.bigNumber==false)?""+variable.bigNumber: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  '[showZero]'=variable.showZero?""+variable.showZero.value:undefined '[showButton]'=variable.showButton?""+variable.showButton.value: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)
-  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 = {};
@@ -38,7 +35,7 @@ div(class="farris-input-wrap")
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'number'" '[format]'=variable.format?"'"+variable.format+"'":undefined   '[textAlign]'=variable.textAlign?"'"+variable.textAlign+"'":undefined  '[option]'=variable.textOptionsName?variable.textOptionsName: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)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/farris-static-text.pug

@@ -1,5 +1,5 @@
 div(class="farris-label-wrap")
     label(class="col-form-label")
-        span(class="farris-label-info text-danger" '*ngIf'=variable.require?variable.require.value:undefined)
+        span(class="farris-label-info text-danger" '*ngIf'=variable.require?""+variable.require.value:undefined) *
         span(class="farris-label-text")
             |#{variable.text}

package/lib/template/ui/kendo/table/farris-switch.pug

@@ -8,7 +8,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if(variable.isTextArea)
@@ -21,9 +21,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-switch(id=variable.replacedId "input-end-edit"  '[disabled]'!=variable.disable?variable.disable:undefined '[editable]'!=variable.readonly?"!("+variable.readonly.value+")":undefined '[square]'=variable.square?""+variable.square:undefined  '[checkedLabel]'=variable.checkedLabel?"'"+variable.checkedLabel+"'":undefined '[uncheckedLabel]'=variable.uncheckedLabel?"'"+variable.uncheckedLabel+"'":undefined '(valueChange)'=variable.valueChange?variable.valueChange: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  '[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)
-  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 = {};
@@ -37,7 +34,7 @@ div(class="farris-input-wrap")
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'boolean'" '[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)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/farris-time-picker.pug

@@ -8,7 +8,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if (variable.valueChange)
@@ -26,9 +26,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-time-picker(id=variable.replacedId "input-end-edit" '[disabled]'!=variable.disable?variable.disable.toString():undefined  '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined  '[editable]'=(variable.editable||variable.editable==false)?variable.editable.toString():undefined '[hourStep]'=variable.hourStep?variable.hourStep.toString():undefined '[minuteStep]'=variable.minuteStep?variable.minuteStep.toString():undefined '[secondStep]'=variable.secondStep?variable.secondStep.toString():undefined  '[format]'=variable.format?"'"+variable.format+"'":undefined      '[hideDisabledOptions]'=(variable.hideDisabledOptions || variable.hideDisabledOptions==false)?variable.hideDisabledOptions.toString():undefined '(clear)'=variable.clear?variable.clear:undefined  '(valueChanged)'=variable.valueChanged?variable.valueChanged.toString():undefined '(openChange)'=variable.openChange?variable.openChange.toString():undefined '[use12Hours]'=(variable.use12Hours || variable.use12Hours==false)?variable.use12Hours+"":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   '[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)
-  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 = {};
@@ -42,7 +39,7 @@ div(class="farris-input-wrap")
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'date'"  '[showTime]'=(variable.showTime || variable.showTime== false)?""+variable.showTime:undefined   '[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)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/farris-time-spinner.pug

@@ -8,7 +8,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if(variable.hasDefaultFocus)
@@ -16,9 +16,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   farris-time-spinner(id=variable.replacedId "input-end-edit"  '[disabled]'!=(variable.disable||variable.disable==false)?variable.disable+"":undefined  '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[editable]'=(variable.editable||variable.editable==false)?variable.editable+"":undefined  '[use12Hours]'=(variable.use12Hours||variable.use12Hours==false)?variable.use12Hours+"":undefined  '[format]'=variable.format?"'"+variable.format+"'":undefined  '[placeHolder]'=variable.placeHolderLangName?variable.placeHolderLangName:undefined  '[hourStep]'=(variable.hourStep||variable.hourStep==0)?"'"+variable.hourStep+"'":undefined  '[minuteStep]'=(variable.minuteStep||variable.minuteStep==0)?"'"+variable.minuteStep+"'":undefined  '[secondStep]'=(variable.secondStep||variable.secondStep==0)?"'"+variable.secondStep+"'":undefined   '[max]'=variable.maxValue?"'"+variable.maxValue+"'":undefined  '[min]'=variable.minValue?"'"+variable.minValue+"'":undefined '[disabledSeconds]'=(variable.disabledSeconds||variable.disabledSeconds==false)?variable.disabledSeconds+"":undefined '[separator]'=variable.splitter?"'"+variable.splitter+"'":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   '[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)
-  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.titleTipsTemplate)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)

package/lib/template/ui/kendo/table/input-group.pug

@@ -7,7 +7,7 @@ if (variable.binding && variable.binding.type == 'Variable')
 else if (variable.includeInLoopContainer==false)
   -attrs['formControlName'] = (variable.binding && variable.binding.path);
 else
-  -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+  -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
   -attrs['name'] = variable.replacedId;
   -attrs['[ngModelOptions]'] = "{standalone:true}";
 if(variable.isTextArea)
@@ -21,9 +21,6 @@ if(variable.hasDefaultFocus)
     -attrs["[focusState]"]=variable.focusState+"";
 div('class'='farris-input-wrap')
   input-group(id=variable.replacedId?""+variable.replacedId:undefined '[groupText]'=variable.groupTextLangName?""+variable.groupTextLangName:undefined "input-end-edit"  '[disabled]'!=variable.disable?variable.disable+"":undefined  '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[editable]'=(variable.editable || variable.editable == false)?variable.editable+"":undefined  '[enableClear]'=variable.enableClear?variable.enableClear+"":undefined  '[customCls]'=variable.customCls?"'"+variable.customCls+"'":undefined  '[showButtonWhenDisabled]'=variable.showButtonWhenDisabled?variable.showButtonWhenDisabled+"":undefined  '[placeholder]'=variable.placeHolderLangName?""+variable.placeHolderLangName:undefined  '(clear)'=variable.onClear?variable.onClear:undefined  '(valueChange)'=variable.valueChange?variable.valueChange+"":undefined  '(clickHandle)'=variable.click?variable.click+"":undefined  '(blurHandle)'=variable.onBlur?variable.onBlur+"":undefined  '[isPassword]'=(variable.isPassword || variable.isPassword == false)?""+variable.isPassword:undefined    '[enableViewPassword]'=(variable.enableViewPassword || variable.enableViewPassword == false)?""+variable.enableViewPassword: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  '[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)
-  if (variable.needValid && variable.binding && variable.binding.path)
-    -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-    validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
   if(variable.isTextArea)
     -var areaAttrs = {};
     if(variable.readonly && variable.readonly.isComposite)
@@ -36,7 +33,7 @@ div('class'='farris-input-wrap')
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'string'" '[isPassword]'=(variable.isPassword || variable.isPassword == false)?""+variable.isPassword: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)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)

package/lib/template/ui/kendo/table/language-textbox.pug

@@ -8,7 +8,7 @@ div(class="farris-input-wrap")
   else if (variable.includeInLoopContainer==false)
     -attrs['formControlName'] = (variable.binding && variable.binding.path);
   else
-    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+    -attrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   if (variable.valueChange)
@@ -25,9 +25,6 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   language-textbox(id=variable.replacedId "input-end-edit"  '[disabled]'!=variable.disable?variable.disable.toString():undefined  '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined  '[languages]'=variable.useFrameworkLanguage?""+variable.currentLanguageListName:variable.currentLanguageListName '[enableClear]'=(variable.enableClear || variable.enableClear == false)?""+variable.enableClear: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  '[editable]'=variable.editable?""+variable.editable.value: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)
-  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 = {};
@@ -41,7 +38,7 @@ div(class="farris-input-wrap")
     else if (variable.includeInLoopContainer==false)
       -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
     else
-      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.binding && variable.binding.path);
+      -areaAttrs['[(ngModel)]'] = variable.rowPrefix+(variable.ngModelPath);
       -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
     farris-text('[type]'="'string'" '[currentLanguage]'="this.lang"  '[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)&attributes(areaAttrs)
 if(variable.titleTipsTemplate)