@farris/jit-engine 1.3.294 → 1.3.296

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

@@ -1,12 +1,12 @@
--var attrs = {};
-if(variable.useIsolateJs)
-  div(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  '*ngIf'!=variable.visible?variable.visible.value+'':undefined)
-      | <ng-template #{'#'+variable.replacedExternalCmp} >
-      | </ng-template>
-else
-  if(variable.hasDefaultFocus)
-    -attrs["farris-set-focus"]="";
-    if(variable.focusState)
-      -attrs["[focusState]"]=variable.focusState+"";
-  div(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  '*ngIf'!=variable.visible?variable.visible.value+'':undefined    )&attributes(attrs)
-    |<#{'app-' + variable.componentName.toLowerCase()}></#{'app-' + variable.componentName.toLowerCase()}>
+-var attrs = {};
+if(variable.useIsolateJs)
+  div(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  '*ngIf'!=variable.visible?variable.visible.value+'':undefined)
+      | <ng-template #{'#'+variable.replacedExternalCmp} >
+      | </ng-template>
+else
+  if(variable.hasDefaultFocus)
+    -attrs["farris-set-focus"]="";
+    if(variable.focusState)
+      -attrs["[focusState]"]=variable.focusState+"";
+  div(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  '*ngIf'!=variable.visible?variable.visible.value+'':undefined    )&attributes(attrs)
+    |<#{'app-' + variable.componentName.toLowerCase()}></#{'app-' + variable.componentName.toLowerCase()}>

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

@@ -1 +1 @@
-router-outlet()
+router-outlet()

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

@@ -1,13 +1,19 @@
--var attrs = {};
-if (variable.binding && variable.binding.type == 'Variable')
-  -attrs['[(ngModel)]'] = variable.binding.value;
-  -attrs['name'] = variable.replacedId;
-  -attrs['[ngModelOptions]'] = "{standalone:true}";
-else
-  -attrs['formControlName'] = (variable.binding && variable.binding.path);
--attrs["*ngIf"]=variable.visible?variable.visible.value+'':undefined;
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-farris-avatar(id=variable.replacedId "input-end-edit" class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[imgShape]'=variable.imgShape?"'"+variable.imgShape+"'":undefined '[imgTitle]'=variable.imgTitleLangName?""+variable.imgTitleLangName:undefined  '[avatarWidth]'=(variable.size && variable.size.width)?"'"+variable.size.width+"'":undefined  '[avatarHeight]'=(variable.size && variable.size.height)?"'"+variable.size.height+"'":undefined  '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[type]'=variable.imgType?"'"+variable.imgType+"'":undefined  '[size]'=(variable.maxSize || variable.maxSize==0)?variable.maxSize.toString():undefined  '(imgChange)'=variable.imgChange?variable.imgChange+"":undefined  '[cover]'=variable.cover?"'"+variable.cover+"'":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined )&attributes(attrs)
+-var attrs = {};
+if (variable.binding && variable.binding.type == 'Variable')
+  -attrs['[(ngModel)]'] = variable.binding.value;
+  -attrs['name'] = variable.replacedId;
+  -attrs['[ngModelOptions]'] = "{standalone:true}";
+else
+  -attrs['formControlName'] = (variable.binding && variable.binding.path);
+-attrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
+farris-avatar(id=variable.replacedId "input-end-edit" class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)
+  '[imgShape]'=variable.imgShape?"'"+variable.imgShape+"'":undefined '[imgTitle]'=variable.imgTitleLangName?""+variable.imgTitleLangName:undefined
+  '[avatarWidth]'=(variable.size && variable.size.width)?"'"+variable.size.width+"'":undefined  '[avatarHeight]'=(variable.size && variable.size.height)?"'"+variable.size.height+"'":undefined
+  '[readonly]'!=variable.readonly?variable.readonlyPipeSuffix?variable.readonly.value+variable.readonlyPipeSuffix+"":variable.readonly.value+"":undefined
+  '[type]'=variable.imgType?"'"+variable.imgType+"'":undefined
+  '[size]'=(variable.maxSize || variable.maxSize==0)?variable.maxSize.toString():undefined  '(imgChange)'=variable.imgChange?variable.imgChange+"":undefined
+  '[cover]'=variable.cover?"'"+variable.cover+"'":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined)&attributes(attrs)

package/lib/template/ui/kendo/farris-calendar.pug

