@farris/jit-engine 1.3.312 → 1.3.313

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/mobileapp/vue/utility/vue-content-type-creator.js

@@ -15,7 +15,11 @@ VueContentTypeCreator.VueTypeMap = {
     PageContentContainer: 'VuePageContentContainer',
     PageFooterContainer: 'VuePageFooterContainer',
     ContentContainer: 'VueContentContainer',
+    TemplateContainer: 'VueTemplateContainer',
     FloatContainer: 'VueFloatContainer',
+    LayoutContainer: 'VueLayoutContainer',
+    LayoutContainerRow: 'VueLayoutContainerRow',
+    LayoutContainerCol: 'VueLayoutContainerCol',
     Tab: 'VueTabs',
     TabPage: 'VueTabPage',
     Section: 'VueSection',
@@ -35,6 +39,8 @@ VueContentTypeCreator.VueTypeMap = {
     NavigationBar: 'VueNavBar',
     SearchBox: 'VueSearchBox',
     Icon: 'VueIcon',
+    Tag: 'VueTag',
+    Label: 'VueLabel',
     TextBox: 'VueTextBox',
     DateBox: 'VueDatePicker',
     NumericBox: 'VueNumber',
@@ -71,6 +77,8 @@ VueContentTypeCreator.VueTypeMap = {
     StaticText: 'VueStaticText',
     Banner: 'VueBanner',
     PersonnelInfo: 'VueStaffInfo',
+    Avatar: 'VueAvatar',
+    Text: 'VueText',
     QueryScheme: 'VueFilter',
     Uploader: 'VueAttachment',
     AttachmentEntry: 'VueAttachmentEntry',

package/lib/mobileapp/vue/utility/vue-content-type-creator.js.map

@@ -1 +1 @@
-{"version":3,"file":"vue-content-type-creator.js","sourceRoot":"","sources":["../../../../src/mobileapp/vue/utility/vue-content-type-creator.ts"],"names":[],"mappings":";;;AAQA,MAAa,qBAAqB;IAqF9B,MAAM,CAAC,MAAM,CAAC,WAAmB,EAAE,aAAqB,EAAE,WAAmB;QACzE,IAAI,MAAM,GAAY,IAAI,CAAC,UAAkB,CAAC,WAAW,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;IACzC,CAAC;;AAxFL,sDAyFC;AAvFU,gCAAU,GAAQ;IAErB,YAAY,EAAE,iBAAiB;IAC/B,aAAa,EAAE,kBAAkB;IACjC,mBAAmB,EAAE,wBAAwB;IAC7C,oBAAoB,EAAE,yBAAyB;IAC/C,mBAAmB,EAAE,wBAAwB;IAC7C,gBAAgB,EAAE,qBAAqB;IACvC,cAAc,EAAE,mBAAmB;IACnC,GAAG,EAAE,SAAS;IACd,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,aAAa;IACvB,MAAM,EAAE,kBAAkB;IAG1B,MAAM,EAAE,WAAW;IACnB,WAAW,EAAE,gBAAgB;IAC7B,KAAK,EAAE,UAAU;IACjB,OAAO,EAAE,YAAY;IACrB,WAAW,EAAE,gBAAgB;IAC7B,WAAW,EAAE,gBAAgB;IAC7B,MAAM,EAAE,WAAW;IACnB,OAAO,EAAE,YAAY;IACrB,WAAW,EAAE,gBAAgB;IAC7B,SAAS,EAAE,cAAc;IACzB,aAAa,EAAE,WAAW;IAC1B,SAAS,EAAE,cAAc;IACzB,IAAI,EAAE,SAAS;IAGf,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,eAAe;IACxB,UAAU,EAAE,WAAW;IACvB,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,aAAa;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,WAAW,EAAE,gBAAgB;IAC7B,UAAU,EAAE,eAAe;IAC3B,UAAU,EAAE,kBAAkB;IAC9B,WAAW,EAAE,gBAAgB;IAC7B,cAAc,EAAE,mBAAmB;IACnC,oBAAoB,EAAE,qBAAqB;IAC3C,iBAAiB,EAAE,mBAAmB;IACtC,gBAAgB,EAAE,qBAAqB;IACvC,yBAAyB,EAAE,8BAA8B;IACzD,UAAU,EAAE,eAAe;IAC3B,UAAU,EAAE,eAAe;IAC3B,eAAe,EAAE,iBAAiB;IAClC,aAAa,EAAE,kBAAkB;IACjC,WAAW,EAAE,aAAa;IAC1B,iBAAiB,EAAE,oBAAoB;IACvC,SAAS,EAAE,cAAc;IACzB,UAAU,EAAE,mBAAmB;IAC/B,UAAU,EAAE,eAAe;IAG3B,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,UAAU;IACjB,QAAQ,EAAE,aAAa;IACvB,QAAQ,EAAE,aAAa;IACvB,YAAY,EAAE,iBAAiB;IAC/B,QAAQ,EAAE,aAAa;IACvB,iBAAiB,EAAE,iBAAiB;IACpC,YAAY,EAAE,iBAAiB;IAC/B,gBAAgB,EAAE,qBAAqB;IACvC,UAAU,EAAE,eAAe;IAC3B,MAAM,EAAE,WAAW;IACnB,aAAa,EAAE,cAAc;IAG7B,WAAW,EAAE,WAAW;IACxB,QAAQ,EAAE,eAAe;IACzB,eAAe,EAAE,oBAAoB;IACrC,UAAU,EAAE,eAAe;IAC3B,eAAe,EAAE,mBAAmB;IACpC,kBAAkB,EAAE,uBAAuB;IAC3C,aAAa,EAAE,kBAAkB;IACjC,YAAY,EAAE,iBAAiB;CAElC,CAAA"}
+{"version":3,"file":"vue-content-type-creator.js","sourceRoot":"","sources":["../../../../src/mobileapp/vue/utility/vue-content-type-creator.ts"],"names":[],"mappings":";;;AAQA,MAAa,qBAAqB;IA8F9B,MAAM,CAAC,MAAM,CAAC,WAAmB,EAAE,aAAqB,EAAE,WAAmB;QACzE,IAAI,MAAM,GAAY,IAAI,CAAC,UAAkB,CAAC,WAAW,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;IACzC,CAAC;;AAjGL,sDAkGC;AAhGU,gCAAU,GAAQ;IAErB,YAAY,EAAE,iBAAiB;IAC/B,aAAa,EAAE,kBAAkB;IACjC,mBAAmB,EAAE,wBAAwB;IAC7C,oBAAoB,EAAE,yBAAyB;IAC/C,mBAAmB,EAAE,wBAAwB;IAC7C,gBAAgB,EAAE,qBAAqB;IACvC,iBAAiB,EAAE,sBAAsB;IACzC,cAAc,EAAE,mBAAmB;IACnC,eAAe,EAAE,oBAAoB;IACrC,kBAAkB,EAAE,uBAAuB;IAC3C,kBAAkB,EAAE,uBAAuB;IAC3C,GAAG,EAAE,SAAS;IACd,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,aAAa;IACvB,MAAM,EAAE,kBAAkB;IAG1B,MAAM,EAAE,WAAW;IACnB,WAAW,EAAE,gBAAgB;IAC7B,KAAK,EAAE,UAAU;IACjB,OAAO,EAAE,YAAY;IACrB,WAAW,EAAE,gBAAgB;IAC7B,WAAW,EAAE,gBAAgB;IAC7B,MAAM,EAAE,WAAW;IACnB,OAAO,EAAE,YAAY;IACrB,WAAW,EAAE,gBAAgB;IAC7B,SAAS,EAAE,cAAc;IACzB,aAAa,EAAE,WAAW;IAC1B,SAAS,EAAE,cAAc;IACzB,IAAI,EAAE,SAAS;IACf,GAAG,EAAE,QAAQ;IACb,KAAK,EAAE,UAAU;IAGjB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,eAAe;IACxB,UAAU,EAAE,WAAW;IACvB,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,aAAa;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,WAAW,EAAE,gBAAgB;IAC7B,UAAU,EAAE,eAAe;IAC3B,UAAU,EAAE,kBAAkB;IAC9B,WAAW,EAAE,gBAAgB;IAC7B,cAAc,EAAE,mBAAmB;IACnC,oBAAoB,EAAE,qBAAqB;IAC3C,iBAAiB,EAAE,mBAAmB;IACtC,gBAAgB,EAAE,qBAAqB;IACvC,yBAAyB,EAAE,8BAA8B;IACzD,UAAU,EAAE,eAAe;IAC3B,UAAU,EAAE,eAAe;IAC3B,eAAe,EAAE,iBAAiB;IAClC,aAAa,EAAE,kBAAkB;IACjC,WAAW,EAAE,aAAa;IAC1B,iBAAiB,EAAE,oBAAoB;IACvC,SAAS,EAAE,cAAc;IACzB,UAAU,EAAE,mBAAmB;IAC/B,UAAU,EAAE,eAAe;IAG3B,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,UAAU;IACjB,QAAQ,EAAE,aAAa;IACvB,QAAQ,EAAE,aAAa;IACvB,YAAY,EAAE,iBAAiB;IAC/B,QAAQ,EAAE,aAAa;IACvB,iBAAiB,EAAE,iBAAiB;IACpC,YAAY,EAAE,iBAAiB;IAC/B,gBAAgB,EAAE,qBAAqB;IACvC,UAAU,EAAE,eAAe;IAC3B,MAAM,EAAE,WAAW;IACnB,aAAa,EAAE,cAAc;IAE7B,MAAM,EAAE,WAAW;IACnB,IAAI,EAAE,SAAS;IAGf,WAAW,EAAE,WAAW;IACxB,QAAQ,EAAE,eAAe;IACzB,eAAe,EAAE,oBAAoB;IACrC,UAAU,EAAE,eAAe;IAC3B,eAAe,EAAE,mBAAmB;IACpC,kBAAkB,EAAE,uBAAuB;IAC3C,aAAa,EAAE,kBAAkB;IACjC,YAAY,EAAE,iBAAiB;CAElC,CAAA"}

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/approval-comments.pug

@@ -2,7 +2,7 @@
 -attrs.class = variable.appearance && variable.appearance.class;
 -attrs.style = variable.appearance && variable.appearance.style;
 -var visible = variable.visible ? String(variable.visible.value) : undefined;
-- var data = `$formatUtils.getApprovalComments(currentEntityData, '${variable.bindingPath || ""}', '${variable.title || ""}')`;
+- var data = `$formatUtils.getApprovalComments(currentEntityData, '${variable.bindingPath || ""}', ${variable.i18nTitle})`;
 
 fm-approval-comments(
   v-if=visible

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

@@ -0,0 +1,19 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+div(
+ v-if!=""+visible
+)
+	fm-avatar(
+	  fit!=variable.fit?"" + variable.fit:undefined 
+	  border!=variable.border?"" + variable.border:undefined
+	  srcMode!=variable.srcMode?"" + variable.srcMode:undefined
+	  :sysUserId!=variable.sysUserId?"" + variable.sysUserId:undefined
+	  :dynamicSrc!=variable.dynamicSrc?"" + variable.dynamicSrc:undefined 
+	  :attachId!=variable.attachId?"" + variable.attachId:undefined 
+	  rootId!=variable.rootId?"" + variable.rootId:undefined
+	  :avatarText !=variable.avatarText?"" + variable.avatarText:undefined 
+	  width!=variable.width?"" + variable.width:undefined 
+	  height!=variable.height?"" + variable.height:undefined 
+	)&attributes(attrs)

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

@@ -20,4 +20,4 @@ fm-button(
   if variable.template
     | !{variable.template}
   else 
-    |  !{variable.i18nText} 
+    | !{variable.i18nText}

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

@@ -11,5 +11,6 @@ fm-collapse-item(
   :collapse=variable.collapse?String(variable.collapse): undefined
 )&attributes(attrs)
   if(variable.headerTemplate)
-    | !{variable.headerTemplate}
+    template(#title)
+      | !{variable.headerTemplate}
   | {{content}}

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

@@ -7,5 +7,6 @@
 
 fm-icon(
   v-if=visible
-  name=variable.name ? String(variable.iconName) : undefined;
+  name=variable.iconName ? String(variable.iconName) : undefined
+  @click=variable.click ? String(variable.click) : undefined 
 )&attributes(attrs)

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

@@ -1,12 +1,22 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-attrs.height = variable.size && variable.size.height;
+-attrs.width = variable.size && variable.size.width;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var previewPath =`$formatUtils.imageThumbnailPath(${variable.attachId}, '${variable.rootId}')` 
+-var srcMode = variable.srcMode
+if(srcMode == "dynamicUrl") 
+	-attrs[`:src`] = variable.dynamicSrc;  
+else if(srcMode == "staticUrl")
+	-attrs.src = variable.staticSrc;  
+else
+	-attrs[`:src`] = previewPath;
 
 fm-image(
-  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 
-  width=variable.width?"" + variable.width:"100%" 
-  height=variable.height?"" + variable.height:undefined 
-  :src=variable.src?"" + variable.src:undefined  
-  :fit=variable.fit?"" + variable.fit:undefined 
+	v-if!=""+visible
+	id!=variable.id?"" + variable.id:undefined
+	fit=variable.fit?"" + variable.fit:undefined 
   :round=variable.round?"" + variable.round:undefined 
-)
+	radius!=variable.radius?"" + variable.radius:undefined
+)&attributes(attrs)

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

@@ -0,0 +1,12 @@
+
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+- var visible = variable.visible ? String(variable.visible.value) : undefined;
+
+
+span(
+  v-if=visible
+)&attributes(attrs)
+  | !{variable.text}
+  

package/lib/template/ui/mobilevue/layout-container-col.pug

@@ -0,0 +1,11 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+
+fm-layout-column(
+  v-if=visible
+  id=variable.replacedId ? String(variable.replacedId) : undefined   
+  width=variable.colWidth ? String(variable.colWidth) : undefined   
+)&attributes(attrs)
+  | {{content}}

package/lib/template/ui/mobilevue/layout-container-row.pug

@@ -0,0 +1,12 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+
+fm-layout-row(
+  v-if=visible
+  id=variable.replacedId ? String(variable.replacedId) : undefined
+  height=variable.rowHeight ? String(variable.rowHeight) : undefined   
+  :gutter=variable.gutter ? String(variable.gutter) : undefined
+)&attributes(attrs)
+  | {{content}}

package/lib/template/ui/mobilevue/layout-container.pug

@@ -0,0 +1,11 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+
+fm-layout(
+  v-if=visible
+  id=variable.replacedId ? String(variable.replacedId) : undefined
+  :gutter=variable.gutter ? String(variable.gutter) : undefined
+)&attributes(attrs)
+  | {{content}}

package/lib/template/ui/mobilevue/list-view.pug

@@ -57,8 +57,8 @@ fm-listview(
         div(
           class="fm-listview-item-tmpl-wrapper"
           @click=variable.listClick?""+variable.listClick:undefined
-        )
-          !=variable.contentTemplate?variable.contentTemplate:''
+        ) 
+          | {{contentTemplate}}
     else if(variable.swipeToolbar && variable.swipeToolbar.items && variable.swipeToolbar.items.length >0)
       fm-swipecell(
         :beforeShow="beforeShow"
@@ -74,8 +74,9 @@ fm-listview(
         div(
           class="fm-listview-item-tmpl-wrapper"
           @click=variable.listClick?""+variable.listClick:undefined
-        )
-          !=variable.contentTemplate?variable.contentTemplate:''
+        )          
+          | {{contentTemplate}}
+
     else 
       div(
         class="fm-listview-item-tmpl-wrapper"

package/lib/template/ui/mobilevue/lookup-employee.pug

@@ -1,4 +1,3 @@
-//- -variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
 -var attrs = {};
 -attrs.class = variable.appearance && variable.appearance.class;
 -attrs.style = variable.appearance && variable.appearance.style;
@@ -13,7 +12,6 @@
 -var uri = variable.dataSource && variable.dataSource.uri?""+variable.dataSource.uri:undefined 
 -var idField = variable.dataSource && variable.dataSource.idField?""+variable.dataSource.idField:'id' 
 
-
 div(
   v-if=visible
   class="fm-input-wrapper" 

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

@@ -25,11 +25,13 @@ div(
     :required=require
     :readonly=readonly
     :disabled=disable
+    input-align="right"
     :modelValue=variable.modelValue ? variable.modelValue+"":undefined 
     :clearable!=variable.clearable?variable.clearable+"":undefined
     :is-link!=variable.isLink?variable.isLink+"":undefined
     :minValue!=variable.minValue?variable.minValue+"":undefined
     :maxValue!=variable.maxValue?variable.maxValue+"":undefined
+    :enableNull!=variable.enableNull?variable.enableNull+"":undefined
     :precision=variable.precision || variable.precision===0?variable.precision+"":undefined
     :enableNull=variable.enableNull?variable.enableNull+"":undefined
     input-align="right"

package/lib/template/ui/mobilevue/scroll-navbar.pug

@@ -7,7 +7,7 @@ fm-scroll-navbar(
   v-if=visible
   id=variable.replacedId ? String(variable.replacedId) : undefined   
   contentRef=variable.scrollContainer?""+variable.scrollContainer:undefined 
-  :itemRef=variable.scrollItems?""+variable.scrollItems:undefined 
+  :itemRef=variable.scrollItems?""+variable.i18nScrollItems:undefined 
   :alwaysShow=variable.alwaysShow?""+variable.alwaysShow:undefined 
   :extendable=variable.extendable?""+variable.extendable:undefined 
   extendTitle=variable.extendTitle?""+variable.extendTitle:undefined 

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

@@ -14,7 +14,7 @@ div(
       else 
         div(class="fm-title")
             span(class="fm-title-text")
-              | !{variable.mainTitle}
+              | !{variable.i18nMainTitle}
     | {{content}}  
     div(class="fm-card-footer")
       if(variable.footerToolbar)

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}

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

@@ -1,9 +1,9 @@
-fm-steps(
-  class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-  v-if=variable.visible?variable.visible+"":"false"
-  :steps=variable.size?""+variable.size:undefined 
-  direction=variable.size?""+variable.size:undefined 
-  :current=variable.size?""+variable.size:undefined 
-  :fill=variable.size?""+variable.size:undefined 
+fm-steps(
+  class=(variable.appearance && variable.appearance.class)
+  style=(variable.appearance && variable.appearance.style)
+  v-if=variable.visible?variable.visible+"":"false"
+  :steps=variable.size?""+variable.size:undefined 
+  direction=variable.size?""+variable.size:undefined 
+  :current=variable.size?""+variable.size:undefined 
+  :fill=variable.size?""+variable.size:undefined 
 )

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

@@ -23,6 +23,7 @@ div(
     :required=require
     :readonly=readonly
     :disabled=disable
+    :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
     :modelValue=variable.modelValue ? variable.modelValue+"":undefined 
     size=variable.size?""+variable.size:undefined 
   )&attributes(attrs)

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

@@ -9,6 +9,7 @@ fm-tab-bar(
   type=variable.displayType?variable.displayType:undefined
   :modelValue=binding
   :items=variable.items?variable.i18nItems:undefined
+  direction=variable.direction?variable.direction:undefined
   @change=variable.change?String(variable.change):undefined
 )&attributes(attrs)
   | {{content}}

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

@@ -0,0 +1,33 @@
+
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+- var visible = variable.visible ? String(variable.visible.value) : undefined;
+-var binding = variable.binding? variable.binding : undefined
+-var formatter = variable.formatter? variable.formatter : undefined
+-var formBindingPrefix = variable.formBindingPrefix? String(variable.formBindingPrefix):undefined
+-var formatterType = 'string'
+
+-var valueStr = ''
+
+if(binding && binding.type)
+    if(binding.type === 'Const')
+        -valueStr = `'${binding.value}'`;
+    if(binding.type === 'Form')
+        -valueStr = `${formBindingPrefix}${binding.bindingPath}`;
+    if(binding.type === 'LocaleVariable' || binding.type === 'RemoteVariable')
+        -valueStr = `uiState.${binding.code}`;
+
+if(formatter && formatter.type)
+    -formatterType = formatter.type
+    -delete formatter.type
+    
+-var content = `{{$formatUtils.${formatterType}(${valueStr},${JSON.stringify(formatter)})}}`
+
+fm-tag(
+  v-if=visible
+  type=variable.displayType ? String(variable.displayType) : undefined
+  size=variable.tagSize ? String(variable.tagSize) : undefined
+  color=variable.tagColor ? String(variable.tagColor) : undefined
+)&attributes(attrs)
+ | !{content}

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

@@ -1,6 +1,6 @@
 //- -variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
 -var attrs = {};
--attrs.type = "text"
+-attrs.type = variable.inputType? String(variable.inputType) : "text" 
 -attrs.class = variable.appearance && variable.appearance.class;
 -attrs.style = variable.appearance && variable.appearance.style;
 -attrs.id = variable.replacedId? String(variable.replacedId) : undefined 
@@ -25,14 +25,19 @@ div(
     :required=require
     :readonly=readonly
     :disabled=disable
+    input-align="right"
     :modelValue=variable.modelValue ? variable.modelValue+"":undefined 
     :clearable!=variable.clearable?variable.clearable+"":undefined
     :is-link!=variable.isLink?variable.isLink+"":undefined
     :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
     :formatter=variable.formatter?variable.formatter+"":undefined
+    :minValue!=variable.minValue?variable.minValue+"":undefined
+    :maxValue!=variable.maxValue?variable.maxValue+"":undefined
+    :maxlength!=variable.maxLength?variable.maxLength+"":undefined
+    :enableNull!=variable.enableNull?variable.enableNull+"":undefined
+    :precision=variable.precision || variable.precision===0?variable.precision+"":undefined
     updateOn=variable.updateOn?variable.updateOn+"":undefined
     direction=variable.direction?variable.direction+"":undefined
-    input-align="right"
     extra=variable.suffix?variable.suffix+"":undefined
     :error-message!=variable.errorMessage
     error-message-align=variable.errorMessage ? "right" : undefined
@@ -60,4 +65,3 @@ div(
             <div class="fm-input-label-tips-content"><span>!{variable.i18nLabelTips}</span></div>
           </template>
         </fm-popover>
-