@farris/jit-engine 1.3.269 → 1.3.271

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

@@ -0,0 +1,22 @@
+-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';
+-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!=""+visible
+	id!=variable.id?"" + variable.id:undefined
+	width!=variable.width?"" + variable.width:undefined 
+	height!=variable.height?"" + variable.height:undefined
+	radius!=variable.radius?"" + variable.radius:undefined
+	:fit=variable.fit?"" + variable.fit:undefined 
+  :round=variable.round?"" + variable.round:undefined 
+)&attributes(attrs)

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

@@ -5,7 +5,7 @@
 
 fm-staff-info(
   v-if=visible
-  title!=variable.titleText?"" + variable.titleText:undefined 
+  :title!=variable.titleText? variable.i18nTitleText:undefined 
   :name!=variable.staffName?"" + variable.staffName:undefined 
   :sub-title!=variable.departmentName?"" + variable.departmentName:undefined 
   :staffId!=variable.staffId?"" + variable.staffId:undefined 

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

@@ -4,8 +4,6 @@
 -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.title = variable.title? String(variable.title) : undefined 
 -attrs.ref = variable.replacedId? String(variable.replacedId) : undefined 
 -attrs.bindingpath = variable.binding && variable.binding.path ? variable.binding.path : undefined 
 -var visible = variable.visible ? String(variable.visible.value) : 'false';
@@ -20,6 +18,8 @@ div(
   )
   fm-switch-cell(
     v-model=binding
+    :title = variable.title? variable.i18nTitle: undefined 
+    :placeholder = variable.placeholder? variable.i18nPlaceholder : undefined 
     :required=require
     :readonly=readonly
     :disabled=disable
@@ -41,6 +41,6 @@ div(
         <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>
+            <div class="fm-input-label-tips-content"><span>!{variable.i18nLabelTips}</span></div>
           </template>
         </fm-popover>

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

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

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

@@ -4,12 +4,10 @@
 -attrs.name = variable.replacedId ? String(variable.replacedId) : undefined;
 -var bindTitle = variable.bindTitle ? variable.bindTitle.path ? 'uiState.' + variable.bindTitle.path : variable.bindTitle : undefined
 -var visible = variable.visible ? String(variable.visible.value) : 'false';
--var title = !bindTitle && variable.title ? String(variable.title) : undefined
 
 fm-tab(
   v-if=visible
-  title= title
-  :title=bindTitle
+  :title=bindTitle ? bindTitle : variable.i18nTitle
   id=variable.replacedId ? String(variable.replacedId) : 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-area.pug

@@ -4,8 +4,6 @@
 -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 
 -attrs.ref = variable.replacedId? String(variable.replacedId) : undefined 
 -attrs.bindingpath = variable.binding && variable.binding.path ? variable.binding.path : undefined 
 -var visible = variable.visible ? String(variable.visible.value) : 'false';
@@ -14,12 +12,15 @@
 -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=visible
   class="fm-input-wrapper" 
 )
   fm-input(
     v-model=binding
+    :label = variable.title? variable.i18nTitle : undefined 
+    :placeholder = variable.placeholder? variable.i18nPlaceholder : undefined 
     :required=require
     :readonly=readonly
     :disabled=disable
@@ -41,6 +42,6 @@ div(
         <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>
+            <div class="fm-input-label-tips-content"><span>!{variable.i18nLabelTips}</span></div>
           </template>
         </fm-popover>

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

@@ -4,8 +4,6 @@
 -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 
 -attrs.ref = variable.replacedId? String(variable.replacedId) : undefined 
 -attrs.bindingpath = variable.binding && variable.binding.path ? variable.binding.path : undefined 
 -var visible = variable.visible ? String(variable.visible.value) : 'false';
@@ -15,6 +13,8 @@
 -var binding = variable.binding && variable.binding.path ? "form."+variable.binding.path+".value" : undefined 
 
 
+
+
 div(
   v-if=visible
   class="fm-input-wrapper" 
@@ -22,6 +22,8 @@ div(
   fm-input(
     ref=variable.id?"" + variable.id:undefined 
     v-model=binding
+    :label = variable.title? variable.i18nTitle : undefined 
+    :placeholder = variable.placeholder? variable.i18nPlaceholder : undefined 
     :required=require
     :readonly=readonly
     :disabled=disable
@@ -60,7 +62,7 @@ div(
         <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>
+            <div class="fm-input-label-tips-content"><span>!{variable.i18nLabelTips}</span></div>
           </template>
         </fm-popover>
  

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

@@ -4,8 +4,6 @@
 -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 
 -attrs.ref = variable.replacedId? String(variable.replacedId) : undefined 
 -attrs.bindingpath = variable.binding && variable.binding.path ? variable.binding.path : undefined 
 -var visible = variable.visible ? String(variable.visible.value) : 'false';
@@ -14,12 +12,16 @@
 -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=visible
   class="fm-input-wrapper" 
 )
   fm-input(
     v-model=binding
+    :label = variable.title? variable.i18nTitle : undefined 
+    :placeholder = variable.placeholder? variable.i18nPlaceholder : undefined 
     :required=require
     :readonly=readonly
     :disabled=disable
@@ -54,7 +56,7 @@ div(
         <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>
+            <div class="fm-input-label-tips-content"><span>!{variable.i18nLabelTips}</span></div>
           </template>
         </fm-popover>
  

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

@@ -3,8 +3,6 @@
 -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 
 -attrs.ref = variable.replacedId? String(variable.replacedId) : undefined 
 -attrs.bindingpath = variable.binding && variable.binding.path ? variable.binding.path : undefined 
 -var visible = variable.visible ? String(variable.visible.value) : 'false';
@@ -13,12 +11,16 @@
 -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=visible
   class="fm-input-wrapper" 
   )
   fm-scan-input(
     v-model=binding
+    :label = variable.title? variable.i18nTitle : undefined 
+    :placeholder = variable.placeholder? variable.i18nPlaceholder : undefined 
     :required=require
     :readonly=readonly
     :disabled=disable
@@ -47,7 +49,7 @@ div(
         <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>
+            <div class="fm-input-label-tips-content"><span>!{variable.i18nLabelTips}</span></div>
           </template>
         </fm-popover>
  

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

@@ -3,8 +3,6 @@
 -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 
 -attrs.ref = variable.replacedId? String(variable.replacedId) : undefined 
 -attrs.bindingpath = variable.binding && variable.binding.path ? variable.binding.path : undefined 
 -var visible = variable.visible ? String(variable.visible.value) : 'false';
@@ -13,12 +11,16 @@
 -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=visible
   class="fm-input-wrapper" 
   )
   fm-telphone-input(
     v-model=binding
+    :label = variable.title? variable.i18nTitle : undefined 
+    :placeholder = variable.placeholder? variable.i18nPlaceholder : undefined 
     :required=require
     :readonly=readonly
     :disabled=disable

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

@@ -0,0 +1,118 @@
+-var enableLabel = variable.enableLabel
+-var attrs = {};
+-attrs.class = variable.appearance && variable.appearance.class ?variable.appearance.class:'';
+-attrs.style = variable.appearance && variable.appearance.style?variable.appearance.style:'';
+-attrs.id = variable.replacedId? String(variable.replacedId) : undefined 
+-var visible = variable.visible ? String(variable.visible.value) : 'false';
+-var binding = variable.binding? variable.binding : undefined
+-var fontSize = variable.fontSize? String(variable.fontSize) : undefined 
+-var lineHeight = variable.lineHeight? String(variable.lineHeight) : undefined 
+-var textColor = variable.textColor? String(variable.textColor) : undefined 
+-var formatter = variable.formatter ? variable.formatter:{}
+-var displayType = variable.displayType? String(variable.displayType) : undefined 
+-var formatterType = 'string'
+-var valueStr = ''
+-var formBindingPrefix = variable.formBindingPrefix? String(variable.formBindingPrefix):undefined
+-var wrapPosition = variable.wrapPosition? variable.wrapPosition : undefined
+
+-var label = variable.label
+-var labelAppearance = variable.labelAppearance;
+-var labelSize = variable.labelSize
+-var labelFontSize = variable.labelFontSize
+-var labelLineHeight = variable.labelLineHeight
+-var labelColor = variable.labelColor
+-var labelattrs = {};
+-labelattrs.class = 'fm-common-label ';
+-labelattrs.class += variable.labelAppearance && variable.labelAppearance.class ?variable.labelAppearance.class:'';
+-labelattrs.style = variable.labelAppearance && variable.labelAppearance.style?variable.labelAppearance.style:'';
+
+
+//--启用标签时，文本的样式
+-var textCls = 'fm-common-text '
+
+//--样式class
+-attrs.class = `fm-common-field ${attrs.class} `
+-attrs.class  += displayType && displayType.startsWith('title-') ? 'fm-common-title':''
+if(displayType)
+    -attrs.class += ` fm-${displayType}`
+
+if(enableLabel && wrapPosition === 'afterLabel')
+    -attrs.class  +=   ' d-flex ';
+ 
+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}`;
+
+-var labelContent = ''
+if(enableLabel)
+    if(typeof label==='string')
+        -labelContent = `${label}`;
+    else if(label && typeof label==='object' && label.fullPath)
+        -labelContent = `{{ uiState.${label.fullPath} }}`;
+    else 
+        -labelContent = '';
+
+if(formatter && formatter.type)
+    -formatterType = formatter.type
+    -delete formatter.type
+
+-var content = `{{$formatUtils.${formatterType}(${valueStr},${JSON.stringify(formatter)})}}`
+
+
+//--样式
+if(attrs.style)
+    -attrs.style += `;`
+
+if(textColor)
+    -attrs.style += ` color:${textColor};`
+
+//--内容
+if(variable.size && variable.size.width)
+    -attrs.style += `width:${variable.size.width}px;`
+
+
+if(variable.size && variable.size.height)
+    -attrs.style += `height:${variable.size.height}px;`
+
+if(fontSize)
+    -attrs.style += `font-size:${fontSize}px;`
+
+if(lineHeight)
+    -attrs.style += `line-height:${lineHeight}px;`
+
+//--标签样式
+if(enableLabel)
+    if(labelattrs.style)
+        -labelattrs.style += `;`
+
+    if(labelColor)
+        -labelattrs.style += ` color:${labelColor};`
+
+    if(variable.labelSize && variable.labelSize.width)
+        -labelattrs.style += `width:${variable.labelSize.width}px;`
+
+
+    if(variable.labelSize && variable.labelSize.height)
+        -labelattrs.style += `height:${variable.labelSize.height}px;`
+
+    if(labelFontSize)
+        -labelattrs.style += `font-size:${labelFontSize}px;`
+
+    if(labelLineHeight)
+        -labelattrs.style += `line-height:${labelLineHeight}px;`
+
+div(
+    v-if=visible
+)&attributes(attrs)
+    if(enableLabel)
+        label()&attributes(labelattrs)
+            | !{labelContent}
+
+    span(
+        class=textCls
+    )
+        | !{content}

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

@@ -12,4 +12,4 @@ div(
         if(variable.iconType) 
             div(class=iconClass)
         div(class="fm-popover-item-content")
-            | !{variable.text?variable.text:""}
+            | !{variable.text?variable.i18nText:""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/jit-engine",
-  "version": "1.3.269",
+  "version": "1.3.271",
   "description": "",
   "main": "./lib/index.js",
   "bin": {

package/lib/mobileapp/vue/static/.npmignore

@@ -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