@farris/jit-engine 1.3.306 → 1.3.308

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

@@ -1,11 +1,9 @@
 //- -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 
--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,22 +12,30 @@
 -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
+    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
+    :enableNull!=variable.enableNull?variable.enableNull+"":undefined
+    :precision=variable.precision || variable.precision===0?variable.precision+"":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
@@ -54,7 +60,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,105 @@
+-var enableLabel = variable.enableLabel
+
+-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 fontWeight = variable.fontWeight? String(variable.fontWeight) : undefined 
+-var color = variable.color? String(variable.color) : undefined 
+-var formatter = variable.formatter ? variable.formatter:{}
+-var displayType = variable.displayType? String(variable.displayType) : undefined 
+-var formatterType = 'string'
+-var formBindingPrefix = variable.formBindingPrefix? String(variable.formBindingPrefix):undefined
+
+-var wrapPosition = variable.wrapPosition? variable.wrapPosition : undefined
+-var labelText = variable.labelText
+-var labelFontSize = variable.labelFontSize
+-var labelLineHeight = variable.labelLineHeight
+-var labelColor = variable.labelColor
+-var labelFontWeight = variable.labelFontWeight
+-var labelWidth = variable.labelWidth
+
+//--文本样式
+-var textAttrs = {};
+-textAttrs.id = variable.replacedId? String(variable.replacedId) : undefined 
+-textAttrs.class = displayType && displayType.startsWith('title-') ? 'fm-common-title ':'fm-common-text ';
+-textAttrs.style = '';
+if(displayType)
+    -textAttrs.class += ` fm-${displayType}`
+if(enableLabel && wrapPosition === 'afterLabel')
+    -textAttrs.class  +=   ' d-flex ';
+if(variable.appearance && variable.appearance.class)
+    -textAttrs.class += variable.appearance.class;
+
+if(color)
+    -textAttrs.style += `color:${color};`
+if(variable.size && variable.size.width)
+    -textAttrs.style += `width:${variable.size.width}px;`
+if(variable.size && variable.size.height)
+    -textAttrs.style += `height:${variable.size.height}px;`
+if(fontSize)
+    -textAttrs.style += `font-size:${fontSize}px;`
+if(lineHeight)
+    -textAttrs.style += `line-height:${lineHeight}px;`
+if(fontWeight)
+    -textAttrs.style += `font-weight:${fontWeight};`
+if(variable.appearance && variable.appearance.style)
+    -textAttrs.style += variable.appearance.style;
+
+//--标签属性
+-var labelAttrs = {};
+if(enableLabel)
+    -labelAttrs.class = 'fm-common-label ';
+    -labelAttrs.style = '';
+    if(variable.labelAppearance && variable.labelAppearance.class)
+        -labelAttrs.class += variable.labelAppearance.class;
+    if(labelColor)
+        -labelAttrs.style += `color:${labelColor};`
+    if(labelFontSize)
+        -labelAttrs.style += `font-size:${labelFontSize}px;`
+    if(labelFontWeight)
+        -labelAttrs.style += `font-weight:${labelFontWeight};`
+    if(labelWidth)
+        -labelAttrs.style += `width:${labelWidth}px;`
+
+
+//--文本内容属性
+-var contenAtttrs = {};
+-contenAtttrs.class = 'fm-common-content '
+
+//--绑定值
+-var contentStr = ''
+if(binding && binding.type)
+    if(binding.type === 'Static')
+        -contentStr = `'${binding.value}'`;
+    if(binding.type === 'Form')
+        -contentStr = `${formBindingPrefix}${binding.bindingPath}`;
+    if(binding.type === 'Variable')
+        -contentStr = `uiState.${binding.path}`;
+
+if(formatter && formatter.type)
+    -formatterType = formatter.type==='boolean'?'bool':formatter.type;
+    -delete formatter.type
+    -contentStr = `{{$formatUtils.${formatterType}(${contentStr},${JSON.stringify(formatter)})}}`
+else if(binding.type === 'Form' || binding.type === 'Variable')
+        -contentStr = `{{ ${contentStr} }}`;
+
+-var labelStr = ''
+if(enableLabel)
+    if(typeof labelText==='string')
+        -labelStr = `${labelText}`;
+    else if(labelText && typeof labelText==='object' && labelText.path)
+        -labelStr = `{{ uiState.${labelText.path} }}`;
+    else 
+        -labelStr = '';
+
+div(
+    v-if=visible
+    @click=variable.click ? String(variable.click) : undefined 
+)&attributes(textAttrs)
+    if(enableLabel)
+        label()&attributes(labelAttrs)
+            | !{labelStr}
+    span(
+    )&attributes(textAttrs)
+        | !{contentStr}

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

