@farris/jit-engine 1.3.351 → 1.3.353

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js

@@ -1,94 +1,94 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VueAppIndexVueGenerator = void 0;
-const abstract_file_generator_1 = require("../abstract-file-generator");
-const file_generator_response_1 = require("../file-generator-response");
-class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGenerator {
-    generate(context) {
-        const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
-        const appIndexVueParameter = context.externalParameter;
-        const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n } = appIndexVueParameter;
-        const { serviceUnitPath, projectName, isRuntime, runTimeDimPath } = metaDataConfig;
-        const _imports = imports.map((item) => `${item.name}:${item.name},`);
-        const generateFormPathValueString = hasExpressions && serviceUnitPath
-            ? `/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/`
-            : '';
-        let className;
-        if (controlStateExtend && controlStateExtend.enable) {
-            if (controlStateExtend.interceptor) {
-                const interceptor = controlStateExtend.interceptor;
-                const classExp = /(?<=class\s*)(\w+)(?=\s*)/g;
-                const classNameList = interceptor.match(classExp);
-                if (classNameList && classNameList.length > 0) {
-                    className = classNameList[0];
-                }
-            }
-        }
-        const path = "./services/" + formCode + "_state_interceptor";
-        let langPath = '';
-        if (enableI18n) {
-            langPath = `'/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/i18n/'`;
-        }
-        let generateString = '';
-        generateString += `
-<template>
-  <router-view v-slot="{ Component }">
-    ${keepAlive
-            ? '<keep-alive><component :is="Component" /></keep-alive>'
-            : '<component :is="Component" />'}
-  </router-view>
-</template>
-
-<script>
-import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService} from '@farris/mobile-devkit';
-import { FrameworkSessionService } from '@farris/mobile-bef';
-import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN,LangService} from '@farris/mobile-command-services';
-import { DevkitPlugin,beforeRouteEnterByVueAdapter,initdataOptions } from '@farris/mobile-vue-adapter';
-import { ModelProviders } from './models/model.provider';
-import { validationRule } from './validation';
-${extraImportsString}
-${resourceString}
-${className ? `import { ${className} } from '${path}'` : ''}
-
-const dataOptions  = { 
-  ${enableI18n ? `langPath:${langPath}` : ''}
-}
-initdataOptions(dataOptions);
-
-export default{
-    name: '${formCode}',
-    components:{${_imports}},
-    data() {
-      return {
-        transitionName: '',
-      };
-    },
-    beforeRouteEnter(to, from, next) {
-      beforeRouteEnterByVueAdapter(to, from, next,dataOptions);
-
-    },
-    beforeCreate(){
-      const appOptions = {
-        id: '${formCode}',
-        providers: [
-          ...ModelProviders,
-          ${enableI18n ? `{ provide: TranslateService, useValue: dataOptions.translateService },` : ''}
-          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
-          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
-          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
-          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
-          ...COMMAND_SERVICES_APP_PROVIDERS,
-          ${className ? `{ provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ${className}, deps: [] ,multi: true },` : ''}
-        ]
-      };
-      this.$createApp(appOptions);
-    }
-};
-</script>
-`;
-        this.createFile(context.basePath, context.fileName, generateString);
-        return response;
-    }
-}
-exports.VueAppIndexVueGenerator = VueAppIndexVueGenerator;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VueAppIndexVueGenerator = void 0;
+const abstract_file_generator_1 = require("../abstract-file-generator");
+const file_generator_response_1 = require("../file-generator-response");
+class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGenerator {
+    generate(context) {
+        const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
+        const appIndexVueParameter = context.externalParameter;
+        const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n, routeStrategy, } = appIndexVueParameter;
+        const { serviceUnitPath, projectName, isRuntime, runTimeDimPath } = metaDataConfig;
+        const _imports = imports.map((item) => `${item.name}:${item.name},`);
+        const generateFormPathValueString = hasExpressions && serviceUnitPath
+            ? `/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/`
+            : '';
+        let className;
+        if (controlStateExtend && controlStateExtend.enable) {
+            if (controlStateExtend.interceptor) {
+                const interceptor = controlStateExtend.interceptor;
+                const classExp = /(?<=class\s*)(\w+)(?=\s*)/g;
+                const classNameList = interceptor.match(classExp);
+                if (classNameList && classNameList.length > 0) {
+                    className = classNameList[0];
+                }
+            }
+        }
+        const path = "./services/" + formCode + "_state_interceptor";
+        let langPath = '';
+        if (enableI18n) {
+            langPath = `'/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName.toLowerCase()}/${formCode}/i18n/'`;
+        }
+        let generateString = '';
+        generateString += `
+<template>
+  <router-view v-slot="{ Component }">
+    ${keepAlive
+            ? '<keep-alive><component :is="Component" /></keep-alive>'
+            : '<component :is="Component" />'}
+  </router-view>
+</template>
+
+<script>
+import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService } from '@farris/mobile-devkit';
+import { FrameworkSessionService } from '@farris/mobile-bef';
+import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN, LangService } from '@farris/mobile-command-services';
+import { DevkitPlugin, beforeRouteEnterByVueAdapter, initdataOptions, setRouteStrategy } from '@farris/mobile-vue-adapter';
+import { ModelProviders } from './models/model.provider';
+import { validationRule } from './validation';
+${extraImportsString}
+${resourceString}
+${className ? `import { ${className} } from '${path}'` : ''}
+
+const dataOptions  = {
+  ${enableI18n ? `langPath:${langPath}` : ''}
+}
+initdataOptions(dataOptions);
+
+export default {
+    name: '${formCode}',
+    components:{${_imports}},
+    data() {
+      return {
+        transitionName: '',
+      };
+    },
+    beforeRouteEnter(to, from, next) {
+      beforeRouteEnterByVueAdapter(to, from, next, dataOptions);
+    },
+    beforeCreate() {
+      setRouteStrategy("${routeStrategy || ''}");
+      const appOptions = {
+        id: '${formCode}',
+        providers: [
+          ...ModelProviders,
+          ${enableI18n ? `{ provide: TranslateService, useValue: dataOptions.translateService },` : ''}
+          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
+          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
+          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
+          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
+          ...COMMAND_SERVICES_APP_PROVIDERS,
+          ${className ? `{ provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ${className}, deps: [] ,multi: true },` : ''}
+        ]
+      };
+      this.$createApp(appOptions);
+    }
+};
+</script>
+`;
+        this.createFile(context.basePath, context.fileName, generateString);
+        return response;
+    }
+}
+exports.VueAppIndexVueGenerator = VueAppIndexVueGenerator;
 //# sourceMappingURL=vue-app-index-vue-generator.js.map

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":"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"}

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

