npm - @farris/jit-engine - Versions diffs - 1.3.124 → 1.3.128 - Mend

@farris/jit-engine 1.3.124 → 1.3.128

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (316) hide show

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

@@ -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)
@@ -24,7 +24,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     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)&attributes(attrs)
+  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" )
@@ -41,9 +41,9 @@ 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 )&attributes(areaAttrs)
+    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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

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

@@ -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)
@@ -20,7 +20,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     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)&attributes(attrs)
+  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" )

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

@@ -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)
@@ -30,7 +30,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     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 )&attributes(attrs)
+  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" )
@@ -47,9 +47,9 @@ 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)&attributes(areaAttrs)
+    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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

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

@@ -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,7 +22,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     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 )&attributes(attrs)
+  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" )
@@ -39,9 +39,9 @@ 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 )&attributes(areaAttrs)
+    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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

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

@@ -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,7 +21,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     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  )&attributes(attrs)
+  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" )
@@ -38,9 +38,9 @@ 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)&attributes(areaAttrs)
+    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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

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

@@ -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 CHANGED Viewed

@@ -6,9 +6,9 @@ div(class="farris-input-wrap")
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   else if (variable.includeInLoopContainer==false)
-          -attrs['formControlName'] = (variable.binding && variable.binding.path);
+    -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)
@@ -20,7 +20,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     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 )&attributes(attrs)
+  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" )
@@ -37,9 +37,9 @@ 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'")&attributes(areaAttrs)
+    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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

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

@@ -6,9 +6,9 @@ div(class="farris-input-wrap")
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   else if (variable.includeInLoopContainer==false)
-          -attrs['formControlName'] = (variable.binding && variable.binding.path);
+    -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,7 +25,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     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  )&attributes(attrs)
+  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" )
@@ -42,9 +42,9 @@ 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 )&attributes(areaAttrs)
+    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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

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

@@ -8,14 +8,14 @@ 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)
     -attrs["farris-set-focus"]="";
     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  )&attributes(attrs)
+  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" )

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

@@ -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)
@@ -20,7 +20,7 @@ if(variable.hasDefaultFocus)
   if(variable.focusState)
     -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   )&attributes(attrs)
+  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" )
@@ -36,9 +36,9 @@ 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)&attributes(areaAttrs)
+    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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

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

@@ -6,9 +6,9 @@ div(class="farris-input-wrap")
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   else if (variable.includeInLoopContainer==false)
-          -attrs['formControlName'] = (variable.binding && variable.binding.path);
+    -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,7 +24,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     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 )&attributes(attrs)
+  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" )
@@ -41,9 +41,9 @@ 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" )&attributes(areaAttrs)
+    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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

package/lib/template/ui/kendo/table/lookup.pug CHANGED Viewed

@@ -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.lookupPicking)
@@ -30,7 +30,7 @@ div(class="farris-input-wrap")
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
   -attrs['#'+variable.replacedId] = "";
