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.

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

[Improvement] Rebuild test system #1051

Merged
merged 427 commits into from May 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
427 commits
Select commit Hold shift + click to select a range
6a7c6e8
[Improvement] Sku: optimize DOM
chenjiahan Mar 16, 2018
23ca570
Merge
chenjiahan Mar 16, 2018
c532162
fix
chenjiahan Mar 16, 2018
f44dfae
fix
chenjiahan Mar 16, 2018
137208a
Merge
chenjiahan Mar 19, 2018
dc33e33
[Improvement] AddressEdit: add show-delete prop
chenjiahan Mar 19, 2018
930c88b
[Improvement] AddressEdit: add show-delete prop
chenjiahan Mar 19, 2018
3d595bb
[Improvement] Field: support autosize maxHeight & minHeight
chenjiahan Mar 19, 2018
cee48eb
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 19, 2018
719cee6
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 19, 2018
5b7d2e8
[Doc] add click event document
chenjiahan Mar 19, 2018
ffa3bdb
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 19, 2018
7d0f1b0
[Improvement] Switch: support custom size
chenjiahan Mar 19, 2018
5b32a87
fix
chenjiahan Mar 19, 2018
dba9aa5
fix
chenjiahan Mar 19, 2018
f3e18b4
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 19, 2018
dbbca5a
[bugfix] module circular dependency
chenjiahan Mar 19, 2018
ff988ec
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 19, 2018
f3c0689
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 20, 2018
a96b07e
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 20, 2018
aa9a0b1
[Doc] fix component link URL
chenjiahan Mar 21, 2018
ae3c8a2
[bugfix] Toast: overlay blocked by other element
chenjiahan Mar 21, 2018
ab0ee3a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 21, 2018
890f39d
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 21, 2018
f864d72
[Improvement] NavBar: remove top border
chenjiahan Mar 21, 2018
08e3c24
[bugfix] AddressEdit: should auto select area when created
chenjiahan Mar 22, 2018
5b1c0cb
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 22, 2018
738c87f
[Doc] DatetimePicker: improve documentation
chenjiahan Mar 22, 2018
988ad36
Merge
chenjiahan Mar 22, 2018
e0f70dc
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 22, 2018
5f9dd84
[bugfix] List: should not trigger load when hidden
chenjiahan Mar 22, 2018
0566575
fix: popup
chenjiahan Mar 22, 2018
42a9698
fix
chenjiahan Mar 22, 2018
4bc9563
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 22, 2018
b4d57a9
[Improvement] Tab: click event add title param
chenjiahan Mar 23, 2018
155d61b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 23, 2018
ce2a796
[bugfix] Toast: mask not remove when hidden
chenjiahan Mar 23, 2018
34039a5
[Improvement] Cell: update to flex-box
chenjiahan Mar 23, 2018
ba26793
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 23, 2018
c0431e5
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 23, 2018
21db22a
[Improvement] Cell: add center prop
chenjiahan Mar 23, 2018
53e7e3e
[Improvement] Field: add button slot
chenjiahan Mar 25, 2018
5d6d85a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 25, 2018
2ff61d8
fix
chenjiahan Mar 25, 2018
289c30e
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 26, 2018
3d709b8
update dependencies
chenjiahan Mar 26, 2018
24d3023
[bugfix] Tag: text line height in android
chenjiahan Mar 26, 2018
061e9f1
[Improvement] SubmitBar: adjsut font-size
chenjiahan Mar 26, 2018
323a3b0
[bugfix] Button: should be unclickavble when loading
chenjiahan Mar 26, 2018
d0145f4
[Improvement] optimize find parent mixin
chenjiahan Mar 26, 2018
f79b72b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 26, 2018
4fe0c88
[bugfix] Field: textarea height error when hidden
chenjiahan Mar 26, 2018
9121b87
fix
chenjiahan Mar 26, 2018
20eda16
fix
chenjiahan Mar 26, 2018
0b1bcb1
[Improvement] DatetimePicker: support all picker props
chenjiahan Mar 27, 2018
a675c79
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 27, 2018
073008c
fix
chenjiahan Mar 27, 2018
93a9427
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Mar 27, 2018
1c8dc9c
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 9, 2018
b79c13a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 9, 2018
26597d8
update dependencies
chenjiahan Apr 9, 2018
129d36f
[bugfix] Sku: van-sku-row font-size
chenjiahan Apr 9, 2018
6edb8b4
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 9, 2018
2c8d8a5
[bugfix] Dialog: close method may cause error
chenjiahan Apr 9, 2018
f14dd3f
[bugfix] Popup: lock-scroll not work when open multi popup
chenjiahan Apr 9, 2018
44df707
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 9, 2018
ba091c6
fix
chenjiahan Apr 10, 2018
a5b3500
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 10, 2018
61fb7ad
[Improvement] support Number type info
chenjiahan Apr 10, 2018
5d24fc5
[bugfix] Swipe: stop touch event propagation
chenjiahan Apr 10, 2018
408268c
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 10, 2018
9d91306
fix
chenjiahan Apr 10, 2018
60177cc
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 10, 2018
0371524
[bugfix] SwitchCell: text vertical align
chenjiahan Apr 11, 2018
e18a51a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 11, 2018
18454c9
[bugfix] SubmitBar: inherit wrong font size
chenjiahan Apr 12, 2018
32eeaea
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 12, 2018
85882dc
[bugfix] Button: vertical align incorrect when loading
chenjiahan Apr 12, 2018
2f842a6
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 12, 2018
e8edeb9
[Improvement] Radio: name support any types
chenjiahan Apr 12, 2018
7fd5e74
[bugfix] ImagePreview: manually close not work
chenjiahan Apr 12, 2018
8fac104
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 12, 2018
10a42b3
[bugfix] CellSwipe: only triigger swipe when drag horizontally
chenjiahan Apr 13, 2018
ab2776c
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 13, 2018
fe74058
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 13, 2018
0143f53
[bugfix] NavBar: limit title max width
chenjiahan Apr 13, 2018
08587cd
[Improvement] add touch mixin
chenjiahan Apr 13, 2018
1532f01
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 13, 2018
79e2884
fix
chenjiahan Apr 13, 2018
af69a24
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 13, 2018
181c6fe
[Improvement] SubmitBar: support custom currency symbol
chenjiahan Apr 16, 2018
95a4d1d
[Improvement] Tab: support v-model bind active tab
chenjiahan Apr 16, 2018
34af703
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 16, 2018
337d35e
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 17, 2018
faffee7
[Improvement] Dialog: add before-close prop
chenjiahan Apr 17, 2018
d94ca0e
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 17, 2018
ad10dfd
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 17, 2018
33baf30
fix
chenjiahan Apr 17, 2018
6b28661
[bugfix] Build: babel should use sync compile
chenjiahan Apr 17, 2018
171a6e3
[bugfix] Field: allow negetive number when type is number
chenjiahan Apr 18, 2018
b8ef33e
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 18, 2018
fbb58e0
update dependencies
chenjiahan Apr 19, 2018
f3122bb
[Improvement] Cell: optimize icon position
chenjiahan Apr 19, 2018
f53ba7b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 20, 2018
9433e7f
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 22, 2018
bacafe8
update dependencies
chenjiahan Apr 22, 2018
343e8a0
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 22, 2018
0940e6d
Merge
chenjiahan Apr 22, 2018
b823199
[bugfix] Popup: should remove touch event listener when distroyed
chenjiahan Apr 23, 2018
45b1b40
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 23, 2018
0772c64
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 23, 2018
91de11a
[Improvement] optimize Slider
chenjiahan Apr 23, 2018
9fe14d1
[Improvement] Slider: add step & bar-height prop
chenjiahan Apr 23, 2018
1363a97
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 23, 2018
86047c5
[bugfix] Picker: text adjust may cause option wrong offset
chenjiahan Apr 23, 2018
a5f49d2
[bugfix] Dialog: type define error
chenjiahan Apr 23, 2018
f436853
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 23, 2018
dd31c32
[Improvement] Cell: optimize flex layout
chenjiahan Apr 24, 2018
395b19b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 24, 2018
f33b93a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 24, 2018
141cb6f
[bugfix] Checkbox: should not render label when label is empty
chenjiahan Apr 24, 2018
39b8e34
fix
chenjiahan Apr 24, 2018
1083654
fix
chenjiahan Apr 24, 2018
b8516f4
[Improvement] component use bem mixin
chenjiahan Apr 24, 2018
629a948
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 24, 2018
71b8f07
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 24, 2018
f4a403b
bem
chenjiahan Apr 24, 2018
871a5f2
fix
chenjiahan Apr 24, 2018
0d17f90
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 24, 2018
af7579c
[Improvement] add sideEffects config for webpack 4
chenjiahan Apr 24, 2018
8669f56
[Improvement] Panel: use cell instead of extra style
chenjiahan Apr 24, 2018
611bf21
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 24, 2018
39e9ace
[Doc] add rem guide
chenjiahan Apr 24, 2018
b5bf9e6
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 24, 2018
c3d58ce
[bugfix] Uploader: can not upload pic in android
chenjiahan Apr 24, 2018
493bad7
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 24, 2018
48e46f2
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 24, 2018
1dcece4
rem
chenjiahan Apr 24, 2018
8ad0028
fix
chenjiahan Apr 24, 2018
21e5087
bem
chenjiahan Apr 25, 2018
8dcf928
Merge branch main/dev
chenjiahan Apr 25, 2018
0b938ec
fix dot
chenjiahan Apr 25, 2018
6175256
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 25, 2018
ddd1d9b
[Improvement] use MiniCssExtractPlugin
chenjiahan Apr 25, 2018
9f7101f
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 25, 2018
e971253
[build] upgrade vue-loader to 15.0.0
chenjiahan Apr 25, 2018
90b5508
fix test
chenjiahan Apr 25, 2018
491e591
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 25, 2018
1d1bc07
[Doc] Loading: remove circle type from document
chenjiahan Apr 25, 2018
c3c6d84
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 25, 2018
8b88e62
remove unused dependencies
chenjiahan Apr 25, 2018
0e05ccf
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 25, 2018
d1a13a8
[Improvement] Stepper: add interger prop
chenjiahan Apr 27, 2018
7329864
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Apr 27, 2018
16bd552
test
chenjiahan Apr 27, 2018
530a1aa
actionsheet
chenjiahan Apr 27, 2018
647aaa0
remove
chenjiahan Apr 27, 2018
9f85528
Merge remote-tracking branch 'main/dev' into feature/jest
chenjiahan Apr 28, 2018
ab0c499
all snap
chenjiahan Apr 28, 2018
8ca0134
more test
chenjiahan Apr 28, 2018
3711def
coupon test
chenjiahan Apr 29, 2018
7f7eb03
tree select test
chenjiahan Apr 29, 2018
9e5d049
coupon cell test
chenjiahan Apr 29, 2018
d874c12
submit bar test
chenjiahan Apr 29, 2018
334de82
test ignores
chenjiahan Apr 29, 2018
827e2c1
[Improvement] Contact: optimize background image
chenjiahan May 2, 2018
da25580
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 2, 2018
db50798
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 2, 2018
e3cf887
[bugfix] Search: incomplete text display in IOS
chenjiahan May 2, 2018
7520ce9
update popup demo
chenjiahan May 2, 2018
96a2432
[Improvement] Swipe: add touchable prop
chenjiahan May 2, 2018
76d6cff
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 2, 2018
da4b683
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 2, 2018
0680828
[Improvement] Slider: expand touch area
chenjiahan May 3, 2018
0c5f372
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 3, 2018
7875f64
[Improvement] Swipe: optimzie performance
chenjiahan May 4, 2018
4d094e2
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 4, 2018
6d7d7bf
[Improvement] ImagePreview: remove unused code
chenjiahan May 4, 2018
ad6b3ba
[Improvement] Tab: add line-width prop
chenjiahan May 4, 2018
9c14d3d
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 4, 2018
84445c2
fix
chenjiahan May 4, 2018
aac07e2
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 4, 2018
87a8c6b
[Doc] remove Accepted Values
chenjiahan May 5, 2018
56a4db3
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 5, 2018
69a7d34
[Doc] remove Accepted Values
chenjiahan May 5, 2018
c2674c1
[bugfix] Stepper: integer wrong spelling
chenjiahan May 5, 2018
508b605
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 5, 2018
edd97b3
[Doc] update slogan
chenjiahan May 5, 2018
fdcbe9f
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 5, 2018
996dfc5
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 5, 2018
7faeeba
[Improvement] Stepper: update diabled style
chenjiahan May 5, 2018
78bd02d
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 5, 2018
0dfb9da
[Improvement] Button: update style
chenjiahan May 5, 2018
b0279d7
[bugfix] Search: should not have cell border
chenjiahan May 5, 2018
3d29f06
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 5, 2018
2b48d20
[Improvement] optimize watcher
chenjiahan May 5, 2018
988fa0c
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 5, 2018
0e806f8
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 5, 2018
2bb1bb0
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 5, 2018
2c50dbb
[Improvement] Rate: rename component
chenjiahan May 6, 2018
3ae5e36
[Improvement] Rate: add english document
chenjiahan May 7, 2018
0f4a6a3
Merge
chenjiahan May 7, 2018
034c83b
[bugfix] Rate: remove dependencie of Array.fill
chenjiahan May 7, 2018
0d94d71
Merge
chenjiahan May 7, 2018
0f12487
fix
chenjiahan May 7, 2018
508c2da
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 7, 2018
98ca6aa
[Improvement] Locale: add warning when not correctly registered
chenjiahan May 7, 2018
1c60cee
[Doc] optimzie document site
chenjiahan May 7, 2018
2eb4f20
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 7, 2018
be72e2b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 8, 2018
f0ef4ba
Merge branch 'dev' into feature/jest
chenjiahan May 8, 2018
eec41e7
[Improvement] Area: add change event
chenjiahan May 8, 2018
b660695
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 8, 2018
0e1123f
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 8, 2018
271d233
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 9, 2018
50b0d6b
[Improvement] Icon: update search icon
chenjiahan May 9, 2018
6205538
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 9, 2018
847e812
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 9, 2018
5c92bcd
[Improvement] Search: update style
chenjiahan May 9, 2018
9904e11
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 9, 2018
132ee2b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 9, 2018
73caebd
[bugfix] Cell: default width
chenjiahan May 10, 2018
32c4839
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 10, 2018
bcbe8df
Merge branch 'dev' into feature/jest
chenjiahan May 10, 2018
4c5d3c3
delete
chenjiahan May 10, 2018
6720ce2
update
chenjiahan May 10, 2018
750ace1
[Improvement] NoticeBar: add ref check
chenjiahan May 10, 2018
758c107
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 10, 2018
a5223be
Merge
chenjiahan May 10, 2018
b45f9d4
update
chenjiahan May 10, 2018
c17a252
fix
chenjiahan May 10, 2018
5e0b78b
fix
chenjiahan May 10, 2018
d1281b1
fix
chenjiahan May 10, 2018
c4cee9a
[Improvement] ImagePreview: optimize click detect
chenjiahan May 11, 2018
23e45ec
[Doc] fix dialog document
chenjiahan May 11, 2018
41d9f43
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 11, 2018
527f2b1
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 12, 2018
0ba6579
[bugfix] ImagePreview: can't be closed when contain single image
chenjiahan May 12, 2018
c898a8d
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 12, 2018
d97c8b6
[Improvement] AddressEdit: add cancel-delete event
chenjiahan May 12, 2018
042fa79
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 12, 2018
ea20daf
[Improvement] Field: add label slot
chenjiahan May 12, 2018
8b92e74
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 12, 2018
4fc2234
[Improvement] Toast: add loadingType option
chenjiahan May 12, 2018
57abbf2
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 12, 2018
48947c2
[Doc] fix demo page
chenjiahan May 12, 2018
7108c81
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 12, 2018
77481f7
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 12, 2018
240160d
Merge branch 'feature/jest' into dev
chenjiahan May 12, 2018
4fe2b0a
fix snap
chenjiahan May 12, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .babelrc
Expand Up @@ -4,6 +4,11 @@
"env": {
"commonjs": {
"presets": [["env", { "modules": "commonjs", "loose": true }]]
},
"test": {
"presets": [
["env", { "targets": { "node": 8 }}]
]
}
}
}
5 changes: 3 additions & 2 deletions build/bin/build-components.js
Expand Up @@ -13,6 +13,7 @@ const compilerOption = {
extends: path.join(__dirname, '../../.babelrc')
}
};
const whiteList = ['vant-css', 'test'];

