@dolphinweex/weex-vue-render 0.2.0 → 0.2.1

package/dist/index.common.js

@@ -2966,33 +2966,68 @@ var scaleStyles = [
   'bottom',
   'border',
   'borderRadius',
+  'border-radius',
   'borderWidth',
+  'border-width',
   'borderLeft',
+  'border-left',
   'borderRight',
+  'border-right',
   'borderTop',
+  'border-top',
   'borderBottom',
+  'border-bottom',
   'borderLeftWidth',
+  'border-left-width',
   'borderRightWidth',
+  'border-right-width',
   'borderTopWidth',
+  'border-top-width',
   'borderBottomWidth',
+  'border-bottom-width',
+  'borderTopLeftRadius',
+  'border-top-left-radius',
+  'borderTopRightRadius',
+  'border-top-right-radius', 
+  'borderBottomLeftRadius',
+  'border-bottom-left-radius' ,
+  'borderBottomRightRadius',
+  'border-bottom-right-radius',
   'margin',
   'marginLeft',
+  'margin-left',
   'marginRight',
+  'margin-right',
   'marginTop',
+  'margin-top',
   'marginBottom',
+  'margin-bottom',
   'padding',
   'paddingLeft',
+  'padding-left',
   'paddingRight',
+  'padding-right',
   'paddingTop',
+  'padding-top',
   'paddingBottom',
-  'fontSize', // 如果包含wx单位需要当作vp单位转化为px
+  'padding-bottom',
+  'fontSize',
+  'font-size',
   'lineHeight',
+  'line-height',
   'transform',
   'webkitTransform',
+  'webkit-transform',
   'WebkitTransform',
   'mozTransform',
+  'moz-transform',
   'MozTransform',
-  'itemSize'
+  'itemSize',
+  'item-size',
+  'min-height',
+  'minHeight',
+  'max-height',
+  'maxHeight'
 ];
 
 var vendorReg = /webkit|moz/i;
@@ -3034,7 +3069,37 @@ var config = {
     'a'
   ],
   bindingStyleNamesForPx2Rem: allStyles,
-  bindingStyleNamesForPv2Px: ["fontSize", "lineHeight", "letterSpacing"]
+
+  bindingStyleNamesForPv2Px: ["fontSize", "lineHeight", "letterSpacing"],
+
+  bindingStyleNamesForNumber2Px: [
+    "top",
+    "left",
+    "right",
+    "bottom",
+    "width",
+    "height",
+    "minWidth",
+    "minHeight",
+    "maxWidth",
+    "maxHeight",
+    "margin",
+    "marginTop",
+    "marginBottom",
+    "marginRight",
+    "marginLeft",
+    "borderWidth",
+    "borderTopWidth",
+    "borderLeftWidth",
+    "borderBottomWidth",
+    "borderRightWidth",
+    "padding",
+    "paddingTop",
+    "paddingLeft",
+    "paddingBottom",
+    "paddingRight",
+
+  ]
 };
 
 /*
@@ -3410,7 +3475,7 @@ function applySrc (item, src, placeholderSrc) {
    * 1. apply src immediately in case javscript blocks the image loading
    *  before next tick.
    */
