@farris/jit-engine 1.3.351 → 1.3.352

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)

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

@@ -1,67 +1,67 @@
-
--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['[(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+"";
-        kendo-switch(id=variable.replacedId "input-end-edit" class="form-control k-widget k-switch" '[disabled]'!=variable.disable?variable.disable:undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined  '[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.isTextArea)
-          -var areaAttrs = {};
-          if(variable.readonly && variable.readonly.isComposite)
-            -areaAttrs["*ngIf"]=variable.readonly.value;
-          else
-            -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
-          if (variable.binding && variable.binding.type == 'Variable')
-            -areaAttrs['[(ngModel)]'] = variable.binding.value;
-            -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
-          else
-            -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
-          farris-text('[type]'="'string'" '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
-      if(variable.titleTipsTemplate)
-        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
-          i(class="f-icon f-icon-description-tips")
-        -var tipsAttrs= {};
-        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
-        ng-template()&attributes(tipsAttrs)
-          | !{variable.titleTipsTemplate}
+
+-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['[(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+"";
+        kendo-switch(id=variable.replacedId "input-end-edit" class="form-control k-widget k-switch" '[disabled]'!=variable.disable?variable.disable:undefined '[class.f-state-readonly]'=variable.readonly?variable.readonly.value+"":undefined  '[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.isTextArea)
+          -var areaAttrs = {};
+          if(variable.readonly && variable.readonly.isComposite)
+            -areaAttrs["*ngIf"]=variable.readonly.value;
+          else
+            -areaAttrs["*ngIf"]="!viewModel.stateMachine['editable']";
+          if (variable.binding && variable.binding.type == 'Variable')
+            -areaAttrs['[(ngModel)]'] = variable.binding.value;
+            -areaAttrs['[ngModelOptions]'] = "{standalone:true}";
+          else
+            -areaAttrs['formControlName'] = (variable.binding && variable.binding.path);
+          farris-text('[type]'="'string'" '[autoSize]'=variable.autoHeight?""+variable.autoHeight.value:undefined '[maxHeight]'=variable.maxHeight?""+variable.maxHeight:undefined )&attributes(areaAttrs)
+      if(variable.titleTipsTemplate)
+        span(class="farris-label-tips" farrisTooltip [content]=variable.titleTipsTemplateName?""+variable.titleTipsTemplateName:undefined)
+          i(class="f-icon f-icon-description-tips")
+        -var tipsAttrs= {};
+        -tipsAttrs['#'+variable.titleTipsTemplateName] = "";
+        ng-template()&attributes(tipsAttrs)
+          | !{variable.titleTipsTemplate}

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

@@ -1,4 +1,4 @@
-//- -var variable={id:'id',contents:[{contentTemplate:'<div>'},{}]};
-
-kendo-tabstrip(id=variable.replacedId '[keepTabContent]'="true" class=(variable.appearance && variable.appearance.class)   )
+//- -var variable={id:'id',contents:[{contentTemplate:'<div>'},{}]};
+
+kendo-tabstrip(id=variable.replacedId '[keepTabContent]'="true" class=(variable.appearance && variable.appearance.class)   )
  | {{content}}

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

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