@farris/jit-engine 1.3.342 → 1.3.344

package/lib/mobileapp/vue/static/tsconfig.json

@@ -1,20 +1,20 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "target": "ES3",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "ESNext",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    "allowJs": true,                       /* Allow javascript files to be compiled. */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    "noImplicitAny": false,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    "allowSyntheticDefaultImports": true,
-    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
-    "experimentalDecorators": true,
-    "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-    "lib": ["ESNext","DOM","DOM.Iterable","ScriptHost"],                             /* Specify library files to be included in the compilation. */
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules","dist"]
-}
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "target": "ES3",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "module": "ESNext",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "allowJs": true,                       /* Allow javascript files to be compiled. */
+    "strict": true,                           /* Enable all strict type-checking options. */
+    "noImplicitAny": false,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
+    "experimentalDecorators": true,
+    "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    "lib": ["ESNext","DOM","DOM.Iterable","ScriptHost"],                             /* Specify library files to be included in the compilation. */
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules","dist"]
+}

package/lib/mobileapp/vue/utility/parameter-collector/page-component-collector/page-component-ref-parameter.js

@@ -14,8 +14,8 @@ class PageComponentRefParameter {
         if (!obj) {
             return;
         }
-        const keys = `
-    id,type,component,visible
+        const keys = `
+    id,type,component,visible
     `;
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {

package/lib/mobileapp/vue/utility/template-generator/page-component-control-generator.js

@@ -9,12 +9,12 @@ class PageComponentControlGenerator {
         if (componentConfig && componentConfig.pageComponentControl && utility_1.ToolHelper.isArray(componentConfig.pageComponentControl.parameterList)) {
             const controlTypeList = [];
             componentConfig.pageComponentControl.parameterList.forEach((item) => {
-                generateString += `
+                generateString += `
 import {${item.controlType.controlType}} from "${item.controlType.controlSource}";`;
                 controlTypeList.push(item.controlType.controlType);
             });
             controlTypeList.forEach((item) => {
-                generateString += `
+                generateString += `
 Vue.use(${item});`;
             });
         }

package/lib/mobileapp/vue/utility/template-generator/page-component-ref-generator.js

@@ -8,7 +8,7 @@ class PageComponentRefGenerator {
         const componentConfig = generateParams.value;
         if (utility_1.ToolHelper.isArray(componentConfig.pageComponentRef, false)) {
             componentConfig.pageComponentRef.forEach((item) => {
-                generateString += `
+                generateString += `
 import ${"App" + item.componentName} from "../${item.component.toLowerCase()}/${item.component.toLowerCase()}.component.vue";`;
             });
         }

package/lib/mobileapp/vue/utility/template-generator/page-statemachine-generator.js

@@ -8,60 +8,60 @@ class PageStateMachineGenerator extends abstract_page_generator_1.AbstractPageGe
         const variable = generateParams.devkit;
         let generateString = "";
         const eol = this.eol;