@@ -1,101 +1,101 @@
--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.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
-            '[onlyDisplayCompany]'!=variable.onlyDisplayCompany?""+variable.onlyDisplayCompany.value:undefined
-            '[onlyCurrentAdminOrg]'!=variable.onlyCurrentAdminOrg?""+variable.onlyCurrentAdminOrg.value:undefined
-            '[isTableTemplate]'!=variable.isTableTemplate?""+variable.isTableTemplate.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}
+-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.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
+            '[onlyDisplayCompany]'!=variable.onlyDisplayCompany?""+variable.onlyDisplayCompany.value:undefined
+            '[onlyCurrentAdminOrg]'!=variable.onlyCurrentAdminOrg?""+variable.onlyCurrentAdminOrg.value:undefined
+            '[isTableTemplate]'!=variable.isTableTemplate?""+variable.isTableTemplate.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}

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/button.pug

@@ -1,16 +1,16 @@
-//- -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.disabled.value=== 'special')? "'"+"'"+variable.disableButtonPipeSuffix : variable.disabled.value+variable.disableButtonPipeSuffix
-  '*ngIf'!=variable.visible?variable.visibleButtonPipeSuffix?variable.visible.value+variable.visibleButtonPipeSuffix+'':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.disabled.value=== 'special')? "'"+"'"+variable.disableButtonPipeSuffix : variable.disabled.value+variable.disableButtonPipeSuffix
+  '*ngIf'!=variable.visible?variable.visibleButtonPipeSuffix?variable.visible.value+variable.visibleButtonPipeSuffix+'':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)