@farris/jit-engine 1.3.230-dev → 1.3.231

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

@@ -69,7 +69,6 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
             '[cascadeCheck]'=variable.cascadeCheck?""+variable.cascadeCheck.value:undefined
             '[cascadeDown]'=variable.cascadeDown?""+variable.cascadeDown.value:undefined
             '[cascadeUp]'=variable.cascadeUp?""+variable.cascadeUp.value:undefined
-            '[orgNameType]'=variable.displayType?"'"+variable.displayType.value+"'":undefined
             "[formatFn]"=variable.formatterName?""+variable.formatterName:undefined
             '(inputClear)'!=variable.inputClear?variable.inputClear+"":undefined
             'tab-index'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined 

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

@@ -1,40 +1,40 @@
-farris-appointment-calendar(id=variable.replacedId  farris-appointment-calendar-binding
-class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) 
-'[url]'=variable.placeDataSourceUrl?"'"+variable.placeDataSourceUrl+"'":undefined
-'[method]'=variable.placeDataSourceUrlType?"'"+variable.placeDataSourceUrlType+"'":undefined
-'[viewType]'=variable.viewType?"'"+variable.viewType+"'":undefined
-'[placeTitle]'=""+variable.placeTitleLangName
-'[placeNameField]'=variable.placeNameField?"'"+variable.placeNameField+"'":undefined
-'[placeIdField]'=variable.placeIdField?"'"+variable.placeIdField+"'":undefined
-'[reserveInfoFields]'!=variable.reserveInfoFieldsString? ""+variable.reserveInfoFieldsString:undefined
-'[rowHeight]'=(variable.rowHeight || variable.rowHeight==0)?""+variable.rowHeight:undefined
-
-'[placeNameWidth]'=(variable.placeNameWidth || variable.placeNameWidth==0)?""+variable.placeNameWidth:undefined
-'[weekRowHeight]'=(variable.weekRowHeight || variable.weekRowHeight ==0)?""+variable.weekRowHeight:undefined 
-'[weekCellWidth]'=(variable.weekCellWidth ||variable.weekCellWidth==0)?""+variable.weekCellWidth:undefined 
-'[reservationTitle]'=variable.reservationTitleLangName?""+variable.reservationTitleLangName:undefined
-'[placeNameTemplate]'=variable.placeNameTemplateName?""+variable.placeNameTemplateName:undefined
-'[contentTemplate]'=variable.contentTemplateName?""+variable.contentTemplateName:undefined
-'[detailBadgeTemplate]'=variable.detailBadgeTemplateName?""+variable.detailBadgeTemplateName:undefined
-'[detailCls]'=variable.detailClsName?""+variable.detailClsName:undefined
-'[dayViewCls]'=variable.dayViewClsName?""+variable.dayViewClsName:undefined
-'[detailColumns]'=variable.detailColumnsLang?""+variable.detailColumnsLang:undefined
-'(filterChange)'=variable.filterChange?""+variable.filterChange:undefined 
-'(selectChange)'=variable.selectChange?""+variable.selectChange:undefined
-'(reservation)'=variable.reservation?""+variable.reservation:undefined
-'(editHandler)'=variable.editHandler?""+variable.editHandler:undefined
-'(removeHandler)'=variable.removeHandler?""+variable.removeHandler:undefined
-'*ngIf'=variable.visible?""+variable.visible.value:undefined
-)
-if(variable.placeNameTemplate && variable.placeNameTemplateHtml)
-  | <ng-template #{'#'+variable.placeNameTemplateName} let-ctx let-item="item">
-  | !{variable.placeNameTemplateHtml}
-  | </ng-template>
-if(variable.contentTemplate && variable.contentTemplateHtml)
-  | <ng-template #{'#'+variable.contentTemplateName} let-ctx let-item="item">
-  | !{variable.contentTemplateHtml}
-  | </ng-template>
-if(variable.detailBadgeTemplate && variable.detailBadgeTemplateHtml)
-  | <ng-template #{'#'+variable.detailBadgeTemplateName} let-ctx let-item="item">
-  | !{variable.detailBadgeTemplateHtml}
+farris-appointment-calendar(id=variable.replacedId  farris-appointment-calendar-binding
+class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) 
+'[url]'=variable.placeDataSourceUrl?"'"+variable.placeDataSourceUrl+"'":undefined
+'[method]'=variable.placeDataSourceUrlType?"'"+variable.placeDataSourceUrlType+"'":undefined
+'[viewType]'=variable.viewType?"'"+variable.viewType+"'":undefined
+'[placeTitle]'=""+variable.placeTitleLangName
+'[placeNameField]'=variable.placeNameField?"'"+variable.placeNameField+"'":undefined
+'[placeIdField]'=variable.placeIdField?"'"+variable.placeIdField+"'":undefined
+'[reserveInfoFields]'!=variable.reserveInfoFieldsString? ""+variable.reserveInfoFieldsString:undefined
+'[rowHeight]'=(variable.rowHeight || variable.rowHeight==0)?""+variable.rowHeight:undefined
+
+'[placeNameWidth]'=(variable.placeNameWidth || variable.placeNameWidth==0)?""+variable.placeNameWidth:undefined
+'[weekRowHeight]'=(variable.weekRowHeight || variable.weekRowHeight ==0)?""+variable.weekRowHeight:undefined 
+'[weekCellWidth]'=(variable.weekCellWidth ||variable.weekCellWidth==0)?""+variable.weekCellWidth:undefined 
+'[reservationTitle]'=variable.reservationTitleLangName?""+variable.reservationTitleLangName:undefined
+'[placeNameTemplate]'=variable.placeNameTemplateName?""+variable.placeNameTemplateName:undefined
+'[contentTemplate]'=variable.contentTemplateName?""+variable.contentTemplateName:undefined
+'[detailBadgeTemplate]'=variable.detailBadgeTemplateName?""+variable.detailBadgeTemplateName:undefined
+'[detailCls]'=variable.detailClsName?""+variable.detailClsName:undefined
+'[dayViewCls]'=variable.dayViewClsName?""+variable.dayViewClsName:undefined
+'[detailColumns]'=variable.detailColumnsLang?""+variable.detailColumnsLang:undefined
+'(filterChange)'=variable.filterChange?""+variable.filterChange:undefined 
+'(selectChange)'=variable.selectChange?""+variable.selectChange:undefined
+'(reservation)'=variable.reservation?""+variable.reservation:undefined
+'(editHandler)'=variable.editHandler?""+variable.editHandler:undefined
+'(removeHandler)'=variable.removeHandler?""+variable.removeHandler:undefined
+'*ngIf'=variable.visible?""+variable.visible.value:undefined
+)
+if(variable.placeNameTemplate && variable.placeNameTemplateHtml)
+  | <ng-template #{'#'+variable.placeNameTemplateName} let-ctx let-item="item">
+  | !{variable.placeNameTemplateHtml}
+  | </ng-template>
+if(variable.contentTemplate && variable.contentTemplateHtml)
+  | <ng-template #{'#'+variable.contentTemplateName} let-ctx let-item="item">
+  | !{variable.contentTemplateHtml}
+  | </ng-template>
+if(variable.detailBadgeTemplate && variable.detailBadgeTemplateHtml)
+  | <ng-template #{'#'+variable.detailBadgeTemplateName} let-ctx let-item="item">
+  | !{variable.detailBadgeTemplateHtml}
   | </ng-template>