-  farris-lookup-grid(id=variable.replacedId "input-end-edit"   'data-mapping' '[useTip]'=(variable.useTip || variable.useTip==false)?variable.useTip+"":undefined '[useFavorite]'=(variable.useFavorite || variable.useFavorite==false)?variable.useFavorite+"":undefined '[nosearch]'=variable.noSearch?""+variable.noSearch.value:undefined  '[editable]'=(variable.editable || variable.editable==false)?""+variable.editable:undefined   '[disabled]'!=variable.disable?variable.disable.toString():undefined  '[displayType]'="'" + variable.displayType+ "'" '[uri]'="'" + (variable.dataSource && variable.dataSource.uri) + "'" '[idField]'="'" + (variable.dataSource && variable.dataSource.idField) + "'" '[mapFields]'=variable.mapFields?variable.mapFields:undefined '[singleSelect]'=(!variable.multiSelect) + "" '[pageSize]'=(variable.pageSize || 20) '[pageList]'=variable.arrPageList?variable.arrPageList:undefined '[pageIndex]'=(variable.pageIndex || 1) '[pagination]'=(variable.pagination == null | variable.pagination == undefined)?"true":variable.pagination + "" '[textField]'="'" + variable.textField + "'" '[valueField]'="'" + variable.valueField + "'"   '[title]'=variable.dialogTitleLang?""+variable.dialogTitleLang:undefined '[showMaxButton]'=(variable.showMaxButton == null | variable.showMaxButton == undefined)?"true":variable.showMaxButton + "" '[showCloseButton]'=(variable.showCloseButton == null | variable.showCloseButton == undefined)?"true":variable.showCloseButton + "" '[resizable]'=(variable.resizable == null | variable.resizable == undefined)?"true":variable.resizable + ""  '(clear)'=variable.clear?variable.clear:undefined  '[context]'=variable.context?variable.context:undefined  '[enableToSelect]'=(variable.enableToSelect || variable.enableToSelect == false)?""+variable.enableToSelect:undefined  '[expandLevel]'=""+variable.expandLevel   '[isRecordSize]'=(variable.isRecordSize || variable.isRecordSize == false)?""+variable.isRecordSize:undefined  '[enableFullTree]'=(variable.enableFullTree || variable.enableFullTree == false)?""+variable.enableFullTree:undefined  '[loadTreeDataType]'=variable.loadTreeDataType ?"'"+variable.loadTreeDataType+"'":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined   '[enableClear]'=(variable.enableClear || variable.enableClear==false)?""+variable.enableClear:undefined   '[dialogWidth]'=variable.panelWidth?""+variable.panelWidth:undefined '[dialogHeight]'=variable.panelHeight?""+variable.panelHeight:undefined    '[enableCascade]'=variable.enableCascade?""+variable.enableCascade:undefined    '[cascadeStatus]'=variable.cascadeStatus?"'"+variable.cascadeStatus+"'":undefined  '[useExtendInfo]'=(variable.useExtendInfo || variable.useExtendInfo==false)?""+variable.useExtendInfo:undefined '[extInfoFields]'=variable.extInfoFields?"'"+variable.extInfoFields+"'":undefined '[extInfoFormatter]'=variable.extInfoFormatterName?""+variable.extInfoFormatterName: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 '[customFormatter]'=variable.customFormatterName?""+variable.customFormatterName:undefined   '[selectFirstInNav]'=variable.selectFirstInNav?""+variable.selectFirstInNav.value:undefined  '[loadDataWhenOpen]'=variable.loadDataWhenOpen?""+variable.loadDataWhenOpen.value:undefined  '[customNavFormatter]'=variable.customNavFormatterName?""+variable.customNavFormatterName:undefined '[treeInfo]'=variable.treeInfo?variable.treeInfo:undefined  '[maxLength]'=variable.maxSearchLength?""+variable.maxSearchLength:undefined  '[viewType]'=variable.viewType?"'"+variable.viewType+"'":undefined '[target]'="row")&attributes(attrs)
+  farris-lookup-grid(id=variable.replacedId "input-end-edit"   'data-mapping' '[useTip]'=(variable.useTip || variable.useTip==false)?variable.useTip+"":undefined '[useFavorite]'=(variable.useFavorite || variable.useFavorite==false)?variable.useFavorite+"":undefined '[nosearch]'=variable.noSearch?""+variable.noSearch.value:undefined  '[editable]'=(variable.editable || variable.editable==false)?""+variable.editable:undefined   '[disabled]'!=variable.disable?variable.disable.toString():undefined  '[displayType]'="'" + variable.displayType+ "'" '[uri]'="'" + (variable.dataSource && variable.dataSource.uri) + "'" '[idField]'="'" + (variable.dataSource && variable.dataSource.idField) + "'" '[mapFields]'=variable.mapFields?variable.mapFields:undefined '[singleSelect]'=(!variable.multiSelect) + "" '[pageSize]'=(variable.pageSize || 20) '[pageList]'=variable.arrPageList?variable.arrPageList:undefined '[pageIndex]'=(variable.pageIndex || 1) '[pagination]'=(variable.pagination == null | variable.pagination == undefined)?"true":variable.pagination + "" '[textField]'="'" + variable.textField + "'" '[valueField]'="'" + variable.valueField + "'"   '[title]'=variable.dialogTitleLang?""+variable.dialogTitleLang:undefined '[showMaxButton]'=(variable.showMaxButton == null | variable.showMaxButton == undefined)?"true":variable.showMaxButton + "" '[showCloseButton]'=(variable.showCloseButton == null | variable.showCloseButton == undefined)?"true":variable.showCloseButton + "" '[resizable]'=(variable.resizable == null | variable.resizable == undefined)?"true":variable.resizable + ""  '(clear)'=variable.clear?variable.clear:undefined  '[context]'=variable.context?variable.context:undefined  '[enableToSelect]'=(variable.enableToSelect || variable.enableToSelect == false)?""+variable.enableToSelect:undefined  '[expandLevel]'=""+variable.expandLevel   '[isRecordSize]'=(variable.isRecordSize || variable.isRecordSize == false)?""+variable.isRecordSize:undefined  '[enableFullTree]'=(variable.enableFullTree || variable.enableFullTree == false)?""+variable.enableFullTree:undefined  '[loadTreeDataType]'=variable.loadTreeDataType ?"'"+variable.loadTreeDataType+"'":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined   '[enableClear]'=(variable.enableClear || variable.enableClear==false)?""+variable.enableClear:undefined   '[dialogWidth]'=variable.panelWidth?""+variable.panelWidth:undefined '[dialogHeight]'=variable.panelHeight?""+variable.panelHeight:undefined    '[enableCascade]'=variable.enableCascade?""+variable.enableCascade:undefined    '[cascadeStatus]'=variable.cascadeStatus?"'"+variable.cascadeStatus+"'":undefined  '[useExtendInfo]'=(variable.useExtendInfo || variable.useExtendInfo==false)?""+variable.useExtendInfo:undefined '[extInfoFields]'=variable.extInfoFields?"'"+variable.extInfoFields+"'":undefined '[extInfoFormatter]'=variable.extInfoFormatterName?""+variable.extInfoFormatterName: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 '[customFormatter]'=variable.customFormatterName?""+variable.customFormatterName:undefined   '[selectFirstInNav]'=variable.selectFirstInNav?""+variable.selectFirstInNav.value:undefined  '[loadDataWhenOpen]'=variable.loadDataWhenOpen?""+variable.loadDataWhenOpen.value:undefined  '[customNavFormatter]'=variable.customNavFormatterName?""+variable.customNavFormatterName:undefined '[treeInfo]'=variable.treeInfo?variable.treeInfo:undefined  '[maxLength]'=variable.maxSearchLength?""+variable.maxSearchLength:undefined  '[viewType]'=variable.viewType?"'"+variable.viewType+"'":undefined '[target]'="row" '[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" )
@@ -47,9 +47,9 @@ 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'"  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
+    farris-text('[type]'="'string'"  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight: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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

package/lib/template/ui/kendo/table/multi-select.pug CHANGED Viewed

@@ -2,14 +2,14 @@ doctype html
 |
 -var attrs = {};
 if (variable.binding && variable.binding.type == 'Variable')
-    -attrs['[(selectedId)]'] = variable.binding.value;
+  -attrs['[(selectedId)]'] = variable.binding.value;
 else
   -attrs['[(selectedId)]'] = (variable.binding && variable.binding.path);
 if(variable.hasDefaultFocus)
   -attrs["farris-set-focus"]="";
   if(variable.focusState)
     -attrs["[focusState]"]=variable.focusState+"";
-multi-select(id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectDataMapping' "input-end-edit" '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined   '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined  '[dataSource]'=variable.dataSource?variable.dataSource:undefined  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  )&attributes(attrs)
+multi-select(id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectDataMapping' "input-end-edit" '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined   '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined  '[dataSource]'=variable.dataSource?variable.dataSource:undefined  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex: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)
   ng-template(farrisTemplate="text" let-data 'let-ms'="instance")
     if(variable.content)
       | !{variable.content}

package/lib/template/ui/kendo/table/multitextbox.pug CHANGED Viewed

@@ -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,7 +22,7 @@ div(class="farris-input-wrap")
     -attrs["farris-set-focus"]="";
     if(variable.focusState)
       -attrs["[focusState]"]=variable.focusState+"";
-  textarea(id=variable.replacedId '[style.height]'=(variable.size&&variable.size.height)?"'"+variable.size.height+"px"+"'":undefined '[maxHeight]'= variable.maxHeight?""+variable.maxHeight:undefined  '[style.width]'=(variable.size&&variable.size.width)?"'"+variable.size.width+"px"+"'":undefined class="form-control" "input-end-edit" 'kendoTextArea' '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[value]'=variable.value?variable.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  '[auto-size]'=variable.autoHeight?""+variable.autoHeight.value:undefined '[textarea-zoom]'=variable.enableDialog+"" '[title]'=variable.enableDialog?""+titleValue:undefined   '[dialogWidth]'=variable.enableDialog?variable.dialogWidth+"":undefined  '[dialogHeight]'=variable.enableDialog?variable.dialogHeight+"":undefined 'maxlength'=(variable.maxLength && variable.maxLength!=0)?""+variable.maxLength:undefined   '[word-count]'=(variable.enableWordCount || variable.enableWordCount==false)?""+variable.enableWordCount:undefined  '[countType]'=variable.countType?"'"+variable.countType+"'":undefined  '[onlyShowInDialog]'=(variable.onlyShowInDialog||variable.onlyShowInDialog==false)?""+variable.onlyShowInDialog:undefined  )&attributes(attrs)
+  textarea(id=variable.replacedId '[style.height]'=(variable.size&&variable.size.height)?"'"+variable.size.height+"px"+"'":undefined '[maxHeight]'= variable.maxHeight?""+variable.maxHeight:undefined  '[style.width]'=(variable.size&&variable.size.width)?"'"+variable.size.width+"px"+"'":undefined class="form-control" "input-end-edit" 'kendoTextArea' '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[value]'=variable.value?variable.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  '[auto-size]'=variable.autoHeight?""+variable.autoHeight.value:undefined '[textarea-zoom]'=variable.enableDialog+"" '[title]'=variable.enableDialog?""+titleValue:undefined   '[dialogWidth]'=variable.enableDialog?variable.dialogWidth+"":undefined  '[dialogHeight]'=variable.enableDialog?variable.dialogHeight+"":undefined 'maxlength'=(variable.maxLength && variable.maxLength!=0)?""+variable.maxLength:undefined   '[word-count]'=(variable.enableWordCount || variable.enableWordCount==false)?""+variable.enableWordCount:undefined  '[countType]'=variable.countType?"'"+variable.countType+"'":undefined  '[onlyShowInDialog]'=(variable.onlyShowInDialog||variable.onlyShowInDialog==false)?""+variable.onlyShowInDialog: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" )
@@ -39,9 +39,9 @@ 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'"  '[isTextArea]'="true"  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined '[maxHeight]'= variable.maxHeight?""+variable.maxHeight:undefined  '[textarea-zoom]'=variable.enableDialog+"" '[title]'=variable.enableDialog?""+titleValue:undefined   '[dialogWidth]'=variable.enableDialog?variable.dialogWidth+"":undefined  '[dialogHeight]'=variable.enableDialog?variable.dialogHeight+"":undefined   '[attr.maxLength]'=variable.maxLength?""+variable.maxLength:undefined  )&attributes(areaAttrs)
+    farris-text('[type]'="'string'"  '[isTextArea]'="true"  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined '[maxHeight]'= variable.maxHeight?""+variable.maxHeight:undefined  '[textarea-zoom]'=variable.enableDialog+"" '[title]'=variable.enableDialog?""+titleValue:undefined   '[dialogWidth]'=variable.enableDialog?variable.dialogWidth+"":undefined  '[dialogHeight]'=variable.enableDialog?variable.dialogHeight+"":undefined   '[attr.maxLength]'=variable.maxLength?""+variable.maxLength: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)
   span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
     i(class="f-icon f-icon-description-tips")

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

@@ -6,9 +6,9 @@ div(class="farris-input-wrap")
     -attrs['name'] = variable.replacedId;
     -attrs['[ngModelOptions]'] = "{standalone:true}";
   else if (variable.includeInLoopContainer==false)
-          -attrs['formControlName'] = (variable.binding && variable.binding.path);
+    -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}";
@@ -22,7 +22,7 @@ div(class="farris-input-wrap")
     -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 )&attributes(attrs)
+  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]'="'增加'")
   if (variable.needValid)
     -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
@@ -40,9 +40,9 @@ 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)&attributes(areaAttrs)
+    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)&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")