@@ -1,6 +1,6 @@
--var attrs = {};
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
+-var attrs = {};
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
 farris-calendar(id=variable.replacedId "input-end-edit" '[useThousands]'=(variable.useThousands==true || variable.useThousands==false)?variable.useThousands+"":undefined '[textAlign]'=variable.textAlign?variable.textAlign+"":undefined '[precision]'=(variable.precision || variable.precision==0)?variable.precision+"":undefined   'class'=(variable.appearance && variable.appearance.class) ? variable.appearance.class+"":undefined  'style'=(variable.style && variable.appearance.style) ? variable.appearance.style+"":undefined '[header]'=variable.header?variable.header:undefined '[plugins]'=variable.plugins?variable.plugins+"":undefined '[events]'=variable.events?variable.events+"":undefined '(dateClick)'=variable.dateClick?variable.dateClick+"":undefined  '(eventClick)'=variable.eventClick?variable.eventClick+"":undefined  '(select)'=variable.select?variable.select+"":undefined  '(unselect)'=variable.unselect?variable.unselect+"":undefined  '[aspectRatio]'=variable.aspectRatio?variable.aspectRatio+"":undefined  '(eventDrop)'=variable.eventDrop?variable.eventDrop+"":undefined  '(datesRender)'=variable.datesRender?variable.datesRender+"":undefined   '[contentHeight]'=variable.contentHeight?"'"+variable.contentHeight+"'":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined)&attributes(attrs)

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

