@farris/jit-engine 1.3.294 → 1.3.296

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

@@ -1,69 +1,94 @@
-//- -var variable={title:"title",contents:[{id:"id",title:"c"},{id:"id",title:"c"}]};
-
--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-radiogroup(id=variable.replacedId?""+variable.replacedId:undefined "input-end-edit" '[disabled]'!=variable.readonly?""+variable.readonly.value:undefined '[horizontal]'= ""+variable.isHorizontal+"" '[data]'=variable.enumDataLang?""+variable.enumDataLang:undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined   '(setRadioData)'=variable.setRadioData?""+variable.setRadioData:undefined     '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined '[textField]'=variable.textField?"'"+variable.textField+"'":undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&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.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 variable={title:"title",contents:[{id:"id",title:"c"},{id:"id",title:"c"}]};
+
+-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-radiogroup(id=variable.replacedId?""+variable.replacedId:undefined "input-end-edit"
+          '[disabled]'!=variable.readonly?variable.readonlyPipeSuffix?""+variable.readonly.value+variable.readonlyPipeSuffix:""+variable.readonly.value:undefined '[horizontal]'= ""+variable.isHorizontal+""
+          '[data]'=variable.enumDataLang?""+variable.enumDataLang:undefined
+          '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
+          '(setRadioData)'=variable.setRadioData?""+variable.setRadioData:undefined
+          '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined
+          '[textField]'=variable.textField?"'"+variable.textField+"'":undefined
+          '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined
+          'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined
+          '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined
+          '[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.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/richtextbox.pug

@@ -1,54 +1,54 @@
--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 col-form-label-multi 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 col-form-label-multi" 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['[(ngModel)]'] = variable.binding.value;
-          -attrs['name'] = variable.replacedId;
-          -attrs['[ngModelOptions]'] = "{standalone:true}";
-        else
-          -attrs['formControlName'] = (variable.binding && variable.binding.path);
-
-        -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
-
-        if(variable.hasDefaultFocus)
-          -attrs["farris-set-focus"]="";
-          if(variable.focusState)
-            -attrs["[focusState]"]=variable.focusState+"";
-        farris-html-editor(id=variable.replacedId "html-editor-end-edit" class="form-control" "htmlEditorRef"  '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[value]'=variable.value?variable.value:undefined  '[format]'=variable.format?"'"+variable.format+"'":undefined '[theme]'=variable.theme?"'"+variable.theme+"'":undefined  '[maxLength]'=variable.maxLength?"'"+variable.maxLength+"'":undefined '[minLength]'=variable.minLength?"'"+variable.minLength+"'":undefined  '[required]'=variable.require?""+variable.require.value:undefined  '[customToolbarPosition]'=variable.customToolbarPosition?"'"+variable.customToolbarPosition+"'":undefined  '(onEditorCreated)'=variable.onEditorCreated?variable.onEditorCreated+"(param)":undefined '(onContentChanged)'=variable.onContentChanged?variable.onContentChanged+"(param)":undefined  '(onSelectionChanged)'=variable.onSelectionChanged?variable.onSelectionChanged+"":undefined  '(onFocus)'=variable.onFocus?variable.onFocus+"(param)":undefined  '(onBlur)'=variable.onBlur?variable.onBlur+"(param)":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[styles]'=variable.customEditorStyle?""+variable.customEditorStyle:undefined   '[showBorder]'=(variable.isTextArea ||variable.isTextArea==false)?""+variable.isTextArea:undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  '[customToolbar]'=variable.customToolbar?""+variable.customToolbar.value:undefined   '[toolbar]'=variable.toolbar?variable.toolbar:undefined  '[maxHeight]'=(variable.maxHeight||variable.maxHeight==0)?""+variable.maxHeight:undefined
-                            '[limitImageSize]'=variable.limitImageSize?""+variable.limitImageSize.value:undefined  '[maxImgSize]'=variable.maxImgSize?""+variable.maxImgSize:undefined 
-                          )&attributes(attrs)
-        if (variable.needValid && variable.binding && variable.binding.path)
-          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-          validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
-        div(class="farris-feedback")
-      if(variable.titleTipsTemplate)
-        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-          i(class="f-icon f-icon-description-tips")
-        -var tipsAttrs= {};
-        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-        ng-template()&attributes(tipsAttrs)
+-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 col-form-label-multi 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 col-form-label-multi" 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['[(ngModel)]'] = variable.binding.value;
+          -attrs['name'] = variable.replacedId;
+          -attrs['[ngModelOptions]'] = "{standalone:true}";
+        else
+          -attrs['formControlName'] = (variable.binding && variable.binding.path);
+
+        -attrs['placeholder'] = "{{'" + variable.placeHolderResourceId + "'|lang:lang:'"+variable.placeHolder+"'}}";
+
+        if(variable.hasDefaultFocus)
+          -attrs["farris-set-focus"]="";
+          if(variable.focusState)
+            -attrs["[focusState]"]=variable.focusState+"";
+        farris-html-editor(id=variable.replacedId "html-editor-end-edit" class="form-control" "htmlEditorRef"  '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?variable.readonlyPipeSuffix?variable.readonly.value+variable.readonlyPipeSuffix+"":variable.readonly.value+"":undefined '[value]'=variable.value?variable.value:undefined  '[format]'=variable.format?"'"+variable.format+"'":undefined '[theme]'=variable.theme?"'"+variable.theme+"'":undefined  '[maxLength]'=variable.maxLength?"'"+variable.maxLength+"'":undefined '[minLength]'=variable.minLength?"'"+variable.minLength+"'":undefined  '[required]'=variable.require?""+variable.require.value:undefined  '[customToolbarPosition]'=variable.customToolbarPosition?"'"+variable.customToolbarPosition+"'":undefined  '(onEditorCreated)'=variable.onEditorCreated?variable.onEditorCreated+"(param)":undefined '(onContentChanged)'=variable.onContentChanged?variable.onContentChanged+"(param)":undefined  '(onSelectionChanged)'=variable.onSelectionChanged?variable.onSelectionChanged+"":undefined  '(onFocus)'=variable.onFocus?variable.onFocus+"(param)":undefined  '(onBlur)'=variable.onBlur?variable.onBlur+"(param)":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[styles]'=variable.customEditorStyle?""+variable.customEditorStyle:undefined   '[showBorder]'=(variable.isTextArea ||variable.isTextArea==false)?""+variable.isTextArea:undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  '[customToolbar]'=variable.customToolbar?""+variable.customToolbar.value:undefined   '[toolbar]'=variable.toolbar?variable.toolbar:undefined  '[maxHeight]'=(variable.maxHeight||variable.maxHeight==0)?""+variable.maxHeight:undefined
+                            '[limitImageSize]'=variable.limitImageSize?""+variable.limitImageSize.value:undefined  '[maxImgSize]'=variable.maxImgSize?""+variable.maxImgSize:undefined 
+                          )&attributes(attrs)
+        if (variable.needValid && variable.binding && variable.binding.path)
+          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
+          validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
+        div(class="farris-feedback")
+      if(variable.titleTipsTemplate)
+        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+          i(class="f-icon f-icon-description-tips")
+        -var tipsAttrs= {};
+        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+        ng-template()&attributes(tipsAttrs)
           | !{variable.titleTipsTemplate}

package/lib/template/ui/kendo/scroll-collapse-area.pug

@@ -1,3 +1,3 @@
-fe-collapsible-area(id=variable.replacedId?""+variable.replacedId:undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[defaultCollapse]'=variable.expanded?"!"+variable.expanded.value:undefined)
-  if(variable.contentTemplate)
+fe-collapsible-area(id=variable.replacedId?""+variable.replacedId:undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '[defaultCollapse]'=variable.expanded?"!"+variable.expanded.value:undefined)
+  if(variable.contentTemplate)
     | !{variable.contentTemplate}

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

@@ -1,32 +1,45 @@
--var attrs = {};
-if (variable.isScrollSpyItem)
-  -attrs['[fScrollSpy]'] = "'"+variable.replacedId+"'"; 
-if(variable.includeInLoopContainer)
-  -attrs['[context]'] = "row"; 
-farris-section(id=variable.replacedId?""+variable.replacedId:undefined '[index]'="index" class=(variable.appearance && variable.appearance.class)  '[expandStatus]'=(variable.expanded || variable.expanded==false)?""+variable.expanded:undefined  style=(variable.appearance && variable.appearance.style) '[contentCls]'!=variable.contentCls?"'"+variable.contentCls+"'":undefined '[mainTitle]'!=variable.mainTitleLang?""+variable.mainTitleLang:undefined  '[subTitle]'!=variable.subTitleLang?""+variable.subTitleLang:undefined      '[fill]'=(variable.fill||variable.fill==false)?variable.fill+"":undefined  '[showHeader]'=(variable.showHeader||variable.showHeader==false)?variable.showHeader+'':undefined '[enableMaximize]'=(variable.enableMaximize||variable.enableMaximize==false)?variable.enableMaximize+'':undefined  '[enableAccordion]'=variable.enableAccordion?"'"+variable.enableAccordion+"'":undefined   '*ngIf'!=variable.visible ?variable.visible.value+"":undefined  '[btnStates]'=variable.toolbarStatesName?""+variable.toolbarStatesName:undefined 'sectionRef' '[btnVisible]'=variable.toolbarVisibleName?""+variable.toolbarVisibleName:undefined  '[toolbar]'=variable.toolbarName?""+variable.toolbarName:undefined)&attributes(attrs)
-  if(variable.farrisSectionHeader)
-    ng-template(farrisSectionHeader '[headerCls]'!=variable.headerCls?"'"+variable.headerCls+"'":undefined )
-      | !{variable.farrisSectionHeader}
-  if(variable.farrisSectionTitle )
-    ng-template(farrisSectionTitle 'let-index'="index" '[titleCls]'!=variable.titleCls?"'"+variable.titleCls+"'":undefined )
-      | !{variable.farrisSectionTitle}
-  if(variable.farrisSectionHcontent)
-    ng-template(farrisSectionHcontent  '[hcontentCls]'!=variable.hcontentCls?"'"+variable.hcontentCls+"'":undefined )
-      |  !{variable.farrisSectionHcontent}
-  if(variable.farrisSectionToolbar)
-    ng-template(farrisSectionToolbar  '[toolbarCls]'!=variable.toolbarCls?"'"+variable.toolbarCls+"'":undefined )
-      | !{variable.farrisSectionToolbar}
-  if(variable.farrisSectionExtend  )
-    ng-template(farrisSectionExtend '[extendCls]'!=variable.extendCls?"'"+variable.extendCls+"'":undefined)
-      | !{variable.farrisSectionExtend}
-  if(variable.viewsDom)
-    ng-template(farrisSectionViewChange )
-      | !{variable.viewsDom}
-  = '\n'
-  | {{content}}
-  = '\n'
-
-- for(var i = 0; i < variable.templateArray.length; i++ )
-  |<ng-template #{'#' + variable.templateArray[i].templateName} let-ctx>
-  |!{variable.templateArray[i].templateContent}
+-var attrs = {};
+if (variable.isScrollSpyItem)
+  -attrs['[fScrollSpy]'] = "'"+variable.replacedId+"'"; 
+if(variable.includeInLoopContainer)
+  -attrs['[context]'] = "row"; 
+farris-section(id=variable.replacedId?""+variable.replacedId:undefined '[index]'="index"
+  class=(variable.appearance && variable.appearance.class)
+  '[expandStatus]'=(variable.expanded || variable.expanded==false)?""+variable.expanded:undefined
+  style=(variable.appearance && variable.appearance.style) '[contentCls]'!=variable.contentCls?"'"+variable.contentCls+"'":undefined
+  '[mainTitle]'!=variable.mainTitleLang?""+variable.mainTitleLang:undefined
+  '[subTitle]'!=variable.subTitleLang?""+variable.subTitleLang:undefined
+  '[fill]'=(variable.fill||variable.fill==false)?variable.fill+"":undefined
+  '[showHeader]'=(variable.showHeader||variable.showHeader==false)?variable.showHeader+'':undefined
+  '[enableMaximize]'=(variable.enableMaximize||variable.enableMaximize==false)?variable.enableMaximize+'':undefined
+  '[enableAccordion]'=variable.enableAccordion?"'"+variable.enableAccordion+"'":undefined
+  '*ngIf'!=variable.visible ?variable.visible.value+"":undefined
+  '[btnStates]'=variable.toolbarStatesName?variable.disableSecPipeSuffix?""+variable.toolbarStatesName+variable.disableSecPipeSuffix:""+variable.toolbarStatesName:undefined 'sectionRef'
+  '[btnVisible]'=variable.toolbarVisibleName?variable.visibleSecPipeSuffix?""+variable.toolbarVisibleName+variable.visibleSecPipeSuffix:""+variable.toolbarVisibleName:undefined
+  '[toolbar]'=variable.toolbarName?""+variable.toolbarName:undefined)&attributes(attrs)
+  if(variable.farrisSectionHeader)
+    ng-template(farrisSectionHeader '[headerCls]'!=variable.headerCls?"'"+variable.headerCls+"'":undefined )
+      | !{variable.farrisSectionHeader}
+  if(variable.farrisSectionTitle )
+    ng-template(farrisSectionTitle 'let-index'="index" '[titleCls]'!=variable.titleCls?"'"+variable.titleCls+"'":undefined )
+      | !{variable.farrisSectionTitle}
+  if(variable.farrisSectionHcontent)
+    ng-template(farrisSectionHcontent  '[hcontentCls]'!=variable.hcontentCls?"'"+variable.hcontentCls+"'":undefined )
+      |  !{variable.farrisSectionHcontent}
+  if(variable.farrisSectionToolbar)
+    ng-template(farrisSectionToolbar  '[toolbarCls]'!=variable.toolbarCls?"'"+variable.toolbarCls+"'":undefined )
+      | !{variable.farrisSectionToolbar}
+  if(variable.farrisSectionExtend  )
+    ng-template(farrisSectionExtend '[extendCls]'!=variable.extendCls?"'"+variable.extendCls+"'":undefined)
+      | !{variable.farrisSectionExtend}
+  if(variable.viewsDom)
+    ng-template(farrisSectionViewChange )
+      | !{variable.viewsDom}
+  = '\n'
+  | {{content}}
+  = '\n'
+
+- for(var i = 0; i < variable.templateArray.length; i++ )
+  |<ng-template #{'#' + variable.templateArray[i].templateName} let-ctx>
+  |!{variable.templateArray[i].templateContent}
   |</ng-template>

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

@@ -1,47 +1,47 @@
-
--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;
--var attrs = {};
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-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")
-        if (variable.mulitSelect)
-          kendo-multiselect(id=variable.replacedId "input-end-edit" class="form-control k-widget k-multiselect k-header" '[data]'=variable.dataSource?variable.dataSource:undefined '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&attributes(attrs)
-        else
-          kendo-dropdownlist(id=variable.replacedId "input-end-edit" class="form-control k-widget k-dropdown k-header" '[data]'=variable.dataSource?variable.dataSource:undefined '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&attributes(attrs)
-        if (variable.needValid && variable.binding && variable.binding.path)
-          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-          validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
-        div(class="farris-feedback")
-      if(variable.titleTipsTemplate)
-        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-          i(class="f-icon f-icon-description-tips")
-        -var tipsAttrs= {};
-        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-        ng-template()&attributes(tipsAttrs)
+
+-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;
+-var attrs = {};
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
+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")
+        if (variable.mulitSelect)
+          kendo-multiselect(id=variable.replacedId "input-end-edit" class="form-control k-widget k-multiselect k-header" '[data]'=variable.dataSource?variable.dataSource:undefined '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&attributes(attrs)
+        else
+          kendo-dropdownlist(id=variable.replacedId "input-end-edit" class="form-control k-widget k-dropdown k-header" '[data]'=variable.dataSource?variable.dataSource:undefined '[disabled]'!=variable.disable?variable.disable:undefined '[readonly]'!=variable.readonly?variable.readonly.value+"":undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined  )&attributes(attrs)
+        if (variable.needValid && variable.binding && variable.binding.path)
+          -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
+          validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
+        div(class="farris-feedback")
+      if(variable.titleTipsTemplate)
+        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+          i(class="f-icon f-icon-description-tips")
+        -var tipsAttrs= {};
+        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+        ng-template()&attributes(tipsAttrs)
           | !{variable.titleTipsTemplate}

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

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