@dolphinweex/weex-vue-render 0.2.8 → 0.2.10

package/dist/index.common.js

@@ -3460,7 +3460,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 ? encodeURI(src) : '') + ")";
+  item.style.backgroundImage = "url(" + (src ? encodeURI(decodeURI(src)) : '') + ")";
   item.removeAttribute(lazyloadAttr);
   /**
    * 2. then load the img src with Image constructor (but would not post
@@ -3468,7 +3468,7 @@ function applySrc (item, src, placeholderSrc) {
    */
   item._src_loading = src;
   preLoadImg(src, function (evt) {
-    item.style.backgroundImage = "url(" + (src ? encodeURI(src) : '') + ")";
+    item.style.backgroundImage = "url(" + (src ? encodeURI(decodeURI(src)) : '') + ")";
     var ref = this;
     var naturalWidth = ref.width;
     var naturalHeight = ref.height;
@@ -3486,7 +3486,7 @@ function applySrc (item, src, placeholderSrc) {
     dispatchNativeEvent(item, 'load', params);
     if (placeholderSrc) {
       preLoadImg(placeholderSrc, function () {
-        item.style.backgroundImage = "url(" + (placeholderSrc ? encodeURI(placeholderSrc) : '') + ")";
+        item.style.backgroundImage = "url(" + (placeholderSrc ? encodeURI(decodeURI(placeholderSrc)) : '') + ")";
       });
     }
     finallCb();
@@ -6368,6 +6368,7 @@ var gcanvas = {
 
 var NORMAL_GAP_SIZE = 32;
 var DEFAULT_COLUMN_COUNT = 1;
+var DEFAULT_GAP = 0;
 
 function getWaterfall (weex) {
   var extractComponentStyle = weex.extractComponentStyle;
@@ -6417,6 +6418,22 @@ function getWaterfall (weex) {
           val = parseInt(val);
           return !isNaN(val) && val > 0
         }
+      },
+      leftGap: {
+        type: [String, Number],
+        default: DEFAULT_GAP,
+        validator: function validator (val) {
+          val = parseInt(val);
+          return !isNaN(val) && val > 0
+        }
+      },
+      rightGap: {
+        type: [String, Number],
+        default: DEFAULT_GAP,
+        validator: function validator (val) {
+          val = parseInt(val);
+          return !isNaN(val) && val > 0
+        }
       }
     },
 
@@ -6429,7 +6446,7 @@ function getWaterfall (weex) {
     },
 
     methods: {
-      _createChildren: function _createChildren (h, rootStyle) {
+      _createChildren: function _createChildren (h, rootStyle, leftAndRightGapStyle) {
         var this$1 = this;
 
         var slots = (this.$slots.default || []).slice();
@@ -6498,7 +6515,8 @@ function getWaterfall (weex) {
         // .concat(this._others)
         children.push(h('html:div', {
           ref: 'columns',
-          staticClass: 'weex-waterfall-inner-columns weex-ct'
+          staticClass: 'weex-waterfall-inner-columns weex-ct',
+          staticStyle: leftAndRightGapStyle
         }, this._columns));
         children.push(h('html:div', {
           ref: 'footers',
@@ -6711,6 +6729,17 @@ function getWaterfall (weex) {
         this$1.updateLayout();
       });
       var mergedStyle = extractComponentStyle(this);
+
+      var rate = 750 / document.documentElement.clientWidth // 750设计稿放缩倍率
+
+      var leftAndRightGapStyle = {}
+      if (this.leftGap) {
+        leftAndRightGapStyle.paddingLeft = this.leftGap / rate + 'px';
+      }
+      if (this.rightGap) {
+        leftAndRightGapStyle.paddingRight = this.leftGap / rate + 'px';
+      }
+
       return createElement('main', {
         ref: 'wrapper',
         attrs: { 'weex-type': 'waterfall' },
@@ -6722,7 +6751,7 @@ function getWaterfall (weex) {
         },
         staticClass: 'weex-waterfall weex-waterfall-wrapper weex-ct',
         staticStyle: mergedStyle
-      }, this._createChildren(createElement, mergedStyle))
+      }, this._createChildren(createElement, mergedStyle, leftAndRightGapStyle))
     }
   }
 }
@@ -6768,7 +6797,12 @@ function getHeader (weex) {
         },
         ref: 'header',
         staticClass: 'weex-header weex-ct',
-        staticStyle: extractComponentStyle(this)
+        staticStyle: {
+          ...extractComponentStyle(this),
+          ...{
+            maxWidth: '100vw'
+          }
+        }
       }, this.$slots.default)
     }
   }
