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(image-viewer): update slot render logic & event params #1544

Merged
merged 1 commit into from
Feb 2, 2023
Merged

fix(image-viewer): update slot render logic & event params #1544

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
7 changes: 7 additions & 0 deletions src/image-viewer/image-viewer.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,17 @@

&-close {
margin-left: @image-viewer-close-margin-left; // 关闭操作按钮左部间距

&:empty {
display: none;
}
}

&-delete {
margin-right: @image-viewer-delete-margin-right; // 删除操作按钮右部间距
&:empty {
display: none;
}
}

&-close,
Expand Down
17 changes: 8 additions & 9 deletions src/image-viewer/image-viewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { styles, setIcon } from '../common/utils';
import { styles, calcIcon } from '../common/utils';
import { SuperComponent, wxComponent } from '../common/src/index';
import config from '../common/config';
import props from './props';
Expand Down Expand Up @@ -45,17 +45,15 @@ export default class ImageViewer extends SuperComponent {
});
},

closeBtn(closeBtn) {
const obj = setIcon('closeBtn', closeBtn, 'close');
closeBtn(v) {
this.setData({
...obj,
_closeBtn: calcIcon(v, 'close'),
});
},

deleteBtn(deleteBtn) {
const obj = setIcon('deleteBtn', deleteBtn, 'delete');
deleteBtn(v) {
this.setData({
...obj,
_deleteBtn: calcIcon(v, 'delete'),
});
},
};
Expand Down Expand Up @@ -132,8 +130,9 @@ export default class ImageViewer extends SuperComponent {
this._trigger('change', { index: current });
},

onClose() {
this._trigger('close', { visible: false, trigger: 'button', index: this.data.currentSwiperIndex });
onClose(e) {
const { source } = e.currentTarget.dataset;
this._trigger('close', { visible: false, trigger: source || 'button', index: this.data.currentSwiperIndex });
},

onDelete() {
Expand Down
35 changes: 13 additions & 22 deletions src/image-viewer/image-viewer.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
<wxs src="../common/utils.wxs" module="_" />

<view wx:if="{{visible}}" id="{{classPrefix}}" class="{{classPrefix}} {{prefix}}-class">
<view class="{{classPrefix}}__mask" style="{{ 'background-color: ' + backgroundColor }}" />
<view
class="{{classPrefix}}__mask"
data-source="overlay"
bind:tap="onClose"
style="{{ 'background-color: ' + backgroundColor }}"
/>
<block wx:if="{{images && images.length}}">
<view slot="content" class="{{classPrefix}}__content">
<swiper
Expand All @@ -12,13 +17,7 @@
current="{{currentSwiperIndex}}"
bindchange="onSwiperChange"
>
<swiper-item
wx:for="{{images}}"
wx:key="index"
class="{{classPrefix}}__preview-image"
data-source="overlay"
bind:tap="onClose"
>
<swiper-item wx:for="{{images}}" wx:key="index" class="{{classPrefix}}__preview-image">
<t-image
t-class="t-image--external"
style="{{imagesShape[index].style}}"
Expand All @@ -33,26 +32,18 @@
</swiper>
</view>
<view class="{{classPrefix}}__nav">
<view
wx:if="{{closeBtnName || _.isNoEmptyObj(closeBtnData)}}"
class="{{classPrefix}}__nav-close"
bind:tap="onClose"
>
<slot wx:if="{{closeBtnName === 'slot'}}" name="close-btn" />
<template wx:else is="icon" data="{{ name: closeBtnName, ...closeBtnData}}"></template>
<view class="{{classPrefix}}__nav-close" catch:tap="onClose">
<slot name="close-btn" />
<template wx:if="{{_closeBtn}}" is="icon" data="{{ ..._closeBtn }}" />
</view>

<view wx:if="{{showIndex}}" class="{{classPrefix}}__nav-index">
{{currentSwiperIndex + 1}}/{{images.length}}
</view>

<view
wx:if="{{deleteBtnName || _.isNoEmptyObj(deleteBtnData)}}"
class="{{classPrefix}}__nav-delete"
bind:tap="onDelete"
>
<slot wx:if="{{deleteBtnName === 'slot'}}" name="delete-btn" />
<template wx:else is="icon" data="{{ name: deleteBtnName, ...deleteBtnData}}"></template>
<view class="{{classPrefix}}__nav-delete" bind:tap="onDelete">
<slot name="delete-btn" />
<template is="icon" data="{{ ..._deleteBtn }}" />
</view>
</view>
</block>
Expand Down