// clear dir
fs.emptyDirSync(esDir);
Expand All @@ -29,8 +30,8 @@ function compile(dir, jsOnly = false) {
files.forEach(file => {
const absolutePath = path.join(dir, file);

// 移除 vant-css
if (file.indexOf('vant-css') !== -1) {
// 移除不需要的文件
if (whiteList.indexOf(file) !== -1) {
fs.removeSync(absolutePath);
// 遍历文件夹
} else if (isDir(absolutePath)) {
Expand Down
1 change: 1 addition & 0 deletions docs/demos/views/coupon.vue
Expand Up @@ -95,6 +95,7 @@ export default {
disabledDiscountCoupon() {
return {
...this.discountCoupon,
discount: 10,
id: 4,
available: 0,
reason: this.$t('coupon.reason')
Expand Down
2 changes: 1 addition & 1 deletion docs/demos/views/image-preview.vue
Expand Up @@ -15,7 +15,7 @@
</template>

<script>
import { ImagePreview } from 'packages';
import { ImagePreview } from '../../../packages';

export default {
i18n: {
Expand Down
4 changes: 4 additions & 0 deletions docs/demos/views/panel.vue
Expand Up @@ -18,6 +18,10 @@
</demo-section>
</template>

<script>
export default {};
</script>

<style lang="postcss">
.demo-panel {
.van-panel__footer {
Expand Down
2 changes: 1 addition & 1 deletion docs/demos/views/password-input.vue
Expand Up @@ -30,7 +30,7 @@ export default {

data() {
return {
value: '',
value: '123',
showKeyboard: true
};
},
Expand Down
2 changes: 1 addition & 1 deletion docs/demos/views/steps.vue
Expand Up @@ -76,7 +76,7 @@ export default {

data() {
return {
active: 0
active: 1
};
},

Expand Down
2 changes: 1 addition & 1 deletion docs/demos/views/waterfall.vue
Expand Up @@ -14,7 +14,7 @@
</template>

<script>
import { Waterfall } from 'packages';
import { Waterfall } from '../../../packages';

export default {
i18n: {
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/en-US/password-input.md
Expand Up @@ -33,7 +33,7 @@ Vue.use(PasswordInput).use(NumberKeyboard);
export default {
data() {
return {
value: '',
value: '123',
showKeyboard: true
};
},
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/en-US/steps.md
Expand Up @@ -24,7 +24,7 @@ Vue.use(Step).use(Steps);
export default {
data() {
return {
active: 0
active: 1
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/zh-CN/password-input.md
Expand Up @@ -33,7 +33,7 @@ Vue.use(PasswordInput).use(NumberKeyboard);
export default {
data() {
return {
value: '',
value: '123',
showKeyboard: true
};
},
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/zh-CN/steps.md
Expand Up @@ -24,7 +24,7 @@ Vue.use(Step).use(Steps);
export default {
data() {
return {
active: 0
active: 1
};
}
}
Expand Down
75 changes: 50 additions & 25 deletions package.json
Expand Up @@ -26,10 +26,9 @@
"deploy:docs": "rimraf docs/dist && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.doc.js",
"dist": "npm run bootstrap && node build/bin/build-lib.js",
"lint": "./node_modules/.bin/eslint ./packages --ext .js,.vue",
"test": "karma start test/karma.conf.js --single-run",
"test:coverage": "open test/coverage/lcov-report/index.html",
"test:watch": "karma start test/karma.conf.js",
"test:single": "node ./test/selector.js",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "open test/coverage/index.html",
"release": "sh build/release.sh",
"precommit": "lint-staged"
},
Expand Down Expand Up @@ -58,17 +57,18 @@
"vue": ">= 2.5.0"
},
"devDependencies": {
"autoprefixer": "^8.4.1",
"avoriaz": "2.0.0",
"@vue/server-test-utils": "^1.0.0-beta.15",
"@vue/test-utils": "^1.0.0-beta.15",
"autoprefixer": "^8.3.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-jest": "^22.4.3",
"babel-loader": "^7.1.4",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-runtime": "^6.15.0",
"babel-preset-env": "^1.6.1",
"chai": "^4.1.2",
"codecov": "^3.0.1",
"cross-env": "^5.1.4",
"codecov": "^3.0.0",
"cross-env": "^5.1.5",
"css-loader": "^0.28.11",
"dependency-tree": "^6.1.0",
"eslint": "^4.19.1",
Expand All @@ -77,39 +77,64 @@
"gh-pages": "^1.0.0",
"html-webpack-plugin": "3.2.0",
"husky": "^0.14.3",
"istanbul-instrumenter-loader": "^3.0.1",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.2",
"karma-mocha": "^1.3.0",
"karma-sinon-chai": "^1.3.4",
"jest": "^22.4.3",
"jest-serializer-vue": "^1.0.0",
"karma-spec-reporter": "^0.0.32",
"karma-webpack": "3.0.0",
"lint-staged": "^7.1.0",
"mocha": "^5.1.1",
"lint-staged": "^7.0.4",
"postcss": "^6.0.22",
"postcss-calc": "^6.0.0",
"postcss-easy-import": "^3.0.0",
"postcss-loader": "^2.1.5",
"precss": "2.0.0",
"progress-bar-webpack-plugin": "^1.11.0",
"rimraf": "^2.5.4",
"shelljs": "^0.8.2",
"sinon": "^2.4.1",
"sinon-chai": "^2.12.0",
"shelljs": "^0.8.1",
"style-loader": "^0.21.0",
"uppercamelcase": "^3.0.0",
"url-loader": "^1.0.1",
"vant-doc": "1.0.4",
"vue": "2.5.16",
"vue-loader": "^15.0.9",
"vue-jest": "^2.5.0",
"vue-loader": "^15.0.0",
"vue-router": "^3.0.1",
"vue-server-renderer": "^2.5.16",
"vue-sfc-compiler": "^0.0.8",
"vue-style-loader": "^4.1.0",
"vue-template-compiler": "2.5.16",
"vue-template-es2015-compiler": "^1.6.0",
"webpack": "^4.8.1",
"webpack-cli": "^2.1.3",
"webpack-dev-server": "3.1.4"
"webpack": "^4.6.0",
"webpack-cli": "^2.0.15",
"webpack-dev-server": "3.1.4",
"webpack-merge": "^4.1.2"
},
"jest": {
"moduleFileExtensions": [
"js",
"vue"
],
"transform": {
"^.+\\.js$": "<rootDir>/node_modules/babel-jest",
".*\\.(vue)$": "<rootDir>/node_modules/vue-jest"
},
"moduleNameMapper": {
"^packages/(.*)$": "<rootDir>/packages/$1"
},
"snapshotSerializers": [
"<rootDir>/node_modules/jest-serializer-vue"
],
"collectCoverageFrom": [
"packages/**/*.{js,vue}",
"!**/vant-css/**",
"!**/locale/lang/**",
"!**/waterfall/**",
"!**/lazyload/**"
],
"collectCoverage": true,
"coverageReporters": [
"html",
"lcov",
"text-summary"
],
"coverageDirectory": "./test/coverage"
}
}
67 changes: 67 additions & 0 deletions packages/actionsheet/test/__snapshots__/index.spec.js.snap
@@ -0,0 +1,67 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`callback events 1`] = `
<div class="van-actionsheet" style="display: none;" name="van-slide-bottom">
<ul class="van-hairline--bottom">
<li class="van-actionsheet__item van-hairline--top"><span class="van-actionsheet__name">Option</span>
<!---->
</li>
<li class="van-actionsheet__item van-hairline--top"><span class="van-actionsheet__name">Option</span>
<!---->
</li>
</ul>
<div class="van-actionsheet__cancel van-hairline--top">Cancel</div>
</div>
`;

exports[`renders actionsheet correctly 1`] = `
<div>
<div>
<button class="van-button van-button--default van-button--normal">
<!----><span class="van-button__text">弹出 Actionsheet</span></button>
<div class="van-actionsheet" style="display:none;">
<ul class="van-hairline--bottom">
<li class="van-actionsheet__item van-hairline--top"><span class="van-actionsheet__name">选项</span>
<!---->
</li>
<li class="van-actionsheet__item van-hairline--top"><span class="van-actionsheet__name">选项</span> <span class="van-actionsheet__subname">描述信息</span></li>
<li class="van-actionsheet__item van-hairline--top">
<div class="van-loading van-loading--circular van-loading--black van-actionsheet__loading" style="width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
</li>
</ul>
<div class="van-actionsheet__content"></div>
</div>
</div>
<div>
<button class="van-button van-button--default van-button--normal">
<!----><span class="van-button__text">弹出带取消按钮的 Actionsheet</span></button>
<div class="van-actionsheet" style="display:none;">
<ul class="van-hairline--bottom">
<li class="van-actionsheet__item van-hairline--top"><span class="van-actionsheet__name">选项</span>
<!---->
</li>
<li class="van-actionsheet__item van-hairline--top"><span class="van-actionsheet__name">选项</span> <span class="van-actionsheet__subname">描述信息</span></li>
<li class="van-actionsheet__item van-hairline--top">
<div class="van-loading van-loading--circular van-loading--black van-actionsheet__loading" style="width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
</li>
</ul>
<div class="van-actionsheet__cancel van-hairline--top">取消</div>
</div>
</div>
<div>
<button class="van-button van-button--default van-button--normal">
<!----><span class="van-button__text">弹出带标题的 Actionsheet</span></button>
<div class="van-actionsheet van-actionsheet--withtitle" style="display:none;">
<div class="van-hairline--top-bottom van-actionsheet__header">
<div>标题</div>
<i class="van-icon van-icon-close" style="color:undefined;">
<!---->
</i>
</div>
<div class="van-actionsheet__content">
<p>内容</p>
</div>
</div>
</div>
</div>
`;
26 changes: 26 additions & 0 deletions packages/actionsheet/test/index.spec.js
@@ -0,0 +1,26 @@
import { shallow } from '@vue/test-utils';
import Actionsheet from '../';
import demoTest from '../../../test/demo-test';

demoTest(Actionsheet);

test('callback events', () => {
const callback = jest.fn();
const wrapper = shallow(Actionsheet, {
propsData: {
actions: [
{ name: 'Option', callback },
{ name: 'Option' }
],
cancelText: 'Cancel'
}
});

wrapper.findAll('li').trigger('click');
wrapper.find('.van-actionsheet__cancel').trigger('click');

expect(callback.mock.calls.length).toBe(1);
expect(wrapper.emitted('cancel')).toBeTruthy();
expect(wrapper.emitted('input')[0][0]).toBeFalsy();
expect(wrapper.html()).toMatchSnapshot();
});