@farris/jit-engine 1.3.187-dev → 1.3.188

package/lib/template/ui/mobilevue/checkbox-group.pug

@@ -1,26 +1,41 @@
--variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
--var attrs = variable.direction === 'vertical' ? {'#default': ''} : {'#value': ''}
--var direction = variable.displayType === 'button' ? 'horizontal' : variable.direction
+//- -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;
+-attrs.label = variable.title? String(variable.title) : undefined 
 -var checkerStyle = variable.checkerWidth ? { width: variable.checkerWidth + 'px' } : undefined
-div(class="fm-input-wrapper" v-if!=variable.visible?variable.visible+"":"false")
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var require = variable.require ? String(variable.require.value) : undefined;
+-var readonly = variable.readonly ? String(variable.readonly.value) : undefined;
+-var disable = variable.disable ? String(variable.disable.value) : undefined;
+-var inputDirection = variable.displayType !== 'button' ? 'vertical' : variable.direction
+-var direction = variable.displayType === 'button' ? 'horizontal' : variable.direction
+-var binding = variable.binding && variable.binding.path ? "form."+variable.binding.path+".value" : undefined 
+-var groupClass = inputDirection === 'horizontal' ? 'd-flex justify-content-end' : undefined
+-var items = variable.dataSourceType === 'dynamic' ? String(variable.bindDataSource.value) : variable.items
+
+div(
+  v-if=visible
+  class="fm-input-wrapper" 
+)
   fm-input(
-    class="fm-input-vertical"
-    label=variable.title?""+variable.title:undefined 
-    :required!=variable.require?variable.require+"":undefined
+    center
+    :required=require
+    input-align="right"
     :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
+    direction=inputDirection?inputDirection+"":undefined
     :error-message!=variable.errorMessage
     error-message-align=variable.errorMessage ? "right" : undefined
-  )
+  )&attributes(attrs)
     template(#default)
       fm-checkbox-group(
-        class=(variable.appearance && variable.appearance.class)
-        style=(variable.appearance && variable.appearance.style)
-        v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
-        :items=variable.items?""+variable.items:undefined
+        class=groupClass
+        v-model=binding
+        :readonly=readonly
+        :disabled=disable
+        :items=items ? items : undefined
         valueField=variable.valueField?""+variable.valueField:undefined
         textField=variable.textField?""+variable.textField:undefined
-        :readonly!=variable.readonly?variable.readonly+"":undefined
-        :disabled!=variable.readonly?variable.readonly+"":undefined
         :checkerStyle=checkerStyle
         direction=direction?direction+"":undefined
         type=variable.displayType?variable.displayType+"":undefined

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

@@ -0,0 +1,10 @@
+-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
+  id=variable.replacedId ? String(variable.replacedId) : undefined   
+)&attributes(attrs)
+  | {{content}}

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

@@ -1,12 +1,12 @@
-//- -var variable={"appearance": {"class": "p-2", "style": "width:'20px'"}};
 -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!=variable.visible?variable.visible+'':"false"
-    id=variable.replacedId?""+variable.replacedId:undefined  
-    class=(variable.appearance && variable.appearance.class) 
-    style=(variable.appearance && variable.appearance.style)  
+    v-if=visible
+    id=variable.replacedId ? String(variable.replacedId) : undefined    
     ref=variable.ref?""+variable.ref:undefined  
-    data-scrollable=variable.scrollable?""+variable.scrollable:undefined  
   )&attributes(attrs)
     | {{content}}

package/lib/template/ui/mobilevue/date-time-picker.pug

