@dolphinweex/weex-vue-render 0.2.24 → 0.2.26

package/dist/index.common.js

@@ -5907,7 +5907,7 @@ var scrollable$1 = {
     },
 
     handleScroll: function handleScroll (event) {
-      event.stopImmediatePropagation();
+      // event.stopImmediatePropagation();
       weex.utils.getThrottleLazyload(25, this.$el, 'scroll')();
       getThrottledScroll(this)(event);
 
@@ -5944,7 +5944,7 @@ var scrollable$1 = {
     reachBottom: function reachBottom (offset) {
       var wrapper = this.$refs.wrapper;
       var inner = this.$refs.inner;
-      offset = parseInt(offset || 0) * weex.config.env.scale;
+      offset = parseInt(offset || 10) * weex.config.env.scale;
 
       if (wrapper && inner) {
         var key = this.scrollDirection === 'horizontal'
@@ -6041,10 +6041,10 @@ var scrollable$1 = {
       var isV = tp.isVertical;
       if (this.scrollDirection === 'horizontal' && !isV) {
         // 水平
-        event.stopPropagation();
+        // event.stopPropagation();
       }else if (isV) {
         // 垂直
-        event.stopPropagation();
+        // event.stopPropagation();
       }else {
         return;
       } 
@@ -6113,12 +6113,23 @@ function getList (weex) {
 
   return {
     name: 'weex-list',
+    props: {
+      scrollable: {
+        type: [Boolean],
+        default: true
+      }
+    },
     mixins: [scrollable$1],
     computed: {
       wrapperClass: function wrapperClass () {
         var classArray = ['weex-list', 'weex-list-wrapper', 'weex-ct', 'height-0'];
         this._refresh && classArray.push('with-refresh');
         this._loading && classArray.push('with-loading');
+
+        if (!this.scrollable) {
+          classArray.push('weex-list-disabled');
+        }
+
         return classArray.join(' ')
       }
     },
@@ -7238,6 +7249,10 @@ function getList$1 (weex) {
           return ['horizontal', 'vertical'].indexOf(value) !== -1
         }
       },
+      scrollable: {
+        type: [Boolean],
+        default: true
+      },
       _items: Array,
       _switch: String
     },
@@ -7266,6 +7281,11 @@ function getList$1 (weex) {
           classArray.push('weex-recycle-vertical');
           classArray.push('height-0');
         }
+
+        if (!this.scrollable) {
+          classArray.push('weex-recycle-disabled');
+        }
+
         return classArray.join(' ')
       }
     },
@@ -7333,7 +7353,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 max-width: 100vw; \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 flex:1; \n}\n\n.weex-waterfall-inner-columns { \n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n max-width: 100vw; \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 max-width: 100vw; \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 flex:1; \n}\n\n.weex-waterfall-inner-columns { \n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n max-width: 100vw; \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 !important;\n  overflow-y: hidden !important;\n}\n\n.weex-slider-wrapper.weex-slider-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-list-wrapper.weex-list-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-recycle-wrapper.weex-recycle-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\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
@@ -7403,6 +7423,22 @@ var INTERVAL_MINIMUM = 200;
 var touchSliderInstance = null;
 
 var slideMixin = {
+  props: {
+    scrollable: {
+      type: [Boolean],
+      default: true
+    }
+  },
+  computed: {
+    wrapperClass: function wrapperClass () {
+      var classArray = ['weex-slider weex-slider-wrapper weex-ct']; 
+      if (!this.scrollable) {
+        classArray.push('weex-slider-disabled');
+      }
+
+      return classArray.join(' ')
+    }
+  },
   created: function created () {
     this._clones = [];
     this.innerOffset = 0;
@@ -7543,7 +7579,7 @@ var slideMixin = {
             touchend: this._handleTouchEnd,
             touchcancel: this._handleTouchCancel
           },
-          staticClass: 'weex-slider weex-slider-wrapper weex-ct',
+          staticClass: this.wrapperClass,
           staticStyle: weex.extractComponentStyle(this)
         },
         [
@@ -8811,7 +8847,6 @@ function getWeb (weex) {
       var this$1 = this;
 
       return createElement('iframe', {
-        ref: 'childIframe',
         attrs: {
           'weex-type': 'web',
           src: this.currentSrc

package/package.json

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