ykxiao
/
DemuMesDataV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug Fixes: #25

This commit is contained in:
JiaMing 2019-11-12 12:42:36 +08:00
parent bbdf7ea5a9
commit 3ad05eb1be
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/scrollBoard/src/main.vue
View File

@ -161,7 +161,9 @@ export default {
animationIndex: 0, animationIndex: 0,
animationHandler: '' animationHandler: '',
updater: 0
} }
}, },
watch: { watch: {
@ -304,7 +306,7 @@ export default {
this.aligns = deepMerge(aligns, align) this.aligns = deepMerge(aligns, align)
}, },
async animation (start = false) { async animation (start = false) {
let { avgHeight, animationIndex, mergedConfig, rowsData, animation } = this let { avgHeight, animationIndex, mergedConfig, rowsData, animation, updater } = this
const { waitTime, carousel, rowNum } = mergedConfig const { waitTime, carousel, rowNum } = mergedConfig
@ -312,7 +314,10 @@ export default {
if (rowNum >= rowLength) return if (rowNum >= rowLength) return
if (start) await new Promise(resolve => setTimeout(resolve, waitTime)) if (start) {
await new Promise(resolve => setTimeout(resolve, waitTime))
if (updater !== this.updater) return
}
const animationNum = carousel === 'single' ? 1 : rowNum const animationNum = carousel === 'single' ? 1 : rowNum
@ -323,6 +328,7 @@ export default {
this.heights = new Array(rowLength).fill(avgHeight) this.heights = new Array(rowLength).fill(avgHeight)
await new Promise(resolve => setTimeout(resolve, 300)) await new Promise(resolve => setTimeout(resolve, 300))
if (updater !== this.updater) return
this.heights.splice(0, animationNum, ...new Array(animationNum).fill(0)) this.heights.splice(0, animationNum, ...new Array(animationNum).fill(0))
@ -335,7 +341,9 @@ export default {
this.animationHandler = setTimeout(animation, waitTime - 300) this.animationHandler = setTimeout(animation, waitTime - 300)
}, },
stopAnimation () { stopAnimation () {
const { animationHandler } = this const { animationHandler, updater } = this
this.updater = (updater + 1) % 999999
if (!animationHandler) return if (!animationHandler) return

16
src/components/scrollRankingBoard/src/main.vue
View File

@ -89,7 +89,9 @@ export default {
animationIndex: 0, animationIndex: 0,
animationHandler: '' animationHandler: '',
updater: 0
} }
}, },
watch: { watch: {
@ -172,7 +174,7 @@ export default {
if (!onresize) this.heights = new Array(data.length).fill(avgHeight) if (!onresize) this.heights = new Array(data.length).fill(avgHeight)
}, },
async animation (start = false) { async animation (start = false) {
let { avgHeight, animationIndex, mergedConfig, rowsData, animation } = this let { avgHeight, animationIndex, mergedConfig, rowsData, animation, updater } = this
const { waitTime, carousel, rowNum } = mergedConfig const { waitTime, carousel, rowNum } = mergedConfig
@ -180,7 +182,10 @@ export default {
if (rowNum >= rowLength) return if (rowNum >= rowLength) return
if (start) await new Promise(resolve => setTimeout(resolve, waitTime)) if (start) {
await new Promise(resolve => setTimeout(resolve, waitTime))
if (updater !== this.updater) return
}
const animationNum = carousel === 'single' ? 1 : rowNum const animationNum = carousel === 'single' ? 1 : rowNum
@ -191,6 +196,7 @@ export default {
this.heights = new Array(rowLength).fill(avgHeight) this.heights = new Array(rowLength).fill(avgHeight)
await new Promise(resolve => setTimeout(resolve, 300)) await new Promise(resolve => setTimeout(resolve, 300))
if (updater !== this.updater) return
this.heights.splice(0, animationNum, ...new Array(animationNum).fill(0)) this.heights.splice(0, animationNum, ...new Array(animationNum).fill(0))
@ -203,7 +209,9 @@ export default {
this.animationHandler = setTimeout(animation, waitTime - 300) this.animationHandler = setTimeout(animation, waitTime - 300)
}, },
stopAnimation () { stopAnimation () {
const { animationHandler } = this const { animationHandler, updater } = this
this.updater = (updater + 1) % 999999
if (!animationHandler) return if (!animationHandler) return