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

fix(imagepreview): 动态设置图片导致偏移 #1836

Merged
merged 1 commit into from
Nov 11, 2022
Merged

fix(imagepreview): 动态设置图片导致偏移 #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions src/packages/__VUE/imagepreview/__tests__/imagepreview.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,24 @@ test('video surported in H5 env', async () => {
await nextTick();
expect(wrapper.find('.custom-pop').html()).toMatchSnapshot();
});

function sleep(delay = 0): Promise<void> {
return new Promise((resolve) => {
setTimeout(resolve, delay);
});
}

test('dynamic images', async () => {
const wrapper = mount(ImagePreview, {
props: {
show: true,
images: []
}
});
await nextTick();
wrapper.setProps({
images
});
await sleep(1);
expect((wrapper.find('.nut-swiper-inner').element as any).style.transform).toEqual('translateX(0px)');
});
12 changes: 8 additions & 4 deletions src/packages/__VUE/imagepreview/index.taro.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
:is-preventDefault="false"
direction="horizontal"
@change="slideChangeEnd"
:init-page="initNo > maxNo ? maxNo - 1 : initNo - 1"
:init-page="initPage"
:pagination-visible="paginationVisible"
:pagination-color="paginationColor"
>
Expand Down Expand Up @@ -103,7 +103,6 @@ export default create({
const state = reactive({
showPop: false,
active: 1,
maxNo: 1,
source: {
src: 'https://storage.jd.com/about/big-final.mp4?Expires=3730193075&AccessKey=3LoYX1dQWa6ZXzQl&Signature=ViMFjz%2BOkBxS%2FY1rjtUVqbopbJI%3D',
type: 'video/mp4'
Expand Down Expand Up @@ -287,6 +286,12 @@ export default create({
}
);

const initPage = computed(() => {
const maxNo = props.images.length;
const _initPage = props.initNo > maxNo ? maxNo - 1 : props.initNo - 1;
return _initPage >= 0 ? _initPage : 0;
});

// 点击关闭按钮
const handleCloseIcon = () => {
onClose();
Expand All @@ -296,12 +301,11 @@ export default create({
// 初始化页码
state.active = props.initNo;
state.showPop = props.show;
// state.maxNo = props.images.length + props.videos.length;
state.maxNo = props.images.length;
});

return {
...toRefs(state),
initPage,
slideChangeEnd,
onClose,
closeOnImg,
Expand Down
11 changes: 8 additions & 3 deletions src/packages/__VUE/imagepreview/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
:is-preventDefault="false"
direction="horizontal"
@change="slideChangeEnd"
:init-page="initNo > maxNo ? maxNo - 1 : initNo - 1"
:init-page="initPage"
:pagination-visible="paginationVisible"
:pagination-color="paginationColor"
>
Expand Down Expand Up @@ -152,7 +152,6 @@ export default create({
const state = reactive({
showPop: false,
active: 1,
maxNo: 1,
rootWidth: 0,
rootHeight: 0
});
Expand Down Expand Up @@ -216,16 +215,22 @@ export default create({
}
);

const initPage = computed(() => {
const maxNo = props.images.length + props.videos.length;
const _initPage = props.initNo > maxNo ? maxNo - 1 : props.initNo - 1;
return _initPage >= 0 ? _initPage : 0;
});

onMounted(() => {
// 初始化页码
state.active = props.initNo;
state.showPop = props.show;
state.maxNo = props.images.length + props.videos.length;
});

return {
swipeRef,
...toRefs(state),
initPage,
slideChangeEnd,
onClose,
handleCloseIcon,
Expand Down