@dolphinweex/weex-vue-render 0.1.7 → 0.1.9

package/dist/index.common.js

@@ -8,9 +8,12 @@ console.log('START WEEX VUE RENDER: 1.0.36, Build 2018-12-29 17:52.');
 	(global.WeexVueRender = factory());
 }(this, (function () { 'use strict';
 
-function isAbsoluteOrFixedPositioned(element) {
+function isAbsoluteOrFixedPositioned(element, deep=2) {
     let currentElement = element;
-    while (currentElement) {
+
+    let deep_ = 0;
+    while (currentElement && deep_ <= deep) {
+        deep_++;
         const position = window.getComputedStyle(currentElement).position;
         if (position === 'absolute' || position === 'fixed') {
             return true;
@@ -2982,7 +2985,7 @@ var scaleStyles = [
   'paddingRight',
   'paddingTop',
   'paddingBottom',
-  'fontSize',
+  'fontSize', // 如果包含wx单位需要当作vp单位转化为px
   'lineHeight',
   'transform',
   'webkitTransform',
@@ -3030,7 +3033,8 @@ var config = {
     'cell',
     'a'
   ],
-  bindingStyleNamesForPx2Rem: allStyles
+  bindingStyleNamesForPx2Rem: allStyles,
+  bindingStyleNamesForPv2Px: ["fontSize", "lineHeight", "letterSpacing"]
 };
 
 /*
@@ -3530,6 +3534,7 @@ function getThrottleLazyload (wait, el) {
  */
 
 var bindingStyleNamesForPx2Rem = config.bindingStyleNamesForPx2Rem;
+var bindingStyleNamesForPv2Px = config.bindingStyleNamesForPv2Px;
 
 // whether to support using 0.5px to paint 1px width border.
 var _supportHairlines;
@@ -3734,7 +3739,12 @@ function styleObject2rem (style, rootValue) {
   var obj = {};
   for (var k in style) {
     var camK = camelize(k);
-    if (bindingStyleNamesForPx2Rem.indexOf(camK) > -1) {
+
+    if (bindingStyleNamesForPv2Px.indexOf(camK) > -1 
+      && obj[camK].indexOf("wx") > -1) {
+
+      obj[camK] = px2px(style[k]);
+    } else if (bindingStyleNamesForPx2Rem.indexOf(camK) > -1) {
       obj[camK] = px2rem(style[k] + '', rootValue);
     }
     else {
@@ -3744,11 +3754,27 @@ function styleObject2rem (style, rootValue) {
   return obj
 }
 
+function px2px(pv) {
+  if (typeof pv == "string" && pv.indexOf("wx" > 0)) {
+    const floatValue = parseFloat(pv);
+    // 不需要计算直接返回 
+    return floatValue + 'px'
+  }
+  if (typeof pv == "number") {
+    var scale = window.weex.config.env.scale;
+    return pv * scale + 'px'
+  }
+
+  return pv;
+}
+
+const ignoreSubKey = ['scale']
 function px2rem (px, rootValue) {
   // fix: 适配鸿蒙wx单位
   if (px.indexOf("--harmory") > -1) return px;
 
-  return px.replace(/([+-]?\d+(?:\.\d*)?)([p|w]x)?/g, function ($0, $1, $2) {          
+  return px.replace(/([+-]?\d+(?:\.\d*)?)([p|w]x)?/g, function ($0, $1, $2, offset, str) {     
+    if (ignoreSubKey.filter(k => str.slice(offset - k.length - 1, offset - 1) === k).length) return $1       
     if ($2 === 'wx') { // 'wx' -> px
       // return ($midea_harmony_native ? $midea_harmony_native.vp2px($1) : $1) + 'px'
       // 适配鸿蒙wx
@@ -4675,6 +4701,15 @@ function watchAppearForScrollables (tagName, context) {
   }
 }
 
+function checkWeexRootClass () {
+  var body = document.querySelector('body')
+  var firstDiv = body.querySelector('div');
+  // 检查第一个div节点是否包含root类
+  if (firstDiv && !firstDiv.classList.contains('weex-root')) {
+    firstDiv.classList.add('weex-root')
+  }
+}
+
 var base$1 = {
   beforeCreate: function beforeCreate () {
     if (!lazyloadWatched) {
@@ -4726,6 +4761,7 @@ var base$1 = {
     metaMt[tagName]++;
 
     watchAppearForScrollables(tagName, this);
+    checkWeexRootClass();
 
     // when this is the root element of Vue instance.
     if (this === this.$root) {
@@ -4836,12 +4872,26 @@ var event$1 = {
  */
 
 var bindingStyleNamesForPx2Rem$1 = config.bindingStyleNamesForPx2Rem;
+var bindingStyleNamesForPv2Px$1 = config.bindingStyleNamesForPv2Px;
 
 var style = {
   methods: {
+    _deepClone: function(obj) {
+      if (obj === null) return null;
+      if (obj instanceof RegExp) return new RegExp(obj);
+      if (obj instanceof Date) return new Date(obj);
+      if (typeof obj !== 'object') {
+        return obj;
+      }
+      /** * 如果obj是数组，那么 obj.constructor 是 [Function: Array] * 如果obj是对象，那么 obj.constructor 是 [Function: Object] */
+      let t = new obj.constructor();
+      for (let key in obj) {
+        t[key] = this._deepClone(obj[key]);
+      }
+      return t;
+    },
     _px2rem: function _px2rem (value, rootValue) {
       var this$1 = this;
-
       if (typeof value === 'string') {
         return (value + '').replace(/[+-]?\d+(?:.\d*)?[pw]x/gi, function ($0) {
           return weex.utils.px2rem($0, rootValue)
@@ -4851,21 +4901,28 @@ var style = {
         return weex.utils.px2rem(value + '', rootValue)
       }
       if (isPlainObject(value)) {
-        for (var k in value) {
+        let cloneObj = this._deepClone(value)
+        for (var k in cloneObj) {
+          // 如果是"fontSize", "lineHeight", "letterSpacing"并且值包含wx则按照vp来转化为px使用
           if (
-            value.hasOwnProperty(k)
+            bindingStyleNamesForPv2Px$1.indexOf(k) > -1 
+            && cloneObj[k].indexOf("wx") > -1) {
+            cloneObj[k] = px2px(cloneObj[k]);
+          }else if (
+            cloneObj.hasOwnProperty(k)
             && bindingStyleNamesForPx2Rem$1.indexOf(k) > -1
           ) {
-            value[k] = weex.utils.px2rem(value[k] + '', rootValue);
+            cloneObj[k] = weex.utils.px2rem(cloneObj[k] + '', rootValue);
           }
         }
-        return value
+        return cloneObj
       }
       if (isArray(value)) {
-        for (var i = 0, l = value.length; i < l; i++) {
-          this$1._px2rem(value[i], rootValue);
+        let cloneArr = this._deepClone(value)
+        for (var i = 0, l = cloneArr.length; i < l; i++) {
+          this$1._px2rem(cloneArr[i], rootValue);
         }
-        return value
+        return cloneArr
       }
     },
 
@@ -5922,6 +5979,11 @@ function getList (weex) {
       if (isAbsoluteOrFixedPositioned(this$1.$el)) {
         this$1.$el.classList.remove("height-0");
       }
+      setTimeout(() => {
+        if (this$1.$el.clientHeight == 0) {
+          this$1.$el.classList.remove("height-0");
+        }
+      }, 0);
     },
     methods: {
       createChildren: function createChildren (h) {
@@ -6013,6 +6075,11 @@ function getScroller (weex) {
       if (isAbsoluteOrFixedPositioned(this$1.$el)) {
         this$1.$el.classList.remove("height-0");
       }
+      setTimeout(() => {
+        if (this$1.$el.clientHeight == 0) {
+          this$1.$el.classList.remove("height-0");
+        }
+      }, 0);
     },
     computed: {
       wrapperClass: function wrapperClass () {
@@ -6924,6 +6991,11 @@ function getList$1 (weex) {
       if (isAbsoluteOrFixedPositioned(this$1.$el)) {
         this$1.$el.classList.remove("height-0");
       }
+      setTimeout(() => {
+        if (this$1.$el.clientHeight == 0) {
+          this$1.$el.classList.remove("height-0");
+        }
+      }, 0);
     },
     computed: {
       wrapperClass: function wrapperClass () {

package/package.json

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