|
@@ -148,7 +148,7 @@ const moveState = {
|
|
progress: 0,
|
|
progress: 0,
|
|
activeIndex: 0
|
|
activeIndex: 0
|
|
}
|
|
}
|
|
-export function moveSmoothAnimation(progress: number, activeIndex: number) {
|
|
|
|
|
|
+export function moveSmoothAnimation(progress: number, activeIndex: number, isMoveOsmd = true) {
|
|
moveState.progress = progress
|
|
moveState.progress = progress
|
|
moveState.activeIndex = activeIndex
|
|
moveState.activeIndex = activeIndex
|
|
// if (!smoothAnimationState.isShow.value) {
|
|
// if (!smoothAnimationState.isShow.value) {
|
|
@@ -176,14 +176,14 @@ export function moveSmoothAnimation(progress: number, activeIndex: number) {
|
|
smoothAnimationState.pointsPos,
|
|
smoothAnimationState.pointsPos,
|
|
smoothAnimationState.pointsPos.slice(0, nowIndex)
|
|
smoothAnimationState.pointsPos.slice(0, nowIndex)
|
|
)
|
|
)
|
|
- // 当移动到屏幕最右边时候 就不进行移动了
|
|
|
|
- if (
|
|
|
|
- (smoothAnimationState.osdmScrollDom?.scrollLeft || 0) + smoothAnimationState.translateXNum + smoothAnimationState.osdmScrollDomWith >=
|
|
|
|
- smoothAnimationState.canvasDomWith
|
|
|
|
- ) {
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
- move_osmd(nowPointsPos)
|
|
|
|
|
|
+ // 当移动到屏幕最右边时候 就不进行移动了 存在移动到屏幕最右边时候 有反复的情况需要屏幕移动。所以这里注释掉了
|
|
|
|
+ // if (
|
|
|
|
+ // (smoothAnimationState.osdmScrollDom?.scrollLeft || 0) + smoothAnimationState.translateXNum + smoothAnimationState.osdmScrollDomWith >=
|
|
|
|
+ // smoothAnimationState.canvasDomWith
|
|
|
|
+ // ) {
|
|
|
|
+ // return
|
|
|
|
+ // }
|
|
|
|
+ isMoveOsmd && move_osmd(nowPointsPos)
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|