@@ -1,67 +1,96 @@
--var holdPlaceOuterAttrs = {};
--var holdPlaceInnerAttrs = {};
--var holdPlaceEmptyAttrs = {};
-if(variable.holdPlace)
-  -holdPlaceInnerAttrs["*ngIf"]=variable.visible ?variable.visible.value+'':undefined;
-  -holdPlaceEmptyAttrs['*ngIf']=variable.visible ?'!'+variable.visible.value+'':undefined;
-else
-  -holdPlaceOuterAttrs["*ngIf"]=variable.visible ?variable.visible.value+'':undefined;
-div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )&attributes(holdPlaceOuterAttrs)
-  if(variable.holdPlace)
-    div(class="f-empty-input-placeholder")&attributes(holdPlaceEmptyAttrs)
-  div(class="farris-group-wrap")&attributes(holdPlaceInnerAttrs)
-    div(class="form-group farris-form-group" '[ngClass]'="{'form-group--has-tips':"+(variable.enableTitleTips?variable.enableTitleTips:false)+"}")
-      if (variable.title)
-        -var titleValue=variable.isStaticTitle?("'" + variable.resourceId + "'|lang:lang:'"+variable.defaultI18nValue+"'"):variable.dynamicTitleValue;
-        if(variable.linkedLabelEnabled)
-          label('class'='col-form-label f-pretend-link f-cursor-pointer' title="{{"+titleValue+"}}" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined  '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
-            if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
-            span('class'="farris-label-text") {{#{titleValue}}}
-        else
-          label('class'='col-form-label'  title="{{"+titleValue+"}}" for=variable.replacedId   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
-            if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
-            span('class'="farris-label-text") {{#{titleValue}}}
-      -var attrs = {};
-      if (variable.binding && variable.binding.type == 'Variable')
-        -attrs['[(ngModel)]'] = variable.binding.value;
-        -attrs['name'] = variable.replacedId;
-        -attrs['[ngModelOptions]'] = "{standalone:true}";
-      else
-        -attrs['formControlName'] = (variable.binding && variable.binding.path);
-      if(variable.isTextArea)
-        if(variable.readonly && variable.readonly.isComposite)
-          -attrs["*ngIf"]="!"+variable.readonly.value;
-        else
-          -attrs["*ngIf"]="viewModel.stateMachine['editable']";
-      if(variable.hasDefaultFocus)
-        -attrs["farris-set-focus"]="";
-        if(variable.focusState)
-          -attrs["[focusState]"]=variable.focusState+"";
-      div('class'='farris-input-wrap')
-        farris-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 )&attributes(attrs)
-        if (variable.needValid && variable.binding && variable.binding.path)
-          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-          validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
-        div(class="farris-feedback")
-        if(variable.isTextArea)
-          -var areaAttrs = {};
-          if(variable.readonly && variable.readonly.isComposite)
-            -areaAttrs["*ngIf"]=variable.readonly.value;
-          else
-            -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
-          if (variable.binding && variable.binding.type == 'Variable')
-            -areaAttrs['[(ngModel)]'] = variable.binding.value;
-            -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-          else
-            -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-          farris-text('[type]'="'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  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
-      if(variable.titleTipsTemplate)
-        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-          i(class="f-icon f-icon-description-tips")
-        -var tipsAttrs= {};
-        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-        ng-template()&attributes(tipsAttrs)
-          | !{variable.titleTipsTemplate}
-
+-var holdPlaceOuterAttrs = {};
+-var holdPlaceInnerAttrs = {};
+-var holdPlaceEmptyAttrs = {};
+if(variable.holdPlace)
+  -holdPlaceInnerAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
+  -holdPlaceEmptyAttrs['*ngIf']=variable.visible?variable.visiblePipeSuffix?'!'+variable.visible.value+variable.visiblePipeSuffix+'':'!'+variable.visible.value+'':undefined;
+else
+  -holdPlaceOuterAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
+div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )&attributes(holdPlaceOuterAttrs)
+  if(variable.holdPlace)
+    div(class="f-empty-input-placeholder")&attributes(holdPlaceEmptyAttrs)
+  div(class="farris-group-wrap")&attributes(holdPlaceInnerAttrs)
+    div(class="form-group farris-form-group" '[ngClass]'="{'form-group--has-tips':"+(variable.enableTitleTips?variable.enableTitleTips:false)+"}")
+      if (variable.title)
+        -var titleValue=variable.isStaticTitle?("'" + variable.resourceId + "'|lang:lang:'"+variable.defaultI18nValue+"'"):variable.dynamicTitleValue;
+        if(variable.linkedLabelEnabled)
+          label('class'='col-form-label f-pretend-link f-cursor-pointer' title="{{"+titleValue+"}}" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined  '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
+            if (variable.require)
+              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+            span('class'="farris-label-text") {{#{titleValue}}}
+        else
+          label('class'='col-form-label'  title="{{"+titleValue+"}}" for=variable.replacedId   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
+            if (variable.require)
+              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+            span('class'="farris-label-text") {{#{titleValue}}}
+      -var attrs = {};
+      if (variable.binding && variable.binding.type == 'Variable')
+        -attrs['[(ngModel)]'] = variable.binding.value;
+        -attrs['name'] = variable.replacedId;
+        -attrs['[ngModelOptions]'] = "{standalone:true}";
+      else
+        -attrs['formControlName'] = (variable.binding && variable.binding.path);
+      if(variable.isTextArea)
+        if(variable.readonly && variable.readonly.isComposite)
+          -attrs["*ngIf"]="!"+variable.readonly.value;
+        else
+          -attrs["*ngIf"]="viewModel.stateMachine['editable']";
+      if(variable.hasDefaultFocus)
+        -attrs["farris-set-focus"]="";
+        if(variable.focusState)
+          -attrs["[focusState]"]=variable.focusState+"";
+      div('class'='farris-input-wrap')
+        farris-checkboxgroup(id=variable.replacedId "input-end-edit"
+          '(setCheckboxData)'=variable.setCheckboxData?variable.setCheckboxData+"":undefined
+          '(changeValue)'=variable.changeValue?variable.changeValue+"":undefined
+          '[disable]'!=variable.readonly?variable.readonlyPipeSuffix?""+variable.readonly.value+variable.readonlyPipeSuffix:""+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
+          '[inputAppendScene]'=variable.inputAppendScene?"'"+variable.inputAppendScene+"'":undefined
+          '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined
+          '[inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined
+          '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined
+          '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined
+          '[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined)&attributes(attrs)
+        if (variable.needValid && variable.binding && variable.binding.path)
+          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
+          validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
+        div(class="farris-feedback")
+        if(variable.isTextArea)
+          -var areaAttrs = {};
+          if(variable.readonly && variable.readonly.isComposite)
+            -areaAttrs["*ngIf"]=variable.readonly.value;
+          else
+            -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
+          if (variable.binding && variable.binding.type == 'Variable')
+            -areaAttrs['[(ngModel)]'] = variable.binding.value;
+            -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+          else
+            -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+          farris-text('[type]'="'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
+            '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined
+            '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined
+            '[inputAppendControlType]'=variable.enableAppend?"'StaticText'":undefined
+            '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined
+            '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined
+            '[inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined
+            '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined
+            '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined)&attributes(areaAttrs)
+      if(variable.titleTipsTemplate)
+        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+          i(class="f-icon f-icon-description-tips")
+        -var tipsAttrs= {};
+        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+        ng-template()&attributes(tipsAttrs)
+          | !{variable.titleTipsTemplate}
+

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

@@ -1,72 +1,112 @@
-//- -var variable={enumData:[{"a":"a"}],require: "true"};
-
--var holdPlaceOuterAttrs = {};
--var holdPlaceInnerAttrs = {};
--var holdPlaceEmptyAttrs = {};
-if(variable.holdPlace)
-  -holdPlaceInnerAttrs["*ngIf"]=variable.visible?variable.visible.value+'':undefined;
-  -holdPlaceEmptyAttrs['*ngIf']=variable.visible ?'!'+variable.visible.value+'':undefined;  
-else
-  -holdPlaceOuterAttrs["*ngIf"]=variable.visible ?variable.visible.value+'':undefined;
-div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )&attributes(holdPlaceOuterAttrs)
-  if(variable.holdPlace)
-    div(class="f-empty-input-placeholder")&attributes(holdPlaceEmptyAttrs)
-  div(class="farris-group-wrap")&attributes(holdPlaceInnerAttrs)
-    div(class="form-group farris-form-group" '[ngClass]'="{'form-group--has-tips':"+(variable.enableTitleTips?variable.enableTitleTips:false)+"}")
-      if (variable.title)
-        -var titleValue=variable.isStaticTitle?("'" + variable.resourceId + "'|lang:lang:'"+variable.defaultI18nValue+"'"):variable.dynamicTitleValue;
-        if(variable.linkedLabelEnabled)
-          label(class="col-form-label f-pretend-link f-cursor-pointer" title="{{"+titleValue+"}}" for=variable.replacedId  '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined  '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
-            if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
-            span(class="farris-label-text") {{#{titleValue}}}
-        else
-          label(class="col-form-label" title="{{"+titleValue+"}}" for=variable.replacedId   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
-            if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
-            span(class="farris-label-text") {{#{titleValue}}}
-      div(class="farris-input-wrap")
-        -var attrs = {};
-        if (variable.binding && variable.binding.type == 'Variable')
-          -attrs['[(UIStateBinding)]'] = variable.binding.value;
-          -attrs['name'] = variable.replacedId;
-        else
-          -attrs['formControlName'] = (variable.binding && variable.binding.path);
-        if (variable.valueChanged)
-          -attrs['(valueChange)'] = variable.valueChanged + '';
-        if (variable.readonly)
-          -attrs['[readonly]'] = variable.readonly.value+"";
-        if(variable.isTextArea)
-          if(variable.readonly && variable.readonly.isComposite)
-            -attrs["*ngIf"]="!"+variable.readonly.value;
-          else
-            -attrs["*ngIf"]="viewModel.stateMachine['editable']";
-        -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
-        if(variable.hasDefaultFocus)
-          -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 'comboListRef' '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   '[showDisabledItem]'=variable.showDisabledItem?""+variable.showDisabledItem.value:undefined)&attributes(attrs)
-        if (variable.needValid && variable.binding && variable.binding.path)
-          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-          validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
-        div(class="farris-feedback")
-        if(variable.isTextArea)
-          -var areaAttrs = {};
-          if(variable.readonly && variable.readonly.isComposite)
-            -areaAttrs["*ngIf"]=variable.readonly.value;
-          else
-            -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
-          if (variable.binding && variable.binding.type == 'Variable')
-            -areaAttrs['[(ngModel)]'] = variable.binding.value;
-            -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-          else
-            -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-          farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang?variable.enumDataLang:undefined '[valueField]'=variable.idField?"'"+variable.idField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined  '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined  '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
-      if(variable.titleTipsTemplate)
-        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-          i(class="f-icon f-icon-description-tips")
-        -var tipsAttrs= {};
-        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-        ng-template()&attributes(tipsAttrs)
+//- -var variable={enumData:[{"a":"a"}],require: "true"};
+
+-var holdPlaceOuterAttrs = {};
+-var holdPlaceInnerAttrs = {};
+-var holdPlaceEmptyAttrs = {};
+if(variable.holdPlace)
+  -holdPlaceInnerAttrs["*ngIf"]=variable.visible?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
+  -holdPlaceEmptyAttrs['*ngIf']=variable.visible ?'!'+variable.visible.value+variable.visiblePipeSuffix+'':undefined;  
+else
+  -holdPlaceOuterAttrs["*ngIf"]=variable.visible ?variable.visiblePipeSuffix?variable.visible.value+variable.visiblePipeSuffix+'':variable.visible.value+'':undefined;
+div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  )&attributes(holdPlaceOuterAttrs)
+  if(variable.holdPlace)
+    div(class="f-empty-input-placeholder")&attributes(holdPlaceEmptyAttrs)
+  div(class="farris-group-wrap")&attributes(holdPlaceInnerAttrs)
+    div(class="form-group farris-form-group" '[ngClass]'="{'form-group--has-tips':"+(variable.enableTitleTips?variable.enableTitleTips:false)+"}")
+      if (variable.title)
+        -var titleValue=variable.isStaticTitle?("'" + variable.resourceId + "'|lang:lang:'"+variable.defaultI18nValue+"'"):variable.dynamicTitleValue;
+        if(variable.linkedLabelEnabled)
+          label(class="col-form-label f-pretend-link f-cursor-pointer" title="{{"+titleValue+"}}" for=variable.replacedId  '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined  '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
+            if (variable.require)
+              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+            span(class="farris-label-text") {{#{titleValue}}}
+        else
+          label(class="col-form-label" title="{{"+titleValue+"}}" for=variable.replacedId   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
+            if (variable.require)
+              span(class="farris-label-info text-danger"  "*ngIf"=variable.requirePipeSuffix?""+variable.require.value+variable.requirePipeSuffix:""+variable.require.value) *
+            span(class="farris-label-text") {{#{titleValue}}}
+      div(class="farris-input-wrap")
+        -var attrs = {};
+        if (variable.binding && variable.binding.type == 'Variable')
+          -attrs['[(UIStateBinding)]'] = variable.binding.value;
+          -attrs['name'] = variable.replacedId;
+        else
+          -attrs['formControlName'] = (variable.binding && variable.binding.path);
+        if (variable.valueChanged)
+          -attrs['(valueChange)'] = variable.valueChanged + '';
+        if (variable.readonly)
+          -attrs['[readonly]'] = variable.readonlyPipeSuffix?variable.readonly.value+variable.readonlyPipeSuffix+"":variable.readonly.value+"";
+        if(variable.isTextArea)
+          if(variable.readonly && variable.readonly.isComposite)
+            -attrs["*ngIf"]="!"+variable.readonly.value;
+          else
+            -attrs["*ngIf"]="viewModel.stateMachine['editable']";
+        -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
+        if(variable.hasDefaultFocus)
+          -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
+          'comboListRef' '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
+          '[showDisabledItem]'=variable.showDisabledItem?""+variable.showDisabledItem.value:undefined
+          '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined
+          '[inputAppendScene]'=variable.inputAppendScene?"'"+variable.inputAppendScene+"'":undefined
+          '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined
+          '[inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined
+          '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined
+          '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined
+          '[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined)&attributes(attrs)
+        if (variable.needValid && variable.binding && variable.binding.path)
+          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
+          validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
+        div(class="farris-feedback")
+        if(variable.isTextArea)
+          -var areaAttrs = {};
+          if(variable.readonly && variable.readonly.isComposite)
+            -areaAttrs["*ngIf"]=variable.readonly.value;
+          else
+            -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
+          if (variable.binding && variable.binding.type == 'Variable')
+            -areaAttrs['[(ngModel)]'] = variable.binding.value;
+            -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+          else
+            -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+          farris-text('[type]'="'enum'" '[data]'!=variable.enumDataLang?variable.enumDataLang:undefined
+            '[valueField]'=variable.idField?"'"+variable.idField+"'":undefined
+            '[textField]'=variable.textField?"'"+variable.textField+"'":undefined
+            '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined
+            '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined
+            '[inputAppendControlType]'=variable.enableAppend?"'StaticText'":undefined
+            '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined
+            '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined
+            '[inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined
+            '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined
+            '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined)&attributes(areaAttrs)
+      if(variable.titleTipsTemplate)
+        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+          i(class="f-icon f-icon-description-tips")
+        -var tipsAttrs= {};
+        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+        ng-template()&attributes(tipsAttrs)
           | !{variable.titleTipsTemplate}