@@ -7269,7 +7303,7 @@ var recycleList = {
   }
 };
 
-__$styleInject("/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied.  See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n\nbody > .weex-list,\nbody > .weex-recycle,\nbody > .weex-scroller,\nbody > .weex-waterfall {\n  max-height: 100%;\n}\n\n.weex-list-wrapper,\n.weex-recycle-wrapper,\n.weex-scroller-wrapper,\n.weex-waterfall-wrapper {\n  -webkit-overflow-scrolling: touch;\n}\n\n.weex-list-wrapper,\n.weex-waterfall-wrapper, \n.weex-recycle-wrapper {\n  overflow-y: scroll !important;\n  overflow-x: hidden !important;\n  align-items: flex-start !important;\n  justify-content: flex-start !important;\n}\n\n.weex-list-inner,\n.weex-recycle-inner,\n.weex-scroller-inner,\n.weex-waterfall-inner {\n  -webkit-overflow-scrolling: touch;\n align-items: inherit; \n}\n\n.weex-waterfall-inner-columns {\n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n}\n\n.weex-scroller-wrapper.weex-scroller-vertical,\n.weex-recycle-wrapper.weex-recycle-vertical  {\n  overflow-x: hidden;\n  overflow-y: scroll;\n}\n\n.weex-scroller-wrapper.weex-scroller-horizontal,\n.weex-recycle-wrapper.weex-recycle-horizontal {\n  overflow-x: scroll;\n  overflow-y: hidden;\n}\n\n.weex-scroller-wrapper.weex-scroller-disabled {\n  overflow-x: hidden;\n  overflow-y: hidden;\n}\n\n.weex-scroller-horizontal .weex-scroller-inner,\n.weex-recycle-horizontal .weex-recycle-inner {\n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n  height: 100%;\n}\n\n.weex-cell {\n  width: 100%;\n}\n\n.weex-refresh,\n.weex-loading {\n  -webkit-box-align: center;\n  -webkit-align-items: center;\n  align-items: center;\n  -webkit-box-pack: center;\n  -webkit-justify-content: center;\n  justify-content: center;\n  width: 100%;\n  overflow: hidden;\n}\n",undefined);
+__$styleInject("/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied.  See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n\nbody > .weex-list,\nbody > .weex-recycle,\nbody > .weex-scroller,\nbody > .weex-waterfall {\n  max-height: 100%;\n}\n\n.weex-list-wrapper,\n.weex-recycle-wrapper,\n.weex-scroller-wrapper,\n.weex-waterfall-wrapper {\n  -webkit-overflow-scrolling: touch;\n}\n\n.weex-list-wrapper,\n.weex-waterfall-wrapper, \n.weex-recycle-wrapper {\n  overflow-y: scroll !important;\n  overflow-x: hidden !important;\n  align-items: flex-start !important;\n  justify-content: flex-start !important;\n}\n\n.weex-list-inner,\n.weex-recycle-inner,\n.weex-scroller-inner,\n.weex-waterfall-inner {\n  -webkit-overflow-scrolling: touch;\n align-items: inherit; \n}\n\n.weex-waterfall-inner-columns { \n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n}\n\n.weex-scroller-wrapper.weex-scroller-vertical,\n.weex-recycle-wrapper.weex-recycle-vertical  {\n  overflow-x: hidden;\n  overflow-y: scroll;\n}\n\n.weex-scroller-wrapper.weex-scroller-horizontal,\n.weex-recycle-wrapper.weex-recycle-horizontal {\n  overflow-x: scroll;\n  overflow-y: hidden;\n}\n\n.weex-scroller-wrapper.weex-scroller-disabled {\n  overflow-x: hidden;\n  overflow-y: hidden;\n}\n\n.weex-scroller-horizontal .weex-scroller-inner,\n.weex-recycle-horizontal .weex-recycle-inner {\n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n  height: 100%;\n}\n\n.weex-cell {\n  width: 100%;\n}\n\n.weex-refresh,\n.weex-loading {\n  -webkit-box-align: center;\n  -webkit-align-items: center;\n  align-items: center;\n  -webkit-box-pack: center;\n  -webkit-justify-content: center;\n  justify-content: center;\n  width: 100%;\n  overflow: hidden;\n}\n",undefined);
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

package/package.json

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