package/lib/template/ui/kendo/approval-comments.pug

@@ -1,13 +1,13 @@
-//- -var variable = {
-//-     id:'id',
-//-     sortOrder: 'time',
-//-     procInstId: '',
-//-     dispalyeType: 'card'
-//-     domains: [{domainName: '域名称',domainCode: '域编号',activityDefinedIds:'idList'}]
-//- }
-farris-approval-comments(
-    id=variable.replacedId
-    '[sortOrder]'=variable.sortOrder?""+variable.sortOrder:undefined
-    '[procInstId]'=variable.procInstId?""+variable.procInstId:undefined
-    '[displayType]'=variable.displayType?""+variable.displayType:undefined
+//- -var variable = {
+//-     id:'id',
+//-     sortOrder: 'time',
+//-     procInstId: '',
+//-     dispalyeType: 'card'
+//-     domains: [{domainName: '域名称',domainCode: '域编号',activityDefinedIds:'idList'}]
+//- }
+farris-approval-comments(
+    id=variable.replacedId
+    '[sortOrder]'=variable.sortOrder?""+variable.sortOrder:undefined
+    '[procInstId]'=variable.procInstId?""+variable.procInstId:undefined
+    '[displayType]'=variable.displayType?""+variable.displayType:undefined
     '[domains]'!=variable.domains?variable.domains:undefined)

package/lib/template/ui/kendo/approve-logs.pug

@@ -1 +1 @@
-wf-approval-logs(id=variable.replacedId '[ProcInstId]'=variable.procInstId?""+variable.procInstId:undefined '[displayType]'=variable.card?""+variable.datagrid:undefined)
+wf-approval-logs(id=variable.replacedId '[ProcInstId]'=variable.procInstId?""+variable.procInstId:undefined '[displayType]'=variable.card?""+variable.datagrid:undefined)

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

@@ -1,10 +1,10 @@
-//- -var variable = {id:'id', appearance: {class: "btn btn-sm btn-default", style: "color: red"}, click: "rootViewmodel.detailFormComponentViewmodel.edit1", text: "新增", icon: "material-icons align-middle",disable:""}
--var attrs = {};
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-button(id=variable.replacedId class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '(click)'=variable.click?variable.click:undefined '[disabled]'!=variable.disable?variable.disable.toString():undefined '*ngIf'!=variable.visible?variable.visible.value+'':undefined  tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[style.height]'=(variable.size && variable.size.height)?"'"+variable.size.height+"px'":undefined)&attributes(attrs)
-  if(variable.icon)
-    span('class'=variable.icon?""+variable.icon:undefined)
-  | {{!{variable.bindingName}}}
+//- -var variable = {id:'id', appearance: {class: "btn btn-sm btn-default", style: "color: red"}, click: "rootViewmodel.detailFormComponentViewmodel.edit1", text: "新增", icon: "material-icons align-middle",disable:""}
+-var attrs = {};
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
+button(id=variable.replacedId class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '(click)'=variable.click?variable.click:undefined '[disabled]'!=variable.disable?variable.disable.toString():undefined '*ngIf'!=variable.visible?variable.visible.value+'':undefined  tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[style.height]'=(variable.size && variable.size.height)?"'"+variable.size.height+"px'":undefined)&attributes(attrs)
+  if(variable.icon)
+    span('class'=variable.icon?""+variable.icon:undefined)
+  | {{!{variable.bindingName}}}

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

@@ -1,8 +1,8 @@
-//- -var variable={contents: [{text: 'add',icon: 'folder',click:'onButtonClick()'},{text: 'add',icon: 'folder',click:'onButtonClick()'}]};
--var attrs = {};
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-div(id=variable.replacedId class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '*ngIf'!=variable.visible?variable.visible.value+'':undefined   )&attributes(attrs)
+//- -var variable={contents: [{text: 'add',icon: 'folder',click:'onButtonClick()'},{text: 'add',icon: 'folder',click:'onButtonClick()'}]};
+-var attrs = {};
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
+div(id=variable.replacedId class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) '*ngIf'!=variable.visible?variable.visible.value+'':undefined   )&attributes(attrs)
  | {{content}}

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

@@ -1,10 +1,10 @@
-//- -var variable={option: {"A":"1"}, autoResize: true, queryId: '', chartsDataSource: 'lcp',qoManagerCode:''};
--var attrs = {};
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-if (variable.chartsDataSource && variable.chartsDataSource.toLowerCase() == 'lcp')
-  div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) 'qdp-charts' 'lcpBindingData' '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined  '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined '[options]'!=variable.option '[autoResize]'="" + variable.autoResize + "" '[queryId]'=variable.queryId?"'" + variable.queryId.toString() + "'":undefined  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined)&attributes(attrs)
-else
+//- -var variable={option: {"A":"1"}, autoResize: true, queryId: '', chartsDataSource: 'lcp',qoManagerCode:''};
+-var attrs = {};
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
+if (variable.chartsDataSource && variable.chartsDataSource.toLowerCase() == 'lcp')
+  div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) 'qdp-charts' 'lcpBindingData' '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined  '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined '[options]'!=variable.option '[autoResize]'="" + variable.autoResize + "" '[queryId]'=variable.queryId?"'" + variable.queryId.toString() + "'":undefined  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined)&attributes(attrs)
+else
   div(class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) 'qdp-charts' 'lcpBindingData' '[qoManagerCode]'=variable.qoManagerCode ? "'" + variable.qoManagerCode + "'" : undefined  '[qoId]'=variable.qoId ? "'" + variable.qoId + "'" : undefined  '[queryRelativeUrl]'=variable.queryRelativeUrl?"'"+variable.queryRelativeUrl+"'":undefined '[options]'!=variable.option '[autoResize]'="" + variable.autoResize + "" '[queryId]'=variable.queryId?"'" + variable.queryId.toString() + "'":undefined  '[voId]'=variable.voId ? "'" + variable.voId + "'" : undefined)&attributes(attrs)

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