@@ -1,32 +1,50 @@
--variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
+//- -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;
+-attrs.id = variable.replacedId? String(variable.replacedId) : undefined 
+-attrs.placeholder = variable.placeholder? String(variable.placeholder) : undefined 
+-attrs.label = variable.title? String(variable.title) : undefined 
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var require = variable.require ? String(variable.require.value) : undefined;
+-var readonly = variable.readonly ? String(variable.readonly.value) : undefined;
+-var disable = variable.disable ? String(variable.disable.value) : undefined;
+-var binding = variable.binding && variable.binding.path ? "form."+variable.binding.path+".value" : undefined 
+-var minValue = variable.minValue ? String(variable.minValue.value) : undefined;
+-var maxValue = variable.maxValue ? String(variable.maxValue.value) : undefined;
 
-div(v-if!=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
+div(
+  v-if=visible
+  class="fm-input-wrapper" 
+)
   fm-datetime-picker(
-    style=(variable.appearance && variable.appearance.style)  
-    class=(variable.appearance && variable.appearance.class)  
+    v-model=binding
+    :required=require
+    :readonly=readonly
+    :disabled=disable
+    :minValue=minValue
+    :maxValue=maxValue
+    :modelValue=variable.modelValue ? variable.modelValue+"":undefined 
     inputClass=variable.direction === 'vertical' ? "fm-input-vertical" : undefined
-    v-if=variable.isTextArea?"!stateMachine['showStaticText']":undefined 
-    id=variable.id?""+variable.id:undefined 
-    label=variable.title?""+variable.title:undefined 
-    disable=variable.disable?""+variable.disable:undefined  
-    :readonly!=variable.readonly?""+variable.readonly:undefined
-    :required!=variable.require?variable.require+"":undefined
-    v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
-    placeholder=variable.placeholder?""+variable.placeholder:undefined
     type=variable.showType?""+variable.showType:undefined
     title=variable.title?""+variable.title:undefined
     format=variable.format?""+variable.format:undefined
     input-align="right"
+    direction=variable.direction?variable.direction+"":undefined
     :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
-    :minValue=variable.minValue?""+variable.minValue:undefined
-    :maxValue=variable.maxValue?""+variable.maxValue:undefined
     :useCurrentSecond=variable.useCurrentSecond?""+variable.useCurrentSecond:undefined
     :error-message!=variable.errorMessage
     error-message-align=variable.errorMessage ? "right" : undefined
-  )
+  )&attributes(attrs)
+    if(variable.leftTemplate)
+      template(#left-icon)
+        | !{variable.leftTemplate}
     if(variable.rightTemplate)
       template(#right-icon)
         | !{variable.rightTemplate}
+    if(variable.extraTemplate)
+      template(#extra)
+        | !{variable.extraTemplate}
     if(variable.labelTips) 
       template(#title)
         <span>!{variable.title}</span>

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

@@ -1,34 +1,15 @@
-- var titleClass = variable.isInner ? '' : 'fm-tmpl-header-with-img'
-fm-collapse(
-  v-if=variable.visible?variable.visible+"":"false"
-  title-class=variable.isInner ? undefined : 'fm-tmpl-header-with-img'
-  class=variable.isInner ? 'fm-tmpl-collapse-sub' : undefined
-  :isInner=variable.isInner ? ''+variable.isInner : undefined
-  :collapse=variable.collapse ? ''+variable.collapse : undefined
-) 
+-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-collapse-item(
+  v-if=visible
+  title=variable.title?String(variable.title) : undefined
+  position=variable.isInner ? 'bottom' : 'top'
+  :collapse=variable.collapse?String(variable.collapse): undefined
+)&attributes(attrs)
   if(variable.headerTemplate)
-    | !{variable.headerTemplate}
-    | {{content}}
-  else
-    if(variable.isInner)
-      <template #icon>
-        <h6 class="collapse">展开信息</h6>
-        <h6 class="expand">收起信息</h6>
-      </template>
-      <template #right-icon>
-        <span class="fm-icon fm-icon-cardunfold collapse-icon"></span>
-      </template>
-      | {{content}}
-      
-    else 
-      if(variable.title)
-        template(#title)
-          //- div(class="header-with-img--img-wrapper")
-          //-   div(class="header-with-img--img fm-bg-blue")
-          //-     span(class="fm-icon fm-icon-addpicture")
-          //- h5
-          //-   =variable.title
-          div(class="fm-title")
-            span(class="fm-title-text")
-              | !{variable.title}
-      | {{content}}
+      template(#title)
+        | !{variable.headerTemplate}
+  | {{content}}

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

@@ -1,21 +1,24 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-attrs.id = variable.replacedId ? String(variable.replacedId) : undefined;
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var searchFields = variable.searchFields ? String(variable.searchFields.value) : undefined;
+
 fm-filter(
-  style=(variable.appearance && variable.appearance.style)  
-  class=(variable.appearance && variable.appearance.class)  
-  v-if=variable.visible?variable.visible+"":"false"
-  id=variable.id?""+variable.id:undefined 
-  formId=variable.formId?""+variable.formId:undefined
+  v-if=visible
+  ref=variable.replacedId
+  :searchFields=searchFields
+  v-model=variable.binding?""+variable.binding:undefined 
   type=variable.showType?""+variable.showType:undefined
   position=variable.position?""+variable.position:undefined
   placeholder=variable.placeholder?""+variable.placeholder:undefined
-  v-model=variable.binding?""+variable.binding:undefined 
-  ref=variable.replacedId
-  :searchFields=variable.searchFields?""+variable.searchFields:undefined
   :searchBoxValue=variable.searchBoxValue?""+variable.searchBoxValue:undefined
   :useSearch=variable.useSearch?""+variable.useSearch:undefined
   :fieldConfigs=variable.fieldConfigs?""+variable.fieldConfigs:[] 
   @confirm=variable.onQuery?""+variable.onQuery:undefined
   @searchBoxChange=variable.searchBoxChange?""+variable.searchBoxChange:undefined
-) 
+)&attributes(attrs)
   if(variable.lookupCellTemplate)
     template(v-slot:lookup-cell="slotProps")
       | !{variable.lookupCellTemplate}

package/lib/template/ui/mobilevue/fm-staff-info.pug

@@ -0,0 +1,10 @@
+fm-staff-info(
+  v-if!=variable.visible?variable.visible+"":"false"
+  style!=(variable.appearance && variable.appearance.style)  
+  class!=(variable.appearance && variable.appearance.class)  
+  :name!=variable.staffName?"" + variable.name:undefined 
+  :title!=variable.titleText?"" + variable.titleText:undefined 
+  :sub-title!=variable.departmentName?"" + variable.department:undefined 
+  :staffId!=variable.staffId?"" + variable.staffId:undefined 
+  avatarType!=variable.avatarType?"" + variable.avatarType:undefined 
+)

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

@@ -1,12 +1,8 @@
 -var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
 
-if(variable.formAutoIntl == true)
-  div(id=variable.id?""+variable.id:undefined class=(variable.appearance && variable.appearance.class)?variable.appearance.class + "":undefined style=(variable.appearance && variable.appearance.style) )&attributes(attrs)
-    | {{content}}
-else
-  if ((variable.controlsInline + '') == "true")
-    div(id=variable.id?""+variable.id:undefined class=(variable.appearance && variable.appearance.class)?variable.appearance.class + " farris-form-controls-inline":undefined style=(variable.appearance && variable.appearance.style)  )&attributes(attrs)
-      | {{content}}
-  else
-    div(id=variable.id?""+variable.id:undefined class=(variable.appearance && variable.appearance.class) style=(variable.appearance && variable.appearance.style)   )&attributes(attrs)
-      | {{content}}
+div(
+  id=variable.id ? String(variable.id): undefined  
+)&attributes(attrs)
+  | {{content}}

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

@@ -1,21 +1,24 @@
 
+- var attrs = {};
+- attrs.class = variable.appearance && variable.appearance.class;
+- attrs.style = variable.appearance && variable.appearance.style;
 - var finished = variable.enablePullUpLoad ? "uiState['listaviewState']['loadMoreFinished']" : "true"
+- var loading = "uiState['listaviewState']['loadMoreLoading']"
+- var listRefreshing = variable.enablePullDownRefresh ? "uiState['listaviewState']['refreshLoading']" : undefined
 - var showFinishedText = variable.enablePullUpLoad ? undefined : "false"
+- var visible = variable.visible ? String(variable.visible.value) : undefined;
 
 fm-listview( 
-  v-if=variable.visible?variable.visible+"":"false"
-  className="fm-tmpl-list-with-img-detail"
-  style=(variable.appearance && variable.appearance.style)  
-  class=(variable.appearance && variable.appearance.class)  
+  v-if=visible
   ref=variable.replacedId
-  :list-data=variable.data?""+variable.data:"entityListData" 
   :finished=finished
   :showFinishedText=showFinishedText
-  :loading="uiState['listaviewState']['loadMoreLoading']"
+  :loading=loading
+  :listRefreshing=listRefreshing
+  :list-data=variable.data?""+variable.data:"entityListData" 
   :enablePullRefresh = variable.enablePullDownRefresh ? 'true' : undefined
-  :listRefreshing=variable.enablePullDownRefresh ? "uiState['listaviewState']['refreshLoading']" : undefined
-  :multiple=(variable.multiSelect ||variable.multiSelect==false)?""+variable.multiSelect:undefined 
-  :offset=(variable.offset || variable.offset==0)?""+variable.offset:undefined 
+  :multiple=(variable.multiSelect || variable.multiSelect === false)?""+variable.multiSelect:undefined 
+  :offset=(variable.offset || variable.offset === 0 )?""+variable.offset:undefined 
   :loadingText=variable.loadingText?"'"+variable.loadingText+"'":undefined 
   :finishedText=variable.finishedText?"'"+variable.finishedText+"'":undefined 
   :errorText=variable.errorText?"'"+variable.errorText+"'":undefined 
@@ -26,11 +29,11 @@ fm-listview(
   :fill=variable.fill?""+variable.fill:undefined 
   :immediateCheck=variable.immediateCheck?""+variable.immediateCheck:"false"
   data-scrollable=variable.scrollable?""+variable.scrollable:undefined  
-  v-on:load=variable.load?""+variable.load:undefined 
-  v-on:multipleSubmit=variable.multipleSubmit?""+variable.multipleSubmit:undefined 
-  v-on:multipleCancel=variable.multipleCancel?""+variable.multipleCancel:undefined 
-  v-on:itemClick=variable.itemClick?""+variable.itemClick:undefined
-)
+  @load=variable.load?""+variable.load:undefined 
+  @multipleSubmit=variable.multipleSubmit?""+variable.multipleSubmit:undefined 
+  @multipleCancel=variable.multipleCancel?""+variable.multipleCancel:undefined 
+  @itemClick=variable.itemClick?""+variable.itemClick:undefined
+)&attributes(attrs)
   if(variable.showValidatorResults)
     template(#listViewHeader v-if!="uiState.childValidatorResults && uiState.childValidatorResults.length > 0")
       div(class="fm-listview-error")
@@ -46,23 +49,32 @@ fm-listview(
           <span class="fm-error-text">详情</span>
 
   template(v-slot="props")
-    if(variable.swipeToolbar)
+    if(variable.swipeTemplate)
+      fm-swipecell
+        !=variable.swipeTemplate?variable.swipeTemplate:''
+        div(
+          class="fm-listview-item-tmpl-wrapper"
+          @click=variable.listClick?""+variable.listClick:undefined
+        )
+          !=variable.contentTemplate?variable.contentTemplate:''
+    else if(variable.swipeToolbar && variable.swipeToolbar.items && variable.swipeToolbar.items.length >0)
       fm-swipecell
         template(v-slot:right="{close}")
           each item in variable.swipeToolbar.items
-            div( 
-              v-if!=item.visible?item.visible+"":"false"
-              class="fm-list-view-swipe-toolbar"
-              style!=item.style?item.style+"":undefined
+            div(
+              v-if!=item.visible?String(item.visible.value):undefined
+              class=item.appearance && item.appearance.class? item.appearance.class + " fm-list-view-swipe-toolbar" : "fm-list-view-swipe-toolbar"
+              style!=item.appearance && item.appearance.style
               @click.stop=item.click?item.click+"({ swipecellClose: close })":undefined
             )=item.text
-        div(class="fm-bussiness-travel-record-list-item limg-rcon--item" @click=variable.listClick?""+variable.listClick:undefined)
-          !=variable.contentTemplate?variable.contentTemplate:''
-    else if(variable.swipeTemplate)
-      fm-swipecell(@click=variable.listClick?""+variable.listClick:undefined)
-        !=variable.swipeTemplate?variable.swipeTemplate:''
-        div(class="fm-bussiness-travel-record-list-item limg-rcon--item")
+        div(
+          class="fm-listview-item-tmpl-wrapper"
+          @click=variable.listClick?""+variable.listClick:undefined
+        )
           !=variable.contentTemplate?variable.contentTemplate:''
     else 
-      div(class="fm-bussiness-travel-record-list-item limg-rcon--item" @click=variable.listClick?""+variable.listClick:undefined)
-          !=variable.contentTemplate?variable.contentTemplate:''
+      div(
+        class="fm-listview-item-tmpl-wrapper"
+        @click=variable.listClick?""+variable.listClick:undefined
+      )
+        !=variable.contentTemplate?variable.contentTemplate:''

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

@@ -1,21 +1,29 @@
--variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
+//- -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;
+-attrs.id = variable.replacedId? String(variable.replacedId) : undefined 
+-attrs.placeholder = variable.placeholder? String(variable.placeholder) : undefined 
+-attrs.label = variable.title? String(variable.title) : undefined 
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var require = variable.require ? String(variable.require.value) : undefined;
+-var readonly = variable.readonly ? String(variable.readonly.value) : undefined;
+-var disable = variable.disable ? String(variable.disable.value) : undefined;
+-var binding = variable.binding && variable.binding.path ? "form."+variable.binding.path+".value" : undefined 
 
-div(v-if!=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
+div(
+  v-if=visible
+  class="fm-input-wrapper" 
+)
   fm-lookup-department(
-    style=(variable.appearance && variable.appearance.style)  
-    class=(variable.appearance && variable.appearance.class)  
-    v-if=variable.isTextArea?"!stateMachine['showStaticText']":undefined 
-    id=variable.id?""+variable.id:undefined 
-    label=variable.title?""+variable.title:undefined 
+    v-model=binding
+    :required=require
+    :readonly=readonly
+    :disabled=disable
+    :modelValue=variable.value ? variable.value+"":undefined 
     title=variable.title?""+variable.title:undefined 
     navTitle=variable.navTitle?""+variable.navTitle:undefined 
-    disabled!=variable.disabled?""+variable.disabled:undefined 
-    :readonly!=variable.readonly?""+variable.readonly:undefined
-    :required!=variable.require?variable.require+"":undefined
     :clearable!=variable.clearable?variable.clearable+"":undefined
-    placeholder=variable.placeholder?""+variable.placeholder:undefined 
-    v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
-    modelValue=variable.value ?""+variable.value:undefined 
     url=variable.dataSource.uri?""+variable.dataSource.uri:undefined 
     data=variable.data?""+variable.data:undefined
     idField=variable.dataSource.idField?""+variable.dataSource.idField:undefined 
@@ -47,11 +55,15 @@ div(v-if!=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
     :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
     :error-message!=variable.errorMessage
     error-message-align=variable.errorMessage ? "right" : undefined
+    direction=variable.direction?variable.direction+"":undefined
     inputTemplate=variable.inputTemplateName?""+variable.inputTemplateName:undefined 
     :formatter=variable.formatter?""+variable.formatter:undefined 
     @confirm=variable.lookupPicked?""+variable.lookupPicked:undefined 
     @valueChange=variable.valueChange?""+variable.valueChange:undefined 
-  )
+  )&attributes(attrs)
+    if(variable.leftTemplate)
+      template(#left-icon)
+        | !{variable.leftTemplate}
     if(variable.rightTemplate)
       template(#right-icon)
         | !{variable.rightTemplate}

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

@@ -1,22 +1,30 @@
--variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
+//- -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;
+-attrs.id = variable.replacedId? String(variable.replacedId) : undefined 
+-attrs.placeholder = variable.placeholder? String(variable.placeholder) : undefined 
+-attrs.label = variable.title? String(variable.title) : undefined 
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var require = variable.require ? String(variable.require.value) : undefined;
+-var readonly = variable.readonly ? String(variable.readonly.value) : undefined;
+-var disable = variable.disable ? String(variable.disable.value) : undefined;
+-var binding = variable.binding && variable.binding.path ? "form."+variable.binding.path+".value" : undefined 
 
-div(v-if!=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
+div(
+  v-if=visible
+  class="fm-input-wrapper" 
+)
   fm-lookup-employee(
-    style=(variable.appearance && variable.appearance.style)  
-    class=(variable.appearance && variable.appearance.class)  
-    v-if=variable.isTextArea?"!stateMachine['showStaticText']":undefined 
-    id=variable.id?""+variable.id:undefined 
-    label=variable.title?""+variable.title:undefined 
+    v-model=binding
+    :required=require
+    :readonly=readonly
+    :disabled=disable
+    :modelValue=variable.value ? variable.value+"":undefined 
     title=variable.title?""+variable.title:undefined 
     navTitle=variable.navTitle?""+variable.navTitle:undefined 
     groupTitle=variable.groupTitle?""+variable.groupTitle:undefined 
-    disabled!=variable.disabled?""+variable.disabled:undefined 
-    :readonly!=variable.readonly?""+variable.readonly:undefined
-    :required!=variable.require?variable.require+"":undefined
     :clearable!=variable.clearable?variable.clearable+"":undefined
-    placeholder=variable.placeholder?""+variable.placeholder:undefined 
-    v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
-    modelValue=variable.value ?""+variable.value:undefined 
     url=variable.dataSource.uri?""+variable.dataSource.uri:undefined 
     data=variable.data?""+variable.data:undefined
     idField=variable.dataSource.idField?""+variable.dataSource.idField:undefined 
@@ -48,12 +56,16 @@ div(v-if!=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
     inputTemplate=variable.inputTemplateName?""+variable.inputTemplateName:undefined 
     :formatter=variable.formatter?""+variable.formatter:undefined 
     :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
+    direction=variable.direction?variable.direction+"":undefined
     dataStrategy!=variable.dataStrategy?variable.dataStrategy+"":undefined
     :error-message!=variable.errorMessage
     error-message-align=variable.errorMessage ? "right" : undefined
     @confirm=variable.lookupPicked?""+variable.lookupPicked:undefined 
     @valueChange=variable.valueChange?""+variable.valueChange:undefined 
-  )
+  )&attributes(attrs)
+    if(variable.leftTemplate)
+      template(#left-icon)
+        | !{variable.leftTemplate}
     if(variable.rightTemplate)
       template(#right-icon)
         | !{variable.rightTemplate}

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

@@ -1,23 +1,31 @@
--variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
+//- -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;
+-attrs.id = variable.replacedId? String(variable.replacedId) : undefined 
+-attrs.placeholder = variable.placeholder? String(variable.placeholder) : undefined 
+-attrs.label = variable.title? String(variable.title) : undefined 
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var require = variable.require ? String(variable.require.value) : undefined;
+-var readonly = variable.readonly ? String(variable.readonly.value) : undefined;
+-var disable = variable.disable ? String(variable.disable.value) : undefined;
+-var binding = variable.binding && variable.binding.path ? "form."+variable.binding.path+".value" : undefined 
 
-div(v-if!=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
+div(
+  v-if=visible
+  class="fm-input-wrapper" 
+)
   fm-lookup-input(
-    style=(variable.appearance && variable.appearance.style)  
-    class=(variable.appearance && variable.appearance.class)  
-    inputClass=variable.direction === 'vertical' ? "fm-input-vertical" : undefined
-    v-if!=variable.isTextArea?"!stateMachine['showStaticText']":undefined 
-    id=variable.id?""+variable.id:undefined 
-    label=variable.title?""+variable.title:undefined 
+    v-model=binding
+    :required=require
+    :readonly=readonly
+    :disabled=disable
+    :modelValue=variable.value ? variable.value+"":undefined 
+    direction=variable.direction?variable.direction+"":undefined
     title=variable.title?""+variable.title:undefined 
     navTitle=variable.navTitle?""+variable.navTitle:undefined 
     groupTitle=variable.groupTitle?""+variable.groupTitle:undefined 
-    disabled!=variable.disabled?""+variable.disabled:undefined 
-    :readonly!=variable.readonly?""+variable.readonly:undefined
-    :required!=variable.require?variable.require+"":undefined
     :clearable!=variable.clearable?variable.clearable+"":undefined
-    placeholder=variable.placeholder?""+variable.placeholder:undefined 
-    v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
-    modelValue=variable.value ?""+variable.value:undefined 
     url=variable.dataSource.uri?""+variable.dataSource.uri:undefined 
     data=variable.data?""+variable.data:undefined
     idField=variable.dataSource.idField?""+variable.dataSource.idField:undefined 
@@ -52,14 +60,19 @@ div(v-if!=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
     :labelWidth!=variable.labelWidth?variable.labelWidth+"":undefined
     :formatter!=variable.formatter?""+variable.formatter:undefined 
     :error-message!=variable.errorMessage
-
     error-message-align=variable.errorMessage ? "right" : undefined
     @confirm=variable.lookupPicked?""+variable.lookupPicked:undefined 
     @valueChange=variable.valueChange?""+variable.valueChange:undefined 
-  )
+  )&attributes(attrs)
+    if(variable.leftTemplate)
+      template(#left-icon)
+        | !{variable.leftTemplate}
     if(variable.rightTemplate)
       template(#right-icon)
         | !{variable.rightTemplate}
+    if(variable.extraTemplate)
+      template(v-slot:extra="slotProps")
+        | !{variable.extraTemplate}
     if(variable.inputTemplate)
       template(v-slot:template="slotProps")
         | !{variable.inputTemplate}
@@ -69,9 +82,6 @@ div(v-if!=variable.visible?variable.visible+"":"false" class="fm-input-wrapper")
     if(variable.cellTemplate)
       template(v-slot:cell="slotProps")
         | !{variable.cellTemplate}
-    if(variable.extraTemplate)
-      template(v-slot:extra="slotProps")
-        | !{variable.extraTemplate}
     if(variable.labelTips) 
       template(#title)
         <span>!{variable.title}</span>

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

@@ -1,17 +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) : undefined;
+
 fm-navbar(
-  style=(variable.appearance && variable.appearance.style)  
-  class=(variable.appearance && variable.appearance.class)  
+  v-if=visible
   id=variable.replaceId 
   title=variable.title?""+variable.title:undefined 
   :leftArrow=variable.leftArrow!==undefined?""+variable.leftArrow:undefined 
   @click-left=variable.leftClick?""+variable.leftClick:undefined 
   @click-right=variable.rightClick?""+variable.rightClick:undefined 
-  v-if=variable.visible?variable.visible+"":"false"
-)
+)&attributes(attrs)
   if variable.leftTemplate
     template(#left)
       | !{variable.leftTemplate}
-      //- van-icon( name="arrow-left" size="18" color="#333" )
   if variable.titleTemplate  
     template(#title)
       | !{variable.titleTemplate}