build: package

Author: dolymood

lib/cube.min.css

@@ -3887,6 +3887,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
   exports.default = {
     name: COMPONENT_NAME,
+    provide: function provide() {
+      return {
+        radioGroup: this
+      };
+    },
+
     props: {
       value: [String, Number],
       options: {
@@ -3974,6 +3980,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
   exports.default = {
     name: COMPONENT_NAME,
+    inject: {
+      radioGroup: {
+        default: null
+      }
+    },
     props: {
       value: [String, Number],
       option: {
@@ -3994,6 +4005,23 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         radioValue: this.value
       };
     },
+    created: function created() {
+      var _this = this;
+
+      var radioGroup = this.radioGroup;
+      if (radioGroup) {
+        this.radioValue = radioGroup.radioValue;
+        this._cancelWatchGroup = this.$watch(function () {
+          return radioGroup.radioValue;
+        }, function (newValue) {
+          _this.radioValue = newValue;
+        });
+      }
+    },
+    beforeDestroy: function beforeDestroy() {
+      this._cancelWatchGroup && this._cancelWatchGroup();
+      this._cancelWatchGroup = null;
+    },
 
     watch: {
       value: function value(newV) {
@@ -4004,6 +4032,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           newV = Number(newV);
         }
         this.$emit(EVENT_INPUT, newV);
+        if (this.radioGroup) {
+          this.radioGroup.radioValue = newV;
+        }
       }
     },
     computed: {

lib/cube.min.js

@@ -6907,7 +6907,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
   }
 
   var Cube = {
-    version: "1.12.10",
+    version: "1.12.11",
     install: install,
     BScroll: _module.BetterScroll,
     createAPI: _module.createAPI
@@ -10399,6 +10399,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
   exports.default = {
     name: COMPONENT_NAME,
+    provide: function provide() {
+      return {
+        radioGroup: this
+      };
+    },
+
     props: {
       value: [String, Number],
       options: {
@@ -10486,6 +10492,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
   exports.default = {
     name: COMPONENT_NAME,
+    inject: {
+      radioGroup: {
+        default: null
+      }
+    },
     props: {
       value: [String, Number],
       option: {
@@ -10506,6 +10517,23 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         radioValue: this.value
       };
     },
+    created: function created() {
+      var _this = this;
+
+      var radioGroup = this.radioGroup;
+      if (radioGroup) {
+        this.radioValue = radioGroup.radioValue;
+        this._cancelWatchGroup = this.$watch(function () {
+          return radioGroup.radioValue;
+        }, function (newValue) {
+          _this.radioValue = newValue;
+        });
+      }
+    },
+    beforeDestroy: function beforeDestroy() {
+      this._cancelWatchGroup && this._cancelWatchGroup();
+      this._cancelWatchGroup = null;
+    },
 
     watch: {
       value: function value(newV) {
@@ -10516,6 +10544,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           newV = Number(newV);
         }
         this.$emit(EVENT_INPUT, newV);
+        if (this.radioGroup) {
+          this.radioGroup.radioValue = newV;
+        }
       }
     },
     computed: {
@@ -21781,7 +21812,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
     Vue.component(_stickyEle2.default.name, _stickyEle2.default);
   };
 
-  _sticky2.default.Ele = _sticky2.default;
+  _sticky2.default.Ele = _stickyEle2.default;
 
   exports.default = _sticky2.default;
   module.exports = exports['default'];
@@ -22926,11 +22957,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
     data: function data() {
       return {
         items: [],
-        list: [],
         heights: 0,
         startIndex: 0,
         loadings: [],
-        startOffset: 0,
         noMore: false
       };
     },
@@ -22964,26 +22993,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         return this.loadings.length;
       }
     },
-    watch: {
-      list: function list(newV) {
-        if (newV.length) {
-          this.loadings.pop();
-          if (!this.loading) {
-            this.loadItems();
-          }
-        }
-      },
-      items: function items(newV) {
-        if (newV.length > this.list.length) {
-          this.getItems();
-        }
-      }
+    created: function created() {
+      this.list = [];
+      this.promiseStack = [];
     },
     mounted: function mounted() {
       this.checkPromiseCompatibility();
       this.$el.addEventListener(EVENT_SCROLL, this._onScroll);
       window.addEventListener(EVENT_RESIZE, this._onResize);
-      this.init();
+      this.load();
     },
     beforeDestroy: function beforeDestroy() {
       this.$el.removeEventListener(EVENT_SCROLL, this._onScroll);
@@ -22996,40 +23014,78 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           (0, _debug.warn)(PROMISE_ERROR);
         }
       },
-      init: function init() {
-        this.load();
-      },
       load: function load() {
         if (this.infinite) {
-          this.items.length += this.size;
-          this.loadItems();
+          var items = this.items;
+          var start = items.length;
+
+          items.length += this.size;
+          var end = items.length;
+          this.loadItems(start, end);
+          this.getItems();
         } else if (!this.loading) {
           this.getItems();
         }
       },
       getItems: function getItems() {
         var _this = this;
 
+        var index = this.promiseStack.length;
+        var promiseFetch = this.onFetch();
         this.loadings.push('pending');
-        this.onFetch().then(function (res) {
+        this.promiseStack.push(promiseFetch);
+        promiseFetch.then(function (res) {
+          _this.loadings.pop();
+
           if (!res) {
-            _this.noMore = true;
-            _this.loadings.pop();
+            _this.stopScroll(index);
           } else {
-            _this.list = _this.list.concat(res);
+            _this.setList(index, res);
+            _this.loadItemsByIndex(index);
+            if (res.length < _this.size) {
+              _this.stopScroll(index);
+            }
           }
         });
       },
-      loadItems: function loadItems(isResize) {
+      removeUnusedTombs: function removeUnusedTombs(copy, index) {
+        var cursor = void 0;
+        var size = this.size;
+        var start = index * size;
+        var end = (index + 1) * size;
+        for (cursor = start; cursor < end; cursor++) {
+          if (copy[cursor] && copy[cursor].isTombstone) break;
+        }
+        this.items = copy.slice(0, cursor);
+      },
+      stopScroll: function stopScroll(index) {
+        this.noMore = true;
+        this.removeUnusedTombs(this.items.slice(0), index);
+        this.updateItemTop();
+        this.updateStartIndex();
+      },
+      setList: function setList(index, res) {
+        var list = this.list;
+        var baseIndex = index * this.size;
+        for (var i = 0; i < res.length; i++) {
+          list[baseIndex + i] = res[i];
+        }
+      },
+      loadItemsByIndex: function loadItemsByIndex(index) {
+        var size = this.size;
+        var start = index * size;
+        var end = (index + 1) * size;
+        this.loadItems(start, end);
+      },
+      loadItems: function loadItems(start, end) {
         var _this2 = this;
 
+        var items = this.items;
         var promiseTasks = [];
-        var start = 0;
-        var end = this.infinite ? this.items.length : this.list.length;
         var item = void 0;
 
         var _loop = function _loop(i) {
-          item = _this2.items[i];
+          item = items[i];
 
           if (item && item.loaded) {
             return 'continue';
@@ -23049,6 +23105,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
         window.Promise.all(promiseTasks).then(function () {
           _this2.updateItemTop();
+          _this2.updateStartIndex();
         });
       },
       setItem: function setItem(index, data) {
@@ -23065,56 +23122,53 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         var dom = this.$refs['preloads' + index];
         if (dom && dom[0]) {
           cur.height = dom[0].offsetHeight;
-        } else {
+        } else if (cur) {
           cur.height = this.tombHeight;
         }
       },
       updateItemTop: function updateItemTop() {
-        this.heights = 0;
-        for (var i = 0; i < this.items.length; i++) {
-          var pre = this.items[i - 1];
-          this.items[i].top = pre ? pre.top + pre.height : 0;
-          this.heights += this.items[i].height;
-        }
+        var heights = 0;
+        var items = this.items;
+        var pre = void 0;
+        var current = void 0;
 
-        if (this.startOffset) {
-          this.setScrollTop();
+        for (var i = 0; i < items.length; i++) {
+          pre = items[i - 1];
+          current = items[i];
+
+          if (!items[i]) {
+            heights += 0;
+          } else {
+            current.top = pre ? pre.top + pre.height : 0;
+            heights += current.height;
+          }
         }
-        this.updateIndex();
+        this.heights = heights;
       },
-      updateIndex: function updateIndex() {
+      updateStartIndex: function updateStartIndex() {
         var top = this.$el.scrollTop;
-        for (var i = 0; i < this.items.length; i++) {
-          if (this.items[i].top > top) {
+        var item = void 0;
+        var items = this.items;
+        for (var i = 0; i < items.length; i++) {
+          item = items[i];
+          if (!item || item.top > top) {
             this.startIndex = Math.max(0, i - 1);
             break;
           }
         }
       },
-      getStartItemOffset: function getStartItemOffset() {
-        if (this.items[this.startIndex]) {
-          this.startOffset = this.items[this.startIndex].top - this.$el.scrollTop;
-        }
-      },
-      setScrollTop: function setScrollTop() {
-        if (this.items[this.startIndex]) {
-          this.$el.scrollTop = this.items[this.startIndex].top - this.startOffset;
-
-          this.startOffset = 0;
-        }
-      },
       _onScroll: function _onScroll() {
-        if (this.$el.scrollTop + this.$el.offsetHeight > this.heights - this.offset) {
+        if (!this.noMore && this.$el.scrollTop + this.$el.offsetHeight > this.heights - this.offset) {
           this.load();
         }
-        this.updateIndex();
+        this.updateStartIndex();
       },
       _onResize: function _onResize() {
-        this.getStartItemOffset();
-        this.items.forEach(function (item) {
+        var items = this.items;
+        items.forEach(function (item) {
           item.loaded = false;
         });
-        this.loadItems(true);
+        this.loadItems(0, items.length);
       }
     },
     components: {
@@ -23164,7 +23218,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
   }), _vm._v(" "), _c('div', {
     staticClass: "cube-recycle-list-pool"
   }, [_vm._l((_vm.items), function(item, index) {
-    return (!item.isTombstone && !item.height) ? _c('div', {
+    return (item && !item.isTombstone && !item.height) ? _c('div', {
       ref: 'preloads' + index,
       refInFor: true,
       staticClass: "cube-recycle-list-item cube-recycle-list-invisible"
@@ -23174,15 +23228,15 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
   }), _vm._v(" "), _c('div', {
     ref: "tomb",
     staticClass: "cube-recycle-list-item cube-recycle-list-invisible"
-  }, [_vm._t("tombstone")], 2)], 2)], 2), _vm._v(" "), (!_vm.infinite) ? _c('div', {
+  }, [_vm._t("tombstone")], 2)], 2)], 2), _vm._v(" "), (!_vm.infinite && !_vm.noMore) ? _c('div', {
     staticClass: "cube-recycle-list-loading",
     style: ({
       visibility: _vm.loading ? 'visible' : 'hidden'
     })
   }, [_vm._t("spinner", [_c('div', {
     staticClass: "cube-recycle-list-loading-content"
   }, [_c('cube-loading', {
-    staticClass: "spinner"
+    staticClass: "cube-recycle-list-spinner"
   })], 1)])], 2) : _vm._e(), _vm._v(" "), _c('div', {
     directives: [{
       name: "show",