diff --git a/src/components/scroll/scroll.vue b/src/components/scroll/scroll.vue index e967ad06eb74c7f18fbe39cb728e6592d91e9e37..07d8c509651be47e2587e8124b034015e29d3405 100644 --- a/src/components/scroll/scroll.vue +++ b/src/components/scroll/scroll.vue @@ -261,6 +261,9 @@ dirty && this.refresh() } }, + resetPullUpTxt() { + this.pullUpDirty = true + }, _calculateMinHeight() { if (this.$refs.listWrapper) { this.$refs.listWrapper.style.minHeight = this.pullDownRefresh || this.pullUpLoad ? `${getRect(this.$refs.wrapper).height + 1}px` : 0 diff --git a/test/unit/specs/scroll.spec.js b/test/unit/specs/scroll.spec.js index 04838941d67dae84220f697156fa2a38e7384ae0..cd3f5dc4a1b78b00b1cf526508b717fff355d29d 100644 --- a/test/unit/specs/scroll.spec.js +++ b/test/unit/specs/scroll.spec.js @@ -168,7 +168,12 @@ describe('Scroll', () => { props: { data, options: { - pullUpLoad: true + pullUpLoad: { + txt: { + more: 'more', + noMore: 'noMore' + } + } } }, on: { @@ -199,11 +204,21 @@ describe('Scroll', () => { // test: forceUpdate vm.forceUpdate() + setTimeout(() => { expect(vm.isPullUpLoad).to.be.false expect(vm.pullUpDirty).to.be.false - done() + const pullUpTxtElm = vm.$el.querySelector('.cube-pullup-wrapper span') + expect(pullUpTxtElm.textContent).to.equal('noMore') + + // test: resetPullUpTxt + vm.resetPullUpTxt() + vm.$nextTick(() => { + expect(pullUpTxtElm.textContent).to.equal('more') + + done() + }) }, 50) }, 400) }, 150)