@@ -6,5 +6,5 @@
 
 fm-button-group(
   v-if=visible
-  :items=variable.items?variable.items+"":undefined
+  :items=variable.items?variable.i18nItems+"":undefined
 )&attributes(attrs)

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/lib/template/ui/mobilevue/toolbar.pug

@@ -1,6 +1,6 @@
-div(
-  v-if=variable.visible?variable.visible+"":"false"
-  class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-)
+div(
+  v-if=variable.visible?variable.visible+"":"false"
+  class=(variable.appearance && variable.appearance.class)
+  style=(variable.appearance && variable.appearance.style)
+)
   | {{content}}

package/package.json

@@ -1,56 +1,57 @@
-{
-  "name": "@farris/jit-engine",
-  "version": "1.3.306",
-  "description": "",
-  "main": "./lib/index.js",
-  "bin": {
-    "jit": "./bin/index.js"
-  },
-  "engines": {
-    "node": ">= 6.9.0",
-    "npm": ">= 3.0.0"
-  },
-  "files": [
-    "lib/",
-    "bin/",
-    "ioc.config"
-  ],
-  "scripts": {
-    "build": "npm run build-ts && npm run copy-static-assets",
-    "build-q": "npm run build-ts",
-    "test": "jest  --coverage ",
-    "watch-test": "npm run test --watchAll",
-    "build-ts": "tsc",
-    "tslint": "tslint -c tslint.json -p tsconfig.json",
-    "copy-static-assets": "ts-node copyStaticAssets.ts"
-  },
-  "keywords": [
-    "jit",
-    "engine",
-    "jit-engine"
-  ],
-  "author": "Noah",
-  "license": "ISC",
-  "dependencies": {
-    "fs-extra": "^8.1.0",
-    "lodash": "^4.17.10",
-    "prettier": "^1.18.2",
-    "pug": "^2.0.0-rc.4",
-    "typescript-ioc": "^1.2.4",
-    "yargs": "^12.0.1"
-  },
-  "devDependencies": {
-    "@types/fs-extra": "^8.1.1",
-    "@types/jest": "24.0.15",
-    "@types/lodash": "^4.14.91",
-    "@types/node": "^12.6.1",
-    "@types/prettier": "^1.18.0",
-    "@types/pug": "^2.0.4",
-    "@types/yargs": "^11.1.1",
-    "jest": "^24.8.0",
-    "ts-jest": "^24.0.2",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
-  }
+{
+  "name": "@farris/jit-engine",
+  "version": "1.3.308",
+  "description": "",
+  "main": "./lib/index.js",
+  "bin": {
+    "jit": "./bin/index.js"
+  },
+  "engines": {
+    "node": ">= 6.9.0",
+    "npm": ">= 3.0.0"
+  },
+  "files": [
+    "lib/",
+    "bin/",
+    "ioc.config"
+  ],
+  "scripts": {
+    "build": "npm run build-ts && npm run copy-static-assets",
+    "build-q": "npm run build-ts",
+    "test": "jest  --coverage ",
+    "watch-test": "npm run test --watchAll",
+    "build-ts": "tsc",
+    "tslint": "tslint -c tslint.json -p tsconfig.json",
+    "copy-static-assets": "ts-node copyStaticAssets.ts"
+  },
+  "keywords": [
+    "jit",
+    "engine",
+    "jit-engine"
+  ],
+  "author": "Noah",
+  "license": "ISC",
+  "dependencies": {
+    "fs-extra": "^8.1.0",
+    "lodash": "^4.17.10",
+    "prettier": "^1.18.2",
+    "pug": "^2.0.0-rc.4",
+    "read-package-tree": "^5.3.1",
+    "typescript-ioc": "^1.2.4",
+    "yargs": "^12.0.1"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^8.1.1",
+    "@types/jest": "24.0.15",
+    "@types/lodash": "^4.14.91",
+    "@types/node": "^12.6.1",
+    "@types/prettier": "^1.18.0",
+    "@types/pug": "^2.0.4",
+    "@types/yargs": "^11.1.1",
+    "jest": "^24.8.0",
+    "ts-jest": "^24.0.2",
+    "ts-node": "^8.3.0",
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
+  }
 }

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