Skip to content

Commit 5351b54

Browse files
yangxiaolu1993yangxiaolu1993
authored
Merge branch 'next' into next
2 parents aaed739 + 0e5be11 commit 5351b54

File tree

13 files changed

+470
-225
lines changed

13 files changed

+470
-225
lines changed

‎.npmrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
registry=https://registry.npmjs.org
2-
engine-strict=true
1+
# registry=https://registry.npmjs.org
2+
# engine-strict=true

‎demo.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
<meta http-equiv="Expires" content="0" />
1212
</head>
1313
<body>
14+
<script src='https://cdn.bootcss.com/vConsole/3.3.2/vconsole.min.js'></script>
15+
<!-- <script type="text/javascript">
16+
17+
window.vConsole = new window.VConsole();
18+
console.log("错误");</script> -->
1419
<noscript>
1520
<strong
1621
>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"devDependencies": {
8181
"@commitlint/cli": "^10.0.0",
8282
"@commitlint/config-conventional": "^10.0.0",
83+
"@jd/upload-oss-tools": "^1.1.21",
8384
"@popperjs/core": "^2.11.5",
8485
"@tarojs/taro": "^3.4.0",
8586
"@types/jest": "^26.0.22",

‎src/packages/__VUE/imagepreview/__tests__/__snapshots__/imagepreview.spec.ts.snap

Lines changed: 66 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,65 +9,83 @@ exports[`video surported in H5 env 1`] = `
99
<view class=\\"nut-swiper nut-imagepreview-swiper\\">
1010
<view class=\\"nut-swiper-inner\\">
1111
<view class=\\"nut-swiper-item\\">
12-
<div class=\\"nut-video\\"><video class=\\"nut-video-player\\" controls=\\"\\">
13-
<source src=\\"https://storage.jd.com/about/big-final.mp4?Expires=3730193075&amp;AccessKey=3LoYX1dQWa6ZXzQl&amp;Signature=ViMFjz%2BOkBxS%2FY1rjtUVqbopbJI%3D\\" type=\\"video/mp4\\">
14-
</video>
15-
<!--v-if-->
16-
<!--v-if-->
17-
<div class=\\"nut-video-controller show-control\\" style=\\"display: none;\\">
18-
<div class=\\"control-play-btn\\"></div>
19-
<div class=\\"current-time\\">00:00</div>
20-
<div class=\\"progress-container\\">
21-
<div class=\\"progress\\">
22-
<div class=\\"buffered\\" style=\\"width: 0%;\\"></div>
23-
<div class=\\"video-ball\\" style=\\"transform: translate3d(0px, -50%, 0);\\">
24-
<div class=\\"move-handle\\"></div>
12+
<!--v-if-->
13+
<view class=\\"nut-imagepreview-box\\">
14+
<div class=\\"nut-video\\"><video class=\\"nut-video-player\\" controls=\\"\\">
15+
<source src=\\"https://storage.jd.com/about/big-final.mp4?Expires=3730193075&amp;AccessKey=3LoYX1dQWa6ZXzQl&amp;Signature=ViMFjz%2BOkBxS%2FY1rjtUVqbopbJI%3D\\" type=\\"video/mp4\\">
16+
</video>
17+
<!--v-if-->
18+
<!--v-if-->
19+
<div class=\\"nut-video-controller show-control\\" style=\\"display: none;\\">
20+
<div class=\\"control-play-btn\\"></div>
21+
<div class=\\"current-time\\">00:00</div>
22+
<div class=\\"progress-container\\">
23+
<div class=\\"progress\\">
24+
<div class=\\"buffered\\" style=\\"width: 0%;\\"></div>
25+
<div class=\\"video-ball\\" style=\\"transform: translate3d(0px, -50%, 0);\\">
26+
<div class=\\"move-handle\\"></div>
27+
</div>
28+
<div class=\\"played\\"></div>
2529
</div>
26-
<div class=\\"played\\"></div>
2730
</div>
31+
<div class=\\"duration-time\\">00:00</div>
32+
<div class=\\"volume muted\\"></div>
33+
<div class=\\"fullscreen-icon\\"></div>
34+
</div><!-- 错误弹窗 -->
35+
<div class=\\"nut-video-error\\" style=\\"display: none;\\">
36+
<p class=\\"lose\\">视频加载失败</p>
37+
<p class=\\"retry\\">点击重试</p>
2838
</div>
29-
<div class=\\"duration-time\\">00:00</div>
30-
<div class=\\"volume muted\\"></div>
31-
<div class=\\"fullscreen-icon\\"></div>
32-
</div><!-- 错误弹窗 -->
33-
<div class=\\"nut-video-error\\" style=\\"display: none;\\">
34-
<p class=\\"lose\\">视频加载失败</p>
35-
<p class=\\"retry\\">点击重试</p>
3639
</div>
37-
</div>
40+
</view>
3841
</view>
3942
<view class=\\"nut-swiper-item\\">
40-
<div class=\\"nut-video\\"><video class=\\"nut-video-player\\" controls=\\"\\">
41-
<source src=\\"https://storage.jd.com/about/big-final.mp4?Expires=3730193075&amp;AccessKey=3LoYX1dQWa6ZXzQl&amp;Signature=ViMFjz%2BOkBxS%2FY1rjtUVqbopbJI%3D\\" type=\\"video/mp4\\">
42-
</video>
43-
<!--v-if-->
44-
<!--v-if-->
45-
<div class=\\"nut-video-controller show-control\\" style=\\"display: none;\\">
46-
<div class=\\"control-play-btn\\"></div>
47-
<div class=\\"current-time\\">00:00</div>
48-
<div class=\\"progress-container\\">
49-
<div class=\\"progress\\">
50-
<div class=\\"buffered\\" style=\\"width: 0%;\\"></div>
51-
<div class=\\"video-ball\\" style=\\"transform: translate3d(0px, -50%, 0);\\">
52-
<div class=\\"move-handle\\"></div>
43+
<!--v-if-->
44+
<view class=\\"nut-imagepreview-box\\">
45+
<div class=\\"nut-video\\"><video class=\\"nut-video-player\\" controls=\\"\\">
46+
<source src=\\"https://storage.jd.com/about/big-final.mp4?Expires=3730193075&amp;AccessKey=3LoYX1dQWa6ZXzQl&amp;Signature=ViMFjz%2BOkBxS%2FY1rjtUVqbopbJI%3D\\" type=\\"video/mp4\\">
47+
</video>
48+
<!--v-if-->
49+
<!--v-if-->
50+
<div class=\\"nut-video-controller show-control\\" style=\\"display: none;\\">
51+
<div class=\\"control-play-btn\\"></div>
52+
<div class=\\"current-time\\">00:00</div>
53+
<div class=\\"progress-container\\">
54+
<div class=\\"progress\\">
55+
<div class=\\"buffered\\" style=\\"width: 0%;\\"></div>
56+
<div class=\\"video-ball\\" style=\\"transform: translate3d(0px, -50%, 0);\\">
57+
<div class=\\"move-handle\\"></div>
58+
</div>
59+
<div class=\\"played\\"></div>
5360
</div>
54-
<div class=\\"played\\"></div>
5561
</div>
62+
<div class=\\"duration-time\\">00:00</div>
63+
<div class=\\"volume muted\\"></div>
64+
<div class=\\"fullscreen-icon\\"></div>
65+
</div><!-- 错误弹窗 -->
66+
<div class=\\"nut-video-error\\" style=\\"display: none;\\">
67+
<p class=\\"lose\\">视频加载失败</p>
68+
<p class=\\"retry\\">点击重试</p>
5669
</div>
57-
<div class=\\"duration-time\\">00:00</div>
58-
<div class=\\"volume muted\\"></div>
59-
<div class=\\"fullscreen-icon\\"></div>
60-
</div><!-- 错误弹窗 -->
61-
<div class=\\"nut-video-error\\" style=\\"display: none;\\">
62-
<p class=\\"lose\\">视频加载失败</p>
63-
<p class=\\"retry\\">点击重试</p>
6470
</div>
65-
</div>
71+
</view>
72+
</view>
73+
<view class=\\"nut-swiper-item\\">
74+
<view style=\\"transition-duration: .3s;\\" class=\\"nut-imagepreview-box\\"><img src=\\"//m.360buyimg.com/mobilecms/s750x366_jfs/t1/18629/34/3378/144318/5c263f64Ef0e2bff0/0d650e0aa2e852ee.jpg\\" class=\\"nut-imagepreview-img\\"></view>
75+
<!--v-if-->
76+
</view>
77+
<view class=\\"nut-swiper-item\\">
78+
<view style=\\"transition-duration: .3s;\\" class=\\"nut-imagepreview-box\\"><img src=\\"//m.360buyimg.com/mobilecms/s750x366_jfs/t1/26597/30/4870/174583/5c35c5d2Ed55eedc6/50e27870c25e7a82.png\\" class=\\"nut-imagepreview-img\\"></view>
79+
<!--v-if-->
80+
</view>
81+
<view class=\\"nut-swiper-item\\">
82+
<view style=\\"transition-duration: .3s;\\" class=\\"nut-imagepreview-box\\"><img src=\\"//m.360buyimg.com/mobilecms/s750x366_jfs/t1/9542/17/12873/201687/5c3c4362Ea9eb757d/60026b40a9d60d85.jpg\\" class=\\"nut-imagepreview-img\\"></view>
83+
<!--v-if-->
84+
</view>
85+
<view class=\\"nut-swiper-item\\">
86+
<view style=\\"transition-duration: .3s;\\" class=\\"nut-imagepreview-box\\"><img src=\\"//m.360buyimg.com/mobilecms/s750x366_jfs/t1/30042/36/427/82951/5c3bfdabE3faf2f66/9adca782661c988c.jpg\\" class=\\"nut-imagepreview-img\\"></view>
87+
<!--v-if-->
6688
</view>
67-
<view class=\\"nut-swiper-item\\"><img src=\\"//m.360buyimg.com/mobilecms/s750x366_jfs/t1/18629/34/3378/144318/5c263f64Ef0e2bff0/0d650e0aa2e852ee.jpg\\" class=\\"nut-imagepreview-img\\"></view>
68-
<view class=\\"nut-swiper-item\\"><img src=\\"//m.360buyimg.com/mobilecms/s750x366_jfs/t1/26597/30/4870/174583/5c35c5d2Ed55eedc6/50e27870c25e7a82.png\\" class=\\"nut-imagepreview-img\\"></view>
69-
<view class=\\"nut-swiper-item\\"><img src=\\"//m.360buyimg.com/mobilecms/s750x366_jfs/t1/9542/17/12873/201687/5c3c4362Ea9eb757d/60026b40a9d60d85.jpg\\" class=\\"nut-imagepreview-img\\"></view>
70-
<view class=\\"nut-swiper-item\\"><img src=\\"//m.360buyimg.com/mobilecms/s750x366_jfs/t1/30042/36/427/82951/5c3bfdabE3faf2f66/9adca782661c988c.jpg\\" class=\\"nut-imagepreview-img\\"></view>
7189
</view>
7290
<!--v-if-->
7391
</view>

‎src/packages/__VUE/imagepreview/__tests__/imagepreview.spec.ts

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -97,22 +97,6 @@ test('customize pagination and color', async () => {
9797
expect(swiperPagination.findAll('i')[0].element.style.backgroundColor).toEqual('red');
9898
});
9999

100-
// test('test content-close', async () => {
101-
// const wrapper = mount(ImagePreview, {
102-
// props: {
103-
// show: true,
104-
// images,
105-
// autoplay: 0,
106-
// contentClose: true
107-
// }
108-
// });
109-
// await nextTick();
110-
111-
// // const key = wrapper.find('.nut-imagepreview');
112-
// // await key.trigger('click');
113-
// // expect((wrapper.find('.custom-pop').element as any).style.display).toEqual('none');
114-
// });
115-
116100
test('video surported in H5 env', async () => {
117101
const wrapper = mount(ImagePreview, {
118102
props: {
@@ -124,17 +108,3 @@ test('video surported in H5 env', async () => {
124108
await nextTick();
125109
expect(wrapper.find('.custom-pop').html()).toMatchSnapshot();
126110
});
127-
128-
// test('close event trigged', async () => {
129-
// const wrapper = mount(ImagePreview, {
130-
// props: {
131-
// show: true,
132-
// images,
133-
// }
134-
// });
135-
// await nextTick();
136-
// const overlay: any = wrapper.find('.nut-overlay');
137-
// await overlay.trigger('click');
138-
// expect(wrapper.emitted('close')).toBeTruthy();
139-
// expect(wrapper.emitted('update:show')).toBeFalsy();
140-
// });

‎src/packages/__VUE/imagepreview/demo.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ export default createDemo({
6666
{
6767
src: '//m.360buyimg.com/mobilecms/s750x366_jfs/t1/18629/34/3378/144318/5c263f64Ef0e2bff0/0d650e0aa2e852ee.jpg'
6868
},
69+
{
70+
src: '//m.360buyimg.com/mobilecms/s750x366_jfs/t1/18629/34/3378/144318/5c263f64Ef0e2bff0/0d650e0aa2e852ee.jpg'
71+
},
6972
{
7073
src: '//m.360buyimg.com/mobilecms/s750x366_jfs/t1/26597/30/4870/174583/5c35c5d2Ed55eedc6/50e27870c25e7a82.png'
7174
},

‎src/packages/__VUE/imagepreview/doc.en-US.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@ app.use(ImagePreview);
314314
| close-icon`v3.1.22` | Close icon name | String | ‘circle-close’ |
315315
| close-icon-position`v3.1.22` | Close icon position,can be set to `top-left` | String | ‘top-right’ |
316316
| before-close`v3.1.22` | Callback function before close | (active: number) => boolean | Promise<`boolean`> | - |
317+
| max-zoom`v3.1.23` | Max zoom`Taro isn't supported` | Number | 3 |
318+
| min-zoom`v3.1.23` | Min zoom`Taro isn't supported` | Number | 1/3 |
317319

318320

319321

‎src/packages/__VUE/imagepreview/doc.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,8 @@ app.use(ImagePreview);
314314
| close-icon`v3.1.22` | 关闭图片名称或图片链接 | String | ‘circle-close’ |
315315
| close-icon-position`v3.1.22` | 关闭图标位置，可选值：top-left | String | ‘top-right’ |
316316
| before-close`v3.1.22` | 关闭前的回调函数，返回 false 可阻止关闭，支持返回 Promise | (active: number) => boolean | Promise<`boolean`> | - |
317-
317+
| max-zoom`v3.1.23` | 手势缩放时，最大缩放比例`小程序暂不支持` | Number | 3 |
318+
| min-zoom`v3.1.23` | 手势缩放时，最小缩放比例`小程序暂不支持` | Number | 1/3 |
318319

319320
### Events
320321

0 commit comments

Comments
 (0)