-        generateString += `
-import { Injectable } from '@angular/core';
-import { StateMachine, State, NgState, RenderState, NgRenderState, Action, NgAction } from '@farris/devkit';
+        generateString += `
+import { Injectable } from '@angular/core';
+import { StateMachine, State, NgState, RenderState, NgRenderState, Action, NgAction } from '@farris/devkit';
 `;
-        generateString += `
-@Injectable()
-export class ${this.convertNullToEmpty(variable.externalPrefix)}${variable.name} extends StateMachine {
+        generateString += `
+@Injectable()
+export class ${this.convertNullToEmpty(variable.externalPrefix)}${variable.name} extends StateMachine {
 `;
         if (toolhepler_1.ToolHelper.isArray(variable.ngStates, false)) {
             variable.ngStates.forEach((ngState) => {
                 if (ngState.initialState) {
-                    generateString += `
-    @NgState({
-        initialState: true
+                    generateString += `
+    @NgState({
+        initialState: true
     })`;
                 }
                 else {
-                    generateString += `
+                    generateString += `
     @NgState()`;
                 }
-                generateString += `
+                generateString += `
     ${ngState.name}: State;`;
                 generateString += eol;
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngRenderStates, false)) {
             variable.ngRenderStates.forEach((ngRenderState) => {
-                generateString += `
-    @NgRenderState({
-        render: ${ngRenderState.render}
-    })
+                generateString += `
+    @NgRenderState({
+        render: ${ngRenderState.render}
+    })
     ${ngRenderState.name}: RenderState;`;
                 generateString += this.eol;
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngActions, false)) {
             variable.ngActions.forEach((ngAction) => {
-                generateString += `
+                generateString += `
     @NgAction({`;
                 if (ngAction.precondition) {
-                    generateString += `
+                    generateString += `
         precondition: ${ngAction.precondition},`;
                 }
                 if (ngAction.transitTo) {
-                    generateString += `
+                    generateString += `
         transitTo: '${ngAction.transitTo}'`;
                 }
-                generateString += `
-    })
+                generateString += `
+    })
     ${ngAction.name}: Action;`;
                 generateString += this.eol;
             });
         }
-        generateString += `
+        generateString += `
 }`;
         return generateString;
     }

package/lib/template/ui/kendo/discussion-editor.pug

@@ -1,27 +1 @@
-farris-discussion-editor(id=variable.id?variable.id+"":undefined  discussionEditorRef  farris-discussion-editor-binding
-    "*ngIf" = variable.visible?""+variable.visible.value:undefined
-    '[addCommentCommand]'=variable.addCommentCommand?"'"+variable.addCommentCommand+"'":undefined
-    '[userSearchCommand]'=variable.userSearchCommand?"'"+variable.userSearchCommand+"'":undefined
-    '[userQueryCommand]'=variable.queryUserCommand?"'"+variable.queryUserCommand+"'":undefined
-    '[personnelsPrimaryKey]'=variable.personnelsPrimaryKey?"'"+variable.personnelsPrimaryKey+"'":undefined
-    '[personnelsDisplayKey]'=variable.personnelsDisplayKey?"'"+variable.personnelsDisplayKey+"'":undefined
-    '[replyPersonnelsDisplayKey]'=variable.replyPersonnelsDisplayKey?"'"+variable.replyPersonnelsDisplayKey+"'":undefined
-    '[permissionList]'=variable.permissionList?"'"+variable.permissionList+"'":undefined
-    '[cancelVisible]'=(variable.cancelVisible || variable.cancelVisible == false)?""+variable.cancelVisible:undefined
-    '[editHeight]'=(variable.editHeight || variable.editHeight==0)?""+variable.editHeight:undefined
-    '[personnels]'=variable.personnels?""+variable.personnels:undefined
-    '[replyUser]'=variable.replyUser?""+variable.replyUser:undefined
-    '[attachFiles]'=variable.attachFiles?""+variable.attachFiles:undefined
-    '[treeData]'=variable.treeData?""+variable.treeData:undefined  '[treeIdField]'=variable.treeIdField?"'"+variable.treeIdField+"'":undefined
-    '[treeDisplayText]'=variable.treeDisplayText?"'"+variable.treeDisplayText+"'":undefined
-    '(selectionsChange)'=variable.selectionsChange?""+variable.selectionsChange:undefined
-    '(lineDataChange)'=variable.lineDataChange?""+variable.lineDataChange:undefined
-    '(valueChange)'=variable.valueChange?""+variable.valueChange:undefined
-    '(filePreview)'=variable.filePreview?""+variable.filePreview:undefined
-    '(fileRemove)'=variable.fileRemove?""+variable.fileRemove:undefined
-    '(fileUploadDone)'=variable.fileUploadDone?""+variable.fileUploadDone:undefined
-    '(personnelSearch)'=variable.personnelSearch?""+variable.personnelSearch:undefined
-    'orgUrl'=variable.orgUrl?""+variable.orgUrl:undefined
-    'personSearchUrl'=variable.personSearchUrl?""+variable.personSearchUrl:undefined
-    'queryAllOrgsCommand'=variable.queryAllOrgs?""+variable.queryAllOrgs:undefined
-    'queryFrequentAtUsersCommand'=variable.queryFrequentAtUsers?""+variable.queryFrequentAtUsers:undefined  )
+farris-discussion-editor(id=variable.id?variable.id+"":undefined  discussionEditorRef  farris-discussion-editor-binding   '[addCommentCommand]'=variable.addCommentCommand?"'"+variable.addCommentCommand+"'":undefined '[userSearchCommand]'=variable.userSearchCommand?"'"+variable.userSearchCommand+"'":undefined  '[userQueryCommand]'=variable.queryUserCommand?"'"+variable.queryUserCommand+"'":undefined   '[personnelsPrimaryKey]'=variable.personnelsPrimaryKey?"'"+variable.personnelsPrimaryKey+"'":undefined  '[personnelsDisplayKey]'=variable.personnelsDisplayKey?"'"+variable.personnelsDisplayKey+"'":undefined '[replyPersonnelsDisplayKey]'=variable.replyPersonnelsDisplayKey?"'"+variable.replyPersonnelsDisplayKey+"'":undefined   '[permissionList]'=variable.permissionList?"'"+variable.permissionList+"'":undefined  '[cancelVisible]'=(variable.cancelVisible || variable.cancelVisible == false)?""+variable.cancelVisible:undefined  '[editHeight]'=(variable.editHeight || variable.editHeight==0)?""+variable.editHeight:undefined  '[personnels]'=variable.personnels?""+variable.personnels:undefined  '[replyUser]'=variable.replyUser?""+variable.replyUser:undefined   '[attachFiles]'=variable.attachFiles?""+variable.attachFiles:undefined  '[treeData]'=variable.treeData?""+variable.treeData:undefined  '[treeIdField]'=variable.treeIdField?"'"+variable.treeIdField+"'":undefined '[treeDisplayText]'=variable.treeDisplayText?"'"+variable.treeDisplayText+"'":undefined '(selectionsChange)'=variable.selectionsChange?""+variable.selectionsChange:undefined '(lineDataChange)'=variable.lineDataChange?""+variable.lineDataChange:undefined  '(valueChange)'=variable.valueChange?""+variable.valueChange:undefined   '(filePreview)'=variable.filePreview?""+variable.filePreview:undefined  '(fileRemove)'=variable.fileRemove?""+variable.fileRemove:undefined '(fileUploadDone)'=variable.fileUploadDone?""+variable.fileUploadDone:undefined  '(personnelSearch)'=variable.personnelSearch?""+variable.personnelSearch:undefined    'orgUrl'=variable.orgUrl?""+variable.orgUrl:undefined  'personSearchUrl'=variable.personSearchUrl?""+variable.personSearchUrl:undefined   'queryAllOrgsCommand'=variable.queryAllOrgs?""+variable.queryAllOrgs:undefined   'queryFrequentAtUsersCommand'=variable.queryFrequentAtUsers?""+variable.queryFrequentAtUsers:undefined  )

package/lib/template/ui/kendo/discussion-list.pug

@@ -1,8 +1 @@
-farris-discussion-list(id=variable.id?""+variable.id:undefined discussionListRef  farris-discussion-list-binding
-    fDiscussionList class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)
-    "*ngIf" = variable.visible?""+variable.visible.value:undefined
-    '[personnelsDisplayKey]'=variable.personnelsDisplayKey?"'"+variable.personnelsDisplayKey+"'":undefined
-    '[supportPaging]'=(variable.supportPaging || variable.supportPaging==false)?""+variable.supportPaging:undefined
-    '[pageSize]'=(variable.pageSize || variable.pageSize==0)?""+variable.pageSize:undefined '(filePreview)'=variable.filePreview?""+variable.filePreview:undefined
-    '(fileDownload)'=variable.fileDownload?""+variable.fileDownload:undefined
-    '[commentsQueryCommand]'=variable.queryCommentsCommand?"'"+variable.queryCommentsCommand+"'":undefined  )
+farris-discussion-list(id=variable.id?""+variable.id:undefined discussionListRef  farris-discussion-list-binding  fDiscussionList class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)    '[personnelsDisplayKey]'=variable.personnelsDisplayKey?"'"+variable.personnelsDisplayKey+"'":undefined   '[supportPaging]'=(variable.supportPaging || variable.supportPaging==false)?""+variable.supportPaging:undefined  '[pageSize]'=(variable.pageSize || variable.pageSize==0)?""+variable.pageSize:undefined '(filePreview)'=variable.filePreview?""+variable.filePreview:undefined   '(fileDownload)'=variable.fileDownload?""+variable.fileDownload:undefined  '[commentsQueryCommand]'=variable.queryCommentsCommand?"'"+variable.queryCommentsCommand+"'":undefined  )

package/lib/template/ui/kendo/farris-file-upload-preview.pug

@@ -7,8 +7,7 @@ if (variable.title)
   else
     label(class="col-form-label" title="{{"+titleValue+"}}" for=variable.replacedId  '[style.width]'=variable.titleWidth?"'"+variable.titleWidth+"px"+"'":undefined )          
       span(class="farris-label-text") {{#{titleValue}}}
-f-file-upload-and-preview(id=variable.replacedId class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) fFilePreviewAdaptUnifile farrisFilePreviewBinding
-  "*ngIf" = variable.visible?""+variable.visible.value:undefined
+f-file-upload-and-preview(id=variable.replacedId class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style) fFilePreviewAdaptUnifile farrisFilePreviewBinding 
   '[previewReadonly]'!=variable.previewReadonly?""+variable.previewReadonly.value:undefined
   '(fileRemoveEvent)'=variable.fileRemoveEvent?""+variable.fileRemoveEvent:undefined
   '[uploadEnableMulti]'=variable.uploadEnableMulti?""+variable.uploadEnableMulti.value:undefined

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

@@ -1,28 +1,27 @@
--var attrs = {};
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-farris-list-view(id=variable.replacedId farrisListviewBinding listViewRef "*ngIf" = variable.visible?""+variable.visible.value:undefined
-  '[cardLayout]'=variable.cardLayout?""+variable.cardLayout:undefined
-  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)
-  '[fill]'=(variable.fill || variable.fill==false)?""+variable.fill:undefined  '(listClick)'=variable.listClick?variable.listClick+"":undefined
-  '(checkChange)'=variable.checkChange?variable.checkChange+"":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
-  '[multipleSelect]'=(variable.multiSelect || variable.multiSelect==false)?""+variable.multiSelect:undefined  '[sort]'=variable.sort?"'"+variable.sort+"'":undefined
-  '[showPageList]'=(variable.showPageSize || variable.showPageSize==false)?""+variable.showPageSize:undefined  '[pageSize]'=variable.pageSize?""+variable.pageSize:undefined
-  '[pageList]'=variable.pageList?""+variable.pageList:undefined '[supportPaged]'=(variable.supportPaging || variable.supportPaging==false)?""+variable.supportPaging:undefined
-  '(pageChanged)'=variable.pageChanged?""+variable.pageChanged:undefined   '(pageSizeChanged)'=variable.pageSizeChanged?""+variable.pageSizeChanged:undefined
-  '[listClassName]'=variable.listClassName?"'"+variable.listClassName+"'":undefined  '[(checkValues)]' = variable.checkValues?""+variable.checkValues.value:undefined
-  '[keepScrollPosition]'=(variable.keepScrollPosition || variable.keepScrollPosition==false)?""+variable.keepScrollPosition:undefined)&attributes(attrs)
-  if(variable.headerTemplate)
-    ng-template(listViewHeader)
-      | !{variable.headerTemplate}
-  if(variable.footerTemplate)
-    ng-template(listViewFooter)
-      | !{variable.footerTemplate}
-  if(variable.showEmpty && variable.emptyTemplate)
-    | !{variable.emptyTemplate}
-  if(variable.pageTemplate)
-    | !{variable.pageTemplate}
-  ng-template(listTemplate "let-item"="item")
-    | !{variable.contentTemplateHtml}
+-var attrs = {};
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
+farris-list-view(id=variable.replacedId farrisListviewBinding listViewRef '[cardLayout]'=variable.cardLayout?""+variable.cardLayout:undefined
+  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)
+  '[fill]'=(variable.fill || variable.fill==false)?""+variable.fill:undefined  '(listClick)'=variable.listClick?variable.listClick+"":undefined
+  '(checkChange)'=variable.checkChange?variable.checkChange+"":undefined  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
+  '[multipleSelect]'=(variable.multiSelect || variable.multiSelect==false)?""+variable.multiSelect:undefined  '[sort]'=variable.sort?"'"+variable.sort+"'":undefined
+  '[showPageList]'=(variable.showPageSize || variable.showPageSize==false)?""+variable.showPageSize:undefined  '[pageSize]'=variable.pageSize?""+variable.pageSize:undefined
+  '[pageList]'=variable.pageList?""+variable.pageList:undefined '[supportPaged]'=(variable.supportPaging || variable.supportPaging==false)?""+variable.supportPaging:undefined
+  '(pageChanged)'=variable.pageChanged?""+variable.pageChanged:undefined   '(pageSizeChanged)'=variable.pageSizeChanged?""+variable.pageSizeChanged:undefined
+  '[listClassName]'=variable.listClassName?"'"+variable.listClassName+"'":undefined  '[(checkValues)]' = variable.checkValues?""+variable.checkValues.value:undefined
+  '[keepScrollPosition]'=(variable.keepScrollPosition || variable.keepScrollPosition==false)?""+variable.keepScrollPosition:undefined)&attributes(attrs)
+  if(variable.headerTemplate)
+    ng-template(listViewHeader)
+      | !{variable.headerTemplate}
+  if(variable.footerTemplate)
+    ng-template(listViewFooter)
+      | !{variable.footerTemplate}
+  if(variable.showEmpty && variable.emptyTemplate)
+    | !{variable.emptyTemplate}
+  if(variable.pageTemplate)
+    | !{variable.pageTemplate}
+  ng-template(listTemplate "let-item"="item")
+    | !{variable.contentTemplateHtml}

package/lib/template/ui/kendo/farris-progress-step.pug

@@ -1,25 +1,14 @@
--var attrs = {};
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-if (variable.stepsMessage && variable.stepsMessage.type == 'Variable')
-  -attrs['[steps]'] = variable.stepsMessage.value;
-if (variable.currentId && variable.currentId.type == 'Variable')
-  -attrs['[currentId]'] = variable.currentId.value;
-farris-progress-step(
-  id=variable.replacedId?""+variable.replacedId:undefined
-  "*ngIf" = variable.visible?""+variable.visible.value:undefined
-  class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-  'direction'=variable.direction?variable.direction:undefined
-  '[fill]'=(variable.fill || variable.fill==false)?variable.fill+"":undefined
-  '(step-click)'=variable.stepClick?variable.stepClick:undefined
-  '[clickable]'=(variable.clickable || variable.clickable==false)?variable.clickable+"":undefined
-  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
-  '[stepsCls]'=variable.stepsCls?"'"+variable.stepsCls+"'":undefined
-  '[stepStyle]'=variable.stepStyle?""+variable.stepStyle:undefined )&attributes(attrs)
-  if(variable.extendTemplate )
-    ng-template(progressStepExtend  let-step="step" let-i="index" let-length="length"
-      let-activeIndex="activeIndex" let-direction="direction" )
+-var attrs = {};
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
+if (variable.stepsMessage && variable.stepsMessage.type == 'Variable')
+  -attrs['[steps]'] = variable.stepsMessage.value;
+if (variable.currentId && variable.currentId.type == 'Variable')
+  -attrs['[currentId]'] = variable.currentId.value;
+farris-progress-step(id=variable.replacedId?""+variable.replacedId:undefined  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  'direction'=variable.direction?variable.direction:undefined '[fill]'=(variable.fill || variable.fill==false)?variable.fill+"":undefined '(step-click)'=variable.stepClick?variable.stepClick:undefined '[clickable]'=(variable.clickable || variable.clickable==false)?variable.clickable+"":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined '[stepsCls]'=variable.stepsCls?"'"+variable.stepsCls+"'":undefined '[stepStyle]'=variable.stepStyle?""+variable.stepStyle:undefined )&attributes(attrs)
+  if(variable.extendTemplate )
+    ng-template(progressStepExtend  let-step="step" let-i="index" let-length="length"
+      let-activeIndex="activeIndex" let-direction="direction" )
       | !{variable.extendTemplate}

package/lib/template/ui/kendo/list-nav.pug

@@ -1,30 +1,13 @@
-farris-list-nav(
-  id=variable.replacedId
-  "*ngIf" = variable.visible?""+variable.visible.value:undefined
-  class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-  '(navStateChange)'=variable.navStateChange?variable.navStateChange+"":undefined
-  '[listNavWidth]'=(variable.size && variable.size.width)?variable.size.width+"":undefined
-  '[title]'=variable.titleLang?""+variable.titleLang:undefined
-  '[position]'=variable.position?"'"+variable.position+"'":undefined
-  '[hideNav]'=(variable.hideNav || variable.hideNav == false)?""+variable.hideNav:undefined
-  '[showEntry]'=(variable.showEntry || variable.showEntry==false)?""+variable.showEntry:undefined
-  '[contentFill]'=(variable.contentFill||variable.contentFill==false)?""+variable.contentFill:undefined
-  '[enableDraggable]'=variable.enableDraggable?""+variable.enableDraggable.value:undefined
-  '[rzHandles]'=variable.rzHandles?"'"+variable.rzHandles+"'":undefined
-  '[relatedIframeParent]'=variable.relatedIframeParent?"'"+variable.relatedIframeParent+"'":undefined
-  '(rzStart)'=variable.rzStart?""+variable.rzStart:undefined 'listNavRef'
-  '(rzResizing)'=variable.rzResizing?""+variable.rzResizing:undefined
-  '(rzStop)'=variable.rzStop?""+variable.rzStop:undefined )
-  if(variable.listNavTitle)
-    ng-template(listNavTitle)
-      | !{variable.listNavTitle}
-  if(variable.contents && variable.contents.length)
-    ng-template(listNavContent)
-      | {{content}}
-  else if(variable.listNavContent)
-    ng-template(listNavContent)
-      | !{variable.listNavContent}
-  if(variable.listNavFooter)
-    ng-template(listNavFooter)
+farris-list-nav(id=variable.replacedId  class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)  '(navStateChange)'=variable.navStateChange?variable.navStateChange+"":undefined  '[listNavWidth]'=(variable.size && variable.size.width)?variable.size.width+"":undefined  '[title]'=variable.titleLang?""+variable.titleLang:undefined  '[position]'=variable.position?"'"+variable.position+"'":undefined  '[hideNav]'=(variable.hideNav || variable.hideNav == false)?""+variable.hideNav:undefined   '[showEntry]'=(variable.showEntry || variable.showEntry==false)?""+variable.showEntry:undefined  '[contentFill]'=(variable.contentFill||variable.contentFill==false)?""+variable.contentFill:undefined  '[enableDraggable]'=variable.enableDraggable?""+variable.enableDraggable.value:undefined  '[rzHandles]'=variable.rzHandles?"'"+variable.rzHandles+"'":undefined '[relatedIframeParent]'=variable.relatedIframeParent?"'"+variable.relatedIframeParent+"'":undefined  '(rzStart)'=variable.rzStart?""+variable.rzStart:undefined 'listNavRef' '(rzResizing)'=variable.rzResizing?""+variable.rzResizing:undefined   '(rzStop)'=variable.rzStop?""+variable.rzStop:undefined )
+  if(variable.listNavTitle)
+    ng-template(listNavTitle)
+      | !{variable.listNavTitle}
+  if(variable.contents && variable.contents.length)
+    ng-template(listNavContent)
+      | {{content}}
+  else if(variable.listNavContent)
+    ng-template(listNavContent)
+      | !{variable.listNavContent}
+  if(variable.listNavFooter)
+    ng-template(listNavFooter)
       | !{variable.listNavFooter}

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

@@ -9,22 +9,7 @@ if(variable.hasDefaultFocus)
   -attrs["farris-set-focus"]="";
   if(variable.focusState)
     -attrs["[focusState]"]=variable.focusState+"";
-multi-select(
-  id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectRef'
-  "*ngIf" = variable.visible?""+variable.visible.value:undefined
-  'multiSelectDataMapping' "input-end-edit" '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined
-  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined
-  '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined
-  '[dataSource]'=variable.dataSource?variable.dataSource:undefined
-  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined
-  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined
-  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined
-  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined
-  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
-  '[enableTargetSort]'= (variable.enableTargetSort || variable.enableTargetSort==false)?""+variable.enableTargetSort:undefined
-  '[showCascadeControl]'=(variable.showCascadeControl||variable.showCascadeControl==false)?""+variable.showCascadeControl:undefined
-  '[wordWrap]'=variable.wordWrap?""+variable.wordWrap.value:undefined
-  '[enableMoveMore]'=variable.enableMoveMore?""+variable.enableMoveMore.value:undefined)&attributes(attrs)
+multi-select(id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectRef' 'multiSelectDataMapping' "input-end-edit" '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined   '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined  '[dataSource]'=variable.dataSource?variable.dataSource:undefined  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined  '[enableTargetSort]'= (variable.enableTargetSort || variable.enableTargetSort==false)?""+variable.enableTargetSort:undefined  '[showCascadeControl]'=(variable.showCascadeControl||variable.showCascadeControl==false)?""+variable.showCascadeControl:undefined   '[wordWrap]'=variable.wordWrap?""+variable.wordWrap.value:undefined   '[enableMoveMore]'=variable.enableMoveMore?""+variable.enableMoveMore.value:undefined )&attributes(attrs)
   ng-template(farrisTemplate="text" let-data 'let-ms'="instance")
     if(variable.content)
       | !{variable.content}

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

@@ -1,6 +1,2 @@
-table(
-  class=variable.appearance?variable.appearance.class:undefined
-  style=variable.appearance?variable.appearance.style:undefined
-  "*ngIf" = variable.visible?""+variable.visible.value:undefined
-)
+table(class=variable.appearance?variable.appearance.class:undefined  style=variable.appearance?variable.appearance.style:undefined)
   | {{content}}

package/lib/template/ui/kendo/table/multi-select.pug

@@ -1,37 +1,17 @@
-doctype html
-|
--var attrs = {};
-if (variable.binding && variable.binding.type == 'Variable')
-  -attrs['[(selectedId)]'] = variable.binding.value;
-else
-  -attrs['[(selectedId)]'] = (variable.binding && variable.binding.path);
-if(variable.hasDefaultFocus)
-  -attrs["farris-set-focus"]="";
-  if(variable.focusState)
-    -attrs["[focusState]"]=variable.focusState+"";
-multi-select(
-  id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectDataMapping' "input-end-edit"
-  "*ngIf" = variable.visible?""+variable.visible.value:undefined
-  '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined
-  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined
-  '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined
-  '[dataSource]'=variable.dataSource?variable.dataSource:undefined
-  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined
-  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined
-  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined
-  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined
-  '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined
-  '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined
-  '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined
-  '[inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined
-  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined
-  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined
-  '[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined
-  '[wordWrap]'=variable.wordWrap?""+variable.wordWrap.value:undefined
-  '[enableMoveMore]'=variable.enableMoveMore?""+variable.enableMoveMore.value:undefined )&attributes(attrs)
-  ng-template(farrisTemplate="text" let-data 'let-ms'="instance")
-    if(variable.content)
-      | !{variable.content}
-    else
-      //- |{{ms.getText(data)}} [{{ms.getValue(data)}}]
-      | <ng-container *ngIf="ms.textField">{{ms.getText(data)}}</ng-container><ng-container *ngIf="ms.valueField">[{{ms.getValue(data)}}]</ng-container>
+doctype html
+|
+-var attrs = {};
+if (variable.binding && variable.binding.type == 'Variable')
+  -attrs['[(selectedId)]'] = variable.binding.value;
+else
+  -attrs['[(selectedId)]'] = (variable.binding && variable.binding.path);
+if(variable.hasDefaultFocus)
+  -attrs["farris-set-focus"]="";
+  if(variable.focusState)
+    -attrs["[focusState]"]=variable.focusState+"";
+multi-select(id=variable.replacedId?""+variable.replacedId:undefined 'multiSelectDataMapping' "input-end-edit" '[fjmField]'=variable.fjmField?"'"+variable.fjmField+"'":undefined  '[fjdField]'=variable.fjdField?"'"+variable.fjdField+"'":undefined   '[uiStateField]'=variable.uiStateField?"'"+variable.uiStateField+"'":undefined  '[dataSource]'=variable.dataSource?variable.dataSource:undefined  '[idField]' = variable.idField?"'"+variable.idField+"'":undefined  '[valueField]'=variable.valueField?"'"+variable.valueField+"'":undefined  '[textField]' = variable.textField?"'"+variable.textField+"'":undefined  '[displayType]' = variable.displayType?"'"+variable.displayType+"'":undefined   '[tab-index]'=(variable.tabindex || variable.tabindex ==0)?""+variable.tabindex:undefined   '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined   '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined  ' [inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined  '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined  '(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined  '[wordWrap]'=variable.wordWrap?""+variable.wordWrap.value:undefined  '[enableMoveMore]'=variable.enableMoveMore?""+variable.enableMoveMore.value:undefined )&attributes(attrs)
+  ng-template(farrisTemplate="text" let-data 'let-ms'="instance")
+    if(variable.content)
+      | !{variable.content}
+    else
+      |{{ms.getText(data)}} [{{ms.getValue(data)}}]

package/lib/template/ui/mobilevue/action-bar.pug

@@ -1,10 +1,10 @@
--variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
-
-fm-action-bar(
-  v-if=variable.visible?variable.visible+"":"false"
-  style=(variable.appearance && variable.appearance.style)  
-  class=(variable.appearance && variable.appearance.class)  
-  id=variable.id?"" + variable.id:undefined 
-  :btns=variable.btns?"" + variable.btns:undefined 
-)
-  
+-variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
+
+fm-action-bar(
+  v-if=variable.visible?variable.visible+"":"false"
+  style=(variable.appearance && variable.appearance.style)  
+  class=(variable.appearance && variable.appearance.class)  
+  id=variable.id?"" + variable.id:undefined 
+  :btns=variable.btns?"" + variable.btns:undefined 
+)
+  

package/lib/template/ui/mobilevue/banner.pug

@@ -1,5 +1,5 @@
-div(class="fm-banner-warpper")
-  div(class="fm-banner-title")
-    | !{variable.title}
-  div(class="fm-banner-title-sub") 
+div(class="fm-banner-warpper")
+  div(class="fm-banner-title")
+    | !{variable.title}
+  div(class="fm-banner-title-sub") 
     | !{variable.subTitle}

package/lib/template/ui/mobilevue/component-ref.pug

@@ -1,3 +1,3 @@
-//- -var variable = {id:'id',"component":"Delivery-component", "componentName":"DeliveryComponent"};
-
-#{'app-' + variable.componentName.toLowerCase()}
+//- -var variable = {id:'id',"component":"Delivery-component", "componentName":"DeliveryComponent"};
+
+#{'app-' + variable.componentName.toLowerCase()}

package/lib/template/ui/mobilevue/field-set.pug

@@ -10,9 +10,7 @@ fm-collapse-item(
   position=variable.isInner ? 'bottom' : 'top'
   :collapse=variable.collapse?String(variable.collapse): undefined
 )&attributes(attrs)
-  if(variable.headerTemplate && !/<template\s+#title\s*>/.test(variable.headerTemplate))
+  if(variable.headerTemplate)
     template(#title)
       | !{variable.headerTemplate}
-  if(variable.headerTemplate && /<template\s+#title\s*>/.test(variable.headerTemplate))
-    | !{variable.headerTemplate}
   | {{content}}

package/lib/template/ui/mobilevue/image-uploader.pug

@@ -1,15 +1,15 @@
--var imageInfo =`$formatUtils.fileInfo(currentEntityData.${variable.binding.bindingPath}, '${variable.rootId}')` 
--var extendContext =`{ rootId: '${variable.rootId}', formId: '${variable.parentDirName}', fieldPath: '/${variable.binding.bindingPath}'}` 
-
-div(class="fm-input-wrapper" v-if=variable.visible?variable.visible+"":"false")
-  fm-image-uploader(
-    style=(variable.appearance && variable.appearance.style)  
-    class=variable.className
-    id=variable.id?"" + variable.id:undefined 
-    title=variable.title?variable.title:undefined 
-    :disabled!=variable.disabled?variable.disabled+"":undefined
-    :imageInfo!=imageInfo
-    :extendContext!=extendContext
-  )
-    
- 
+-var imageInfo =`$formatUtils.fileInfo(currentEntityData.${variable.binding.bindingPath}, '${variable.rootId}')` 
+-var extendContext =`{ rootId: '${variable.rootId}', formId: '${variable.parentDirName}', fieldPath: '/${variable.binding.bindingPath}'}` 
+
+div(class="fm-input-wrapper" v-if=variable.visible?variable.visible+"":"false")
+  fm-image-uploader(
+    style=(variable.appearance && variable.appearance.style)  
+    class=variable.className
+    id=variable.id?"" + variable.id:undefined 
+    title=variable.title?variable.title:undefined 
+    :disabled!=variable.disabled?variable.disabled+"":undefined
+    :imageInfo!=imageInfo
+    :extendContext!=extendContext
+  )
+    
+ 

package/lib/template/ui/mobilevue/sidebar-item.pug

@@ -1,9 +1,9 @@
-fm-sidebar-item(
-  id=variable.id?"" + variable.id:undefined 
-  v-if=variable.visible?variable.visible+"":"false"
-  style=(variable.appearance && variable.appearance.style)  
-  class=(variable.appearance && variable.appearance.class)  
-  title=variable.title?"" + variable.title:undefined 
-  name=variable.name?"" + variable.name:undefined 
-)
-  | {{content}}
+fm-sidebar-item(
+  id=variable.id?"" + variable.id:undefined 
+  v-if=variable.visible?variable.visible+"":"false"
+  style=(variable.appearance && variable.appearance.style)  
+  class=(variable.appearance && variable.appearance.class)  
+  title=variable.title?"" + variable.title:undefined 
+  name=variable.name?"" + variable.name:undefined 
+)
+  | {{content}}

package/lib/template/ui/mobilevue/sidebar.pug

@@ -1,11 +1,11 @@
-fm-sidebar(
-  id=variable.id?"" + variable.id:undefined 
-  v-if=variable.visible?variable.visible+"":"false"
-  style=(variable.appearance && variable.appearance.style)  
-  class=(variable.appearance && variable.appearance.class)  
-  modelValue=variable.selected?"" + variable.selected:undefined 
-  sidebarWidth=variable.sidebarWidth?"" + variable.sidebarWidth:undefined 
-  @change=variable.change?"" + variable.change:undefined 
-)
-  | {{content}}
-  
+fm-sidebar(
+  id=variable.id?"" + variable.id:undefined 
+  v-if=variable.visible?variable.visible+"":"false"
+  style=(variable.appearance && variable.appearance.style)  
+  class=(variable.appearance && variable.appearance.class)  
+  modelValue=variable.selected?"" + variable.selected:undefined 
+  sidebarWidth=variable.sidebarWidth?"" + variable.sidebarWidth:undefined 
+  @change=variable.change?"" + variable.change:undefined 
+)
+  | {{content}}
+  

package/lib/template/ui/mobilevue/static-text.pug

@@ -1,2 +1,2 @@
-div(class="fm-static-text-common")
+div(class="fm-static-text-common")
   | !{variable.html}