@farris/jit-engine 1.3.184-dev → 1.3.185

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

@@ -1,25 +1,51 @@
--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(class="fm-input-wrapper" v-if!=variable.visible?variable.visible+"":"false")
+div(
+  v-if=visible
+  class="fm-input-wrapper" 
+  )
   fm-scan-input(
-    style=(variable.appearance && variable.appearance.style)  
-    class=variable.className
-    id=variable.id?"" + variable.id:undefined 
-    v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
+    v-model=binding
+    :required=require
+    :readonly=readonly
+    :disabled=disable
     :modelValue=variable.modelValue ?variable.modelValue+"":undefined 
-    label=variable.title?variable.title:undefined 
-    placeholder=variable.placeholder?""+variable.placeholder:undefined 
-    type="text"
-    :readonly!=variable.readonly?variable.readonly+"":undefined
-    :required!=variable.require?variable.require+"":undefined
-    :disabled!=variable.disabled?variable.disabled+"":undefined
     :clearable!=variable.clearable?variable.clearable+"":undefined
     :is-link!=variable.isLink?variable.isLink+"":undefined
     :labelWidth!=variable.labelWidth?variable.labelWidth+"":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
-  )
-    
+  )&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>
+        <fm-popover :hasMask="false" placement="topLeft" className="fm-input-label-tips" :offset="{left: -5}">
+          <fm-icon name="s-illustrate-o"/>
+          <template #content>
+            <div class="fm-input-label-tips-content"><span>!{variable.labelTips}</span></div>
+          </template>
+        </fm-popover>
  

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

@@ -1,25 +1,34 @@
--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(class="fm-input-wrapper" v-if!=variable.visible?variable.visible+"":"false")
+div(
+  v-if=visible
+  class="fm-input-wrapper" 
+  )
   fm-telphone-input(
-    style=(variable.appearance && variable.appearance.style)  
-    class=variable.className
-    id=variable.id?"" + variable.id:undefined 
-    v-model=variable.binding && variable.binding.path?"form."+variable.binding.path+".value":undefined 
+    v-model=binding
+    :required=require
+    :readonly=readonly
+    :disabled=disable
     :modelValue=variable.modelValue ?variable.modelValue+"":undefined 
-    label=variable.title?variable.title:undefined 
-    placeholder=variable.placeholder?""+variable.placeholder:undefined 
-    type="text"
-    :readonly!=variable.readonly?variable.readonly+"":undefined
-    :required!=variable.require?variable.require+"":undefined
-    :disabled!=variable.disabled?variable.disabled+"":undefined
     :clearable!=variable.clearable?variable.clearable+"":undefined
     :is-link!=variable.isLink?variable.isLink+"":undefined
     :labelWidth!=variable.labelWidth?variable.labelWidth+"":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
-  )
+  )&attributes(attrs)
     
  

package/lib/template/ui/mobilevue/toolbar-area.pug

@@ -1,7 +1,10 @@
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class;
+-attrs.style = variable.appearance && variable.appearance.style;
+-attrs.type = variable.displayType ? String(variable.displayType) : undefined
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+
 fm-button-group(
-  v-if=variable.visible?variable.visible+"":"false"
-  class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-  type=variable.displayType?variable.displayType+"":undefined
+  v-if=visible
   :items=variable.items?variable.items+"":undefined
-)
+)&attributes(attrs)

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

@@ -1,5 +1,13 @@
 -var iconClass = "fm-popover-item-icon " + variable.iconType ? variable.iconType : '';
-div(class="fm-popover-item" "v-on:click"=variable.click?""+variable.click:undefined v-if=variable.visible?variable.visible+"":"false")
+-var visible = variable.visible ? String(variable.visible.value) : undefined;
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class ? variable.appearance.class + " fm-popover-item" : "fm-popover-item";
+-attrs.style = variable.appearance && variable.appearance.style;
+
+div(
+    v-if=visible
+    @click=variable.click?""+variable.click:undefined 
+)&attributes(attrs)
     div(class="fm-popover-item-container")
         if(variable.iconType) 
             div(class=iconClass)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/jit-engine",
-  "version": "1.3.184-dev",
+  "version": "1.3.185",
   "description": "",
   "main": "./lib/index.js",
   "bin": {
@@ -34,6 +34,7 @@
   "dependencies": {
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.10",
+    "nrm": "^1.2.5",
     "prettier": "^1.18.2",
     "pug": "^2.0.0-rc.4",
     "typescript-ioc": "^1.2.4",
@@ -53,4 +54,4 @@
     "tslint": "^5.18.0",
     "typescript": "^3.5.3"
   }
-}
+}

package/lib/mobileapp/vue/static/.gitignore

@@ -1,13 +0,0 @@
-.DS_Store
-node_modules/
-dist/
-dist-rollup/
-npm-debug.log
-yarn-error.log
-
-# Editor directories and files
-.idea
-*.suo
-*.ntvs*
-*.njsproj
-*.sln