Skip to content

Commit 76d7669

Browse files
authored
chore(image-viewer): update demo (#1968)
* chore(image-viewer): update demo * chore(image-viewer): update demo * fix(action-sheet): enable close when click cancel * chore: recover demo
1 parent 0ffbd27 commit 76d7669

9 files changed

Lines changed: 45 additions & 71 deletions

File tree

src/action-sheet/action-sheet.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ export default class ActionSheet extends SuperComponent {
105105

106106
onCancel() {
107107
this.triggerEvent('cancel');
108+
if (this.autoClose) {
109+
this.setData({ visible: false });
110+
this.autoClose = false;
111+
}
108112
},
109113
};
110114
}

src/image-viewer/__test__/__snapshots__/demo.test.js.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exports[`ImageViewer ImageViewer base demo works fine 1`] = `
77
size="large"
88
theme="primary"
99
variant="outline"
10-
bind:tap="clickHandle"
10+
bind:tap="onClick"
1111
>
1212
基础图片预览
1313
</t-button>
@@ -34,12 +34,12 @@ exports[`ImageViewer ImageViewer delete demo works fine 1`] = `
3434
size="large"
3535
theme="primary"
3636
variant="outline"
37-
bind:tap="clickHandle"
37+
bind:tap="onClick"
3838
>
3939
带操作图片预览
4040
</t-button>
41-
<t-toast
42-
id="t-toast"
41+
<t-action-sheet
42+
id="t-action-sheet"
4343
/>
4444
<t-image-viewer
4545
closeBtn="{{false}}"

src/image-viewer/_example/base/index.js

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Component({
99
images: [],
1010
},
1111
methods: {
12-
clickHandle() {
12+
onClick() {
1313
this.setData({
1414
images: [
1515
'https://tdesign.gtimg.com/miniprogram/images/swiper1.png',
@@ -20,20 +20,14 @@ Component({
2020
});
2121
},
2222
onChange(e) {
23-
const {
24-
detail: { index },
25-
} = e;
26-
Toast({
27-
context: this,
28-
selector: '#t-toast',
29-
message: `翻到第${index + 1}个`,
30-
});
23+
const { index } = e.detail;
24+
25+
console.log('change', index);
3126
},
3227

3328
onDelete(e) {
34-
const {
35-
detail: { index },
36-
} = e;
29+
const { index } = e.detail;
30+
3731
Toast({
3832
context: this,
3933
selector: '#t-toast',
@@ -42,22 +36,8 @@ Component({
4236
},
4337

4438
onClose(e) {
45-
const {
46-
detail: { trigger },
47-
} = e;
48-
if (trigger === 'overlay') {
49-
Toast({
50-
context: this,
51-
selector: '#t-toast',
52-
message: '点击overlay关闭',
53-
});
54-
} else if (trigger === 'button') {
55-
Toast({
56-
context: this,
57-
selector: '#t-toast',
58-
message: `点击button关闭`,
59-
});
60-
}
39+
const { trigger } = e.detail;
40+
console.log(trigger);
6141
this.setData({
6242
visible: false,
6343
});

src/image-viewer/_example/base/index.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<t-button theme="primary" size="large" variant="outline" block bind:tap="clickHandle">基础图片预览</t-button>
1+
<t-button theme="primary" size="large" variant="outline" block bind:tap="onClick">基础图片预览</t-button>
22
<t-toast id="t-toast" />
33
<t-image-viewer
44
deleteBtn="{{deleteBtn}}"

src/image-viewer/_example/delete/index.js

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Toast from 'tdesign-miniprogram/toast/index';
1+
import ActionSheet from 'tdesign-miniprogram/action-sheet/index';
22

33
Component({
44
data: {
@@ -9,7 +9,7 @@ Component({
99
images: [],
1010
},
1111
methods: {
12-
clickHandle() {
12+
onClick() {
1313
this.setData({
1414
images: [
1515
'https://tdesign.gtimg.com/miniprogram/images/swiper1.png',
@@ -22,44 +22,33 @@ Component({
2222
});
2323
},
2424
onChange(e) {
25-
const {
26-
detail: { index },
27-
} = e;
28-
Toast({
29-
context: this,
30-
selector: '#t-toast',
31-
message: `翻到第${index + 1}个`,
32-
});
25+
const { index } = e.detail;
26+
27+
console.log(index);
3328
},
3429

3530
onDelete(e) {
36-
const {
37-
detail: { index },
38-
} = e;
39-
Toast({
31+
const { index } = e.detail;
32+
33+
console.log(index);
34+
35+
ActionSheet.show({
4036
context: this,
41-
selector: '#t-toast',
42-
message: `删除第${index + 1}个`,
37+
selector: '#t-action-sheet',
38+
description: '要删除这张照片吗?',
39+
items: [
40+
{
41+
label: '删除',
42+
color: '#d54941',
43+
},
44+
],
4345
});
4446
},
4547

4648
onClose(e) {
47-
const {
48-
detail: { trigger },
49-
} = e;
50-
if (trigger === 'overlay') {
51-
Toast({
52-
context: this,
53-
selector: '#t-toast',
54-
message: '点击overlay关闭',
55-
});
56-
} else if (trigger === 'button') {
57-
Toast({
58-
context: this,
59-
selector: '#t-toast',
60-
message: `点击button关闭`,
61-
});
62-
}
49+
const { trigger } = e.detail;
50+
51+
console.log(trigger);
6352
this.setData({
6453
visible: false,
6554
});

src/image-viewer/_example/delete/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"component": true,
33
"usingComponents": {
44
"t-button": "tdesign-miniprogram/button/button",
5-
"t-toast": "tdesign-miniprogram/toast/toast",
5+
"t-action-sheet": "tdesign-miniprogram/action-sheet/action-sheet",
66
"t-image-viewer": "tdesign-miniprogram/image-viewer/image-viewer"
77
}
88
}

src/image-viewer/_example/delete/index.wxml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<t-button theme="primary" size="large" variant="outline" block bind:tap="clickHandle">带操作图片预览</t-button>
2-
<t-toast id="t-toast" />
1+
<t-button theme="primary" size="large" variant="outline" block bind:tap="onClick">带操作图片预览</t-button>
2+
3+
<t-action-sheet id="t-action-sheet" />
4+
35
<t-image-viewer
46
deleteBtn="{{deleteBtn}}"
57
closeBtn="{{closeBtn}}"

src/image-viewer/_example/image-viewer.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view class="demo">
22
<view class="demo-title">ImageViewer 图片预览</view>
33
<view class="demo-desc">用于图片内容的缩略展示与查看。</view>
4-
<t-demo title="01 类型" desc="基础图片预览" padding>
4+
<t-demo title="01 组件类型" desc="基础图片预览" padding>
55
<base />
66
</t-demo>
77
<t-demo desc="带操作图片预览" padding>

src/image-viewer/image-viewer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"component": true,
33
"usingComponents": {
44
"t-image": "../image/image",
5-
"t-icon": "../icon/icon",
6-
"t-swiper": "../swiper/swiper"
5+
"t-icon": "../icon/icon"
76
}
87
}

0 commit comments

Comments
 (0)