Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(image-viewer): 优化align配置长图滚动范围设置 #1442

Merged
merged 2 commits into from
Jun 12, 2024
Merged

refactor(image-viewer): 优化align配置长图滚动范围设置 #1442

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fa4ebb
refactor(image-viewer): 优化align配置长图滚动范围设置
aaronmhl Jun 7, 2024
9ec9a09
fix(image-viewer): 修复图片scaled时并且align为start和end时滚动区域问题
aaronmhl Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions src/image-viewer/image-viewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,39 @@ export default defineComponent({

const getMaxDraggedY = (index: number) => {
const rootOffsetHeight = rootRef.value?.offsetHeight || 0;
const currentImageScaledHeight = state.scale * (imagesSize?.[index]?.height || 0);
if (currentImageScaledHeight <= rootOffsetHeight) return 0;
return Math.max(0, (currentImageScaledHeight - rootOffsetHeight) / 2);
// 当前图片高度
const currentImageHeight = imagesSize?.[index]?.height || 0;
// 当前图片Scaled后总高度
const currentImageScaledHeight = state.scale * currentImageHeight;
// 当前图片Scaled后总高度与原图片高度差值的一半，作为图片Scaled后top和bottom的增量(scale是以图片中心点进行的，align为start和end时会影响)
const halfScaleHeight = (currentImageScaledHeight - currentImageHeight) / 2;
if (currentImageScaledHeight <= rootOffsetHeight) {
return {
top: 0,
bottom: 0,
};
}
// 图片和外层root元素高度差
const diffHeight = currentImageScaledHeight - rootOffsetHeight;
const centerDraggedY = diffHeight / 2;
// 图片align配置对应的滚动区域
const alignmentDraggedY = {
start: {
top: -diffHeight + halfScaleHeight,
bottom: halfScaleHeight,
},
center: {
top: -centerDraggedY,
bottom: centerDraggedY,
},
end: {
LoopZhou marked this conversation as resolved.
Show resolved Hide resolved
top: -halfScaleHeight,
bottom: diffHeight - halfScaleHeight,
},
};
// 当前图片align值
const alignment = imageInfoList.value[index]?.image?.align || 'center';
return alignmentDraggedY[alignment];
};

const setScale = (scale: number) => {
Expand Down Expand Up @@ -333,9 +363,9 @@ export default defineComponent({
from: () => [state.draggedX, state.draggedY],
pointer: { touch: true },
bounds: () => ({
top: -getMaxDraggedY(index),
top: getMaxDraggedY(index).top,
right: getMaxDraggedX(),
bottom: getMaxDraggedY(index),
bottom: getMaxDraggedY(index).bottom,
left: -getMaxDraggedX(),
}),
},
Expand Down
Loading