@dolphinweex/weex-vue-render 0.2.41 → 0.2.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6056,8 +6056,9 @@ var scrollable$1 = {
6056
6056
  this._loadmoreReset = false;
6057
6057
  var el = this.$el;
6058
6058
  if (el) {
6059
- var eventName = this.weexType === 'scroller' ? 'loadmore' : 'loading';
6060
- weex.utils.dispatchNativeEvent(el, eventName);
6059
+ // 根据weex官方文档查:loading组件是loading,其余都是loadmore
6060
+ // var eventName = this.weexType === 'scroller' ? 'loadmore' : 'loading';
6061
+ weex.utils.dispatchNativeEvent(el, 'loadmore');
6061
6062
  }
6062
6063
  }
6063
6064
  }
@@ -7047,6 +7048,8 @@ function getLoading () {
7047
7048
  },
7048
7049
  watch: {
7049
7050
  height: function height (val) {
7051
+ // 最大150像素
7052
+ val = Math.min(val, 150);
7050
7053
  var offset = val + "px";
7051
7054
  this.$el.style.height = offset;
7052
7055
  this.$el.style.bottom = 0;
package/package.json CHANGED
@@ -49,5 +49,5 @@
49
49
  "type": "git",
50
50
  "url": "git+ssh://git@github.com/weexteam/weex-vue-render.git"
51
51
  },
52
- "version": "0.2.41"
52
+ "version": "0.2.42"
53
53
  }