@@ -1,99 +1,99 @@
--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)
-        if(variable.isTextArea)
-          label(class="col-form-label" '*ngIf'="viewModel.stateMachine['editable']" '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined )
-            span(class="farris-label-text")
-            if (variable.require)
-              span(class="farris-label-info text-danger" "*ngIf"=""+variable.require.value) *
-        else
-          label(class="col-form-label"   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
-            span(class="farris-label-text")
-            if (variable.require)
-              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
-      div(class="farris-input-wrap")
-        if(variable.isTextArea)
-          -var divAttr = {};
-          if(variable.readonly && variable.readonly.isComposite)
-            -divAttr["*ngIf"]="!"+variable.readonly.value;
-          else
-            -divAttr["*ngIf"]="viewModel.stateMachine['editable']";
-          div(class="custom-control custom-checkbox" '[ngSwitch]'=variable.readonly?""+variable.readonly.value:undefined )&attributes(divAttr)
-            -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);
-            input(id=variable.replacedId class="custom-control-input" type="checkbox" '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '(ngModelChange)'!=variable.valueChange?"!"+variable.readonly.value+"&&"+variable.valueChange+"":undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
-            if(variable.linkedLabelEnabled)
-              label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="true" '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-              label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="false" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-            else
-              label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-              label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-            if (variable.needValid && variable.binding && variable.binding.path)
-              -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-              validationMessage('[errors]'!=`${path}`  '[hidden]'="!viewModel.form.isShowValidationMsg"  )
-        else
-          div(class="custom-control custom-checkbox" '[ngSwitch]'=variable.readonly?variable.readonly.value+"":undefined )
-            -var attrs = {};
-            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.hasDefaultFocus)
-              -attrs["farris-set-focus"]="";
-              if(variable.focusState)
-                -attrs["[focusState]"]=variable.focusState+"";
-            input(id=variable.replacedId "input-end-edit" class="custom-control-input" type="checkbox" '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '(ngModelChange)'!=variable.valueChange?"!"+variable.readonly.value+"&&"+variable.valueChange+"":undefined  tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
-            if(variable.linkedLabelEnabled)
-              label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="true" '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-              label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="false" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-            else
-              label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-              label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-            if (variable.needValid && variable.binding && variable.binding.path)
-              -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
-              validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
-      if(variable.isTextArea)
-        -var areaAttrs = {};
-        -var areaLabelAttrs = {};
-        if(variable.readonly && variable.readonly.isComposite)
-            -areaLabelAttrs["*ngIf"]=variable.readonly.value;
-            -areaAttrs["*ngIf"]=variable.readonly.value;
-        else
-            -areaLabelAttrs["*ngIf"]="!viewModel.stateMachine['editable']";        
-            -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);
-        if(variable.title)
-          -areaLabelAttrs['title'] = "viewModel.bindingData['"+ (variable.binding && variable.binding.path)+"']";
-        label(class="col-form-label"  )&attributes(areaLabelAttrs)
-          span(class="farris-label-text")
-            | {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
-        farris-text('[type]'="'boolean'" '[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)
+        if(variable.isTextArea)
+          label(class="col-form-label" '*ngIf'="viewModel.stateMachine['editable']" '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined )
+            span(class="farris-label-text")
+            if (variable.require)
+              span(class="farris-label-info text-danger" "*ngIf"=""+variable.require.value) *
+        else
+          label(class="col-form-label"   '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined)
+            span(class="farris-label-text")
+            if (variable.require)
+              span(class="farris-label-info text-danger"  "*ngIf"=""+variable.require.value) *
+      div(class="farris-input-wrap")
+        if(variable.isTextArea)
+          -var divAttr = {};
+          if(variable.readonly && variable.readonly.isComposite)
+            -divAttr["*ngIf"]="!"+variable.readonly.value;
+          else
+            -divAttr["*ngIf"]="viewModel.stateMachine['editable']";
+          div(class="custom-control custom-checkbox" '[ngSwitch]'=variable.readonly?""+variable.readonly.value:undefined )&attributes(divAttr)
+            -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);
+            input(id=variable.replacedId class="custom-control-input" type="checkbox" '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '(ngModelChange)'!=variable.valueChange?"!"+variable.readonly.value+"&&"+variable.valueChange+"":undefined  '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined  'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
+            if(variable.linkedLabelEnabled)
+              label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="true" '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+              label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="false" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+            else
+              label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+              label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+            if (variable.needValid && variable.binding && variable.binding.path)
+              -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
+              validationMessage('[errors]'!=`${path}`  '[hidden]'="!viewModel.form.isShowValidationMsg"  )
+        else
+          div(class="custom-control custom-checkbox" '[ngSwitch]'=variable.readonly?variable.readonly.value+"":undefined )
+            -var attrs = {};
+            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.hasDefaultFocus)
+              -attrs["farris-set-focus"]="";
+              if(variable.focusState)
+                -attrs["[focusState]"]=variable.focusState+"";
+            input(id=variable.replacedId "input-end-edit" class="custom-control-input" type="checkbox" '[disabled]'!=variable.disable?variable.disable.toString():undefined '[readonly]'!=variable.readonly?""+variable.readonly.value:undefined '(ngModelChange)'!=variable.valueChange?"!"+variable.readonly.value+"&&"+variable.valueChange+"":undefined  tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
+            if(variable.linkedLabelEnabled)
+              label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="true" '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+              label(class="custom-control-label f-pretend-link f-cursor-pointer" '*ngSwitchCase'="false" for=variable.replacedId '(click)'=variable.linkedLabelClick?variable.linkedLabelClick:undefined) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+            else
+              label(class="custom-control-label" '*ngSwitchCase'="true" ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+              label(class="custom-control-label" '*ngSwitchCase'="false" for=variable.replacedId ) {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+            if (variable.needValid && variable.binding && variable.binding.path)
+              -var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
+              validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
+      if(variable.isTextArea)
+        -var areaAttrs = {};
+        -var areaLabelAttrs = {};
+        if(variable.readonly && variable.readonly.isComposite)
+            -areaLabelAttrs["*ngIf"]=variable.readonly.value;
+            -areaAttrs["*ngIf"]=variable.readonly.value;
+        else
+            -areaLabelAttrs["*ngIf"]="!viewModel.stateMachine['editable']";        
+            -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);
+        if(variable.title)
+          -areaLabelAttrs['title'] = "viewModel.bindingData['"+ (variable.binding && variable.binding.path)+"']";
+        label(class="col-form-label"  )&attributes(areaLabelAttrs)
+          span(class="farris-label-text")
+            | {{'!{variable.resourceId}'|lang:lang:'!{variable.defaultI18nValue}'}}
+        farris-text('[type]'="'boolean'" '[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/checkboxgroup.pug

@@ -1,51 +1,51 @@
-
--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")
-        if (variable.items)
-          each item, index in variable.items
-            div(class="custom-control custom-checkbox")
-              -var attrs = {};
-              if (item.binding && item.binding.type == 'Variable')
-                -attrs['[(ngModel)]'] = variable.binding.value;
-                -attrs['name'] = variable.replacedId;
-                -attrs['[ngModelOptions]'] = "{standalone:true}";
-              else
-                -attrs['formControlName'] = (item.binding && item.binding.path);
-              if(variable.hasDefaultFocus)
-                -attrs["farris-set-focus"]="";
-                if(variable.focusState)
-                  -attrs["[focusState]"]=variable.focusState+"";
-              input(class="custom-control-input" "input-end-edit" type="checkbox" id=item.id disabled!=item.disable?item.disable.toString():undefined readonly!=item.readonly?""+item.readonly.value:undefined tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require  && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
-              if (item.title)
-                label(class="custom-control-label" for=item.id) !{item.title}
-      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")
+        if (variable.items)
+          each item, index in variable.items
+            div(class="custom-control custom-checkbox")
+              -var attrs = {};
+              if (item.binding && item.binding.type == 'Variable')
+                -attrs['[(ngModel)]'] = variable.binding.value;
+                -attrs['name'] = variable.replacedId;
+                -attrs['[ngModelOptions]'] = "{standalone:true}";
+              else
+                -attrs['formControlName'] = (item.binding && item.binding.path);
+              if(variable.hasDefaultFocus)
+                -attrs["farris-set-focus"]="";
+                if(variable.focusState)
+                  -attrs["[focusState]"]=variable.focusState+"";
+              input(class="custom-control-input" "input-end-edit" type="checkbox" id=item.id disabled!=item.disable?item.disable.toString():undefined readonly!=item.readonly?""+item.readonly.value:undefined tabindex=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[requiredOn]'=(variable.isCustomRequire && variable.require  && !variable.require.isExpression)?""+variable.require.value:undefined 'farris-dynamic-required'=(variable.isCustomRequire && variable.binding && variable.binding.path)?""+(variable.binding && variable.binding.path):undefined )&attributes(attrs)
+              if (item.title)
+                label(class="custom-control-label" for=item.id) !{item.title}
+      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}