-  item.style.backgroundImage = "url(" + (src || '') + ")";
+  item.style.backgroundImage = "url(" + (src ? encodeURI(src) : '') + ")";
   item.removeAttribute(lazyloadAttr);
   /**
    * 2. then load the img src with Image constructor (but would not post
@@ -3418,7 +3483,7 @@ function applySrc (item, src, placeholderSrc) {
    */
   item._src_loading = src;
   preLoadImg(src, function (evt) {
-    item.style.backgroundImage = "url(" + (src || '') + ")";
+    item.style.backgroundImage = "url(" + (src ? encodeURI(src) : '') + ")";
     var ref = this;
     var naturalWidth = ref.width;
     var naturalHeight = ref.height;
@@ -3436,7 +3501,7 @@ function applySrc (item, src, placeholderSrc) {
     dispatchNativeEvent(item, 'load', params);
     if (placeholderSrc) {
       preLoadImg(placeholderSrc, function () {
-        item.style.backgroundImage = "url(" + (placeholderSrc || '') + ")";
+        item.style.backgroundImage = "url(" + (placeholderSrc ? encodeURI(placeholderSrc) : '') + ")";
       });
     }
     finallCb();
@@ -3535,6 +3600,7 @@ function getThrottleLazyload (wait, el) {
 
 var bindingStyleNamesForPx2Rem = config.bindingStyleNamesForPx2Rem;
 var bindingStyleNamesForPv2Px = config.bindingStyleNamesForPv2Px;
+var bindingStyleNamesForNumber2Px = config.bindingStyleNamesForNumber2Px;
 
 // whether to support using 0.5px to paint 1px width border.
 var _supportHairlines;
@@ -3741,11 +3807,11 @@ function styleObject2rem (style, rootValue) {
     var camK = camelize(k);
 
     if (bindingStyleNamesForPv2Px.indexOf(camK) > -1 && typeof obj[camK] =='string'
-      && obj[camK].endsWith('wx') > -1) {
+      && obj[camK].endsWith('wx')) {
 
       obj[camK] = px2px(style[k]);
     } else if (bindingStyleNamesForPx2Rem.indexOf(camK) > -1) {
-      obj[camK] = px2rem(style[k] + '', rootValue);
+        obj[camK] = px2rem(style[k] + '', rootValue); 
     }
     else {
       obj[camK] = style[k];
@@ -3917,16 +3983,31 @@ function initEnv (viewportInfo, envInfo) {
     osName = 'android';
   }
   var osVersion = envInfo.os.version.val;
+
+  var device_display = $midea_harmony_native.getHarmoryDeviceDisplay() || {};
+
+
   var env = {
     platform: 'harmony',
     weexVersion: '1.0.36',
     layoutDirection: 'ltr',
     userAgent: navigator.userAgent,
     appName: browserName,
-    appVersion: browserVersion,
+    appVersion: device_display.appVersion,
     osName: osName,
     osVersion: osVersion,
-    deviceModel: envInfo.os.name || null
+    
+    deviceModel: device_display.deviceModel || null,
+    appEnv: device_display.appEnv,
+    versionCode: device_display.versionCode,
+    idfa: device_display.idfa,
+    isFullScreen: device_display.isFullScreen,
+    weexVersion: device_display.weexVersion,
+    osName: device_display.osName,
+    statusBarHeight: device_display.statusBarHeight,
+    safeAreaBottomHeight: device_display.safeAreaBottomHeight,
+    isImmersion: device_display.isImmersion,
+    
   };
   /**
    * viewportInfo: scale, deviceWidth, deviceHeight. dpr
@@ -4890,7 +4971,7 @@ var style = {
       }
       return t;
     },
-    _px2rem: function _px2rem (value, rootValue) {
+    _px2rem: function _px2rem (value, rootValue, propKey) {
       var this$1 = this;
       if (typeof value === 'string') {
         return (value + '').replace(/[+-]?\d+(?:.\d*)?[pw]x/gi, function ($0) {
@@ -4898,20 +4979,25 @@ var style = {
         })
       }
       if (typeof value === 'number') {
-        return weex.utils.px2rem(value + '', rootValue)
+        if (bindingStyleNamesForNumber2Px.indexOf(propKey) > -1) {
+          const scale = weex.config.env.scale
+          return (scale * value) + 'px'; 
+        }else{
+          return weex.utils.px2rem(value + '', rootValue)
+        }
       }
       if (isPlainObject(value)) {
         let cloneObj = this._deepClone(value)
         for (var k in cloneObj) {
           // 如果是"fontSize", "lineHeight", "letterSpacing"并且值包含wx则按照vp来转化为px使用
           if (
-            bindingStyleNamesForPv2Px$1.indexOf(k) > -1 &&typeof cloneObj[k] == "string" && cloneObj[k].endsWith('wx') > -1) {
+            bindingStyleNamesForPv2Px$1.indexOf(k) > -1 &&typeof cloneObj[k] == "string" && cloneObj[k].endsWith('wx')) {
             cloneObj[k] = px2px(cloneObj[k]);
           }else if (
             cloneObj.hasOwnProperty(k)
             && bindingStyleNamesForPx2Rem$1.indexOf(k) > -1
           ) {
-            cloneObj[k] = weex.utils.px2rem(cloneObj[k] + '', rootValue);
+              cloneObj[k] = weex.utils.px2rem(cloneObj[k] + '', rootValue);
           }
         }
         return cloneObj

package/package.json

@@ -49,5 +49,5 @@
     "type": "git",
     "url": "git+ssh://git@github.com/weexteam/weex-vue-render.git"
   },
-  "version": "0.2.0"
+  "version": "0.2.1"
 }