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] Dialog: support custom className #1224

Merged
merged 136 commits into from Jun 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
7958bf0
serve
chenjiahan May 13, 2018
31da680
fix demo
chenjiahan May 13, 2018
c204f46
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 14, 2018
4af2462
build
chenjiahan May 14, 2018
6d42cf2
[Improvement] Reorganize document
chenjiahan May 15, 2018
1c7fabc
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 15, 2018
22c2de1
[Improvement] Cell: support number type title & value
chenjiahan May 15, 2018
14cc92e
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 15, 2018
7f23a1e
[bugfix] GoodsAction: info position
chenjiahan May 15, 2018
2e6b33d
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 15, 2018
f9add03
goods action test cases
chenjiahan May 15, 2018
cf316fd
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 15, 2018
fc71a71
[bugfix] test coverage should exclude demo
chenjiahan May 15, 2018
c02bbcd
[Improvement] AddressEdit: style in small screen
chenjiahan May 16, 2018
62fa42c
test
chenjiahan May 16, 2018
7f4b86b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 16, 2018
a7cafa7
[Improvement] add AddressEdit test cases
chenjiahan May 16, 2018
ff0a067
fix transition
chenjiahan May 17, 2018
ebc8677
[bugfix] Icon template
chenjiahan May 17, 2018
ad53b31
merge
chenjiahan May 17, 2018
37305aa
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 17, 2018
599d6a8
[Improvement] Field: add left-icon prop
chenjiahan May 17, 2018
de39fb2
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 17, 2018
bdc420a
[Improvement] Progress: support gradient color
chenjiahan May 18, 2018
f9b1d5b
fix
chenjiahan May 18, 2018
90d1d98
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 18, 2018
a0b4b86
[Improvement] Rate: add change event
chenjiahan May 18, 2018
75272e8
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 19, 2018
daec732
[Improvement] Rate: add test cases
chenjiahan May 19, 2018
cb5e14a
[Improvement] Toast: add test cases
chenjiahan May 19, 2018
18ebce0
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 19, 2018
7b22a30
[Doc] add gzip size
chenjiahan May 19, 2018
e3c8089
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 19, 2018
131140c
[Build] use es entry file
chenjiahan May 19, 2018
85a6888
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 19, 2018
423e6e0
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 19, 2018
5661e0b
[Improvement] optimize isDef
chenjiahan May 19, 2018
c7d9a11
[Improvement] reduce scroll utils
chenjiahan May 19, 2018
ac06db7
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 19, 2018
ecae88b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 19, 2018
344f358
[Improvement] optimize babel plugin
chenjiahan May 20, 2018
34b439a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 21, 2018
fb8340e
[Improvement] TreeSelect: support string type id
chenjiahan May 21, 2018
8da881a
[Improvement] NumberKeyboard: add close event
chenjiahan May 21, 2018
497d86a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 21, 2018
a3f89e6
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 22, 2018
2244fcd
[Improvement] Progress: pivot shouldn't cross border
chenjiahan May 22, 2018
47ae0eb
[Improvement] Popup: support lazy render
chenjiahan May 23, 2018
feb6d0d
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 23, 2018
42b6c42
fix
chenjiahan May 23, 2018
6a4a4ef
[Doc] fix field wrong spelling
chenjiahan May 23, 2018
b78dfe4
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 23, 2018
1b96e51
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 23, 2018
6a36084
[Improvement] Picker: update unselected option color
chenjiahan May 23, 2018
1c92ba3
picker test
chenjiahan May 23, 2018
946966b
[bugfix] Field: normalize input margin in safari
chenjiahan May 24, 2018
ed40489
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 24, 2018
cc0998f
[Improvement] Dialog: prevent button text select
chenjiahan May 24, 2018
8962656
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 24, 2018
728960b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 24, 2018
5de7883
update dependencies
chenjiahan May 24, 2018
d2eea0a
[Improvement] AddressEdit: trim empty value
chenjiahan May 24, 2018
13dc336
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 24, 2018
3b45f3d
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 24, 2018
c6b6f0e
[bugfix] Toast: mask render uncorrectly when forbidClick
chenjiahan May 24, 2018
44e5035
bump jest
chenjiahan May 25, 2018
33d76f8
[Build] optimize build lib script
chenjiahan May 25, 2018
e481d7b
review
chenjiahan May 25, 2018
958945b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 25, 2018
e42417d
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 26, 2018
9790333
[Build] optimize config
chenjiahan May 26, 2018
a192f8b
[Build] dynamic import
chenjiahan May 27, 2018
800a5bd
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 27, 2018
1a0a0ac
babelrc
chenjiahan May 27, 2018
79cdc65
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 27, 2018
a13a3f2
[Build] travis: use node8
chenjiahan May 27, 2018
8d4074e
fix
chenjiahan May 27, 2018
51deb2a
[Improvement] Dialog: add get-container prop
chenjiahan May 28, 2018
d88d806
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 28, 2018
e31d8f6
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 28, 2018
d71535f
[Doc] Field: add left-icon demo
chenjiahan May 28, 2018
87aae5f
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 28, 2018
5ffa32f
[Improvement] SubmitBar: optimize render
chenjiahan May 29, 2018
9de7f2a
[Doc] improve quickstart
chenjiahan May 29, 2018
4c8f11b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 29, 2018
cec9bf5
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 29, 2018
d0b6e89
[Improvement] Uploader add test cases
chenjiahan May 29, 2018
380d8e8
[Improvement] PullRefresh: add test cases
chenjiahan May 30, 2018
15d847a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
b29cf16
[Improvement] List: add test cases
chenjiahan May 30, 2018
c58658e
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
05b9381
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
7fa7e6d
[Improvement] Slider: add test cases
chenjiahan May 30, 2018
975ea0d
[Improvement] CellSwipe: add test cases
chenjiahan May 30, 2018
721193b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
bc988ae
[Improvement] Collapse: add test cases
chenjiahan May 30, 2018
2f514bc
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
e583641
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
ab71355
[Improvement] Contact: add test cases
chenjiahan May 30, 2018
9645f3a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
c364572
[Improvement] Stepper: add test cases
chenjiahan May 30, 2018
b6d06c3
fix
chenjiahan May 30, 2018
b240a94
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
453333b
[Improvement] ImagePreview: add test cases
chenjiahan May 30, 2018
aa00c3c
fix
chenjiahan May 30, 2018
ab91fb6
fix
chenjiahan May 30, 2018
e12b404
fix
chenjiahan May 30, 2018
d1f4ab7
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
eedd258
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
4fd5265
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
d06c771
[Improvement] Search: add test cases
chenjiahan May 30, 2018
8f7ef34
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
0fadbee
[Improvement] Checkbox: add test cases
chenjiahan May 30, 2018
50b7977
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
727199b
[Improvement] Switch: add test cases
chenjiahan May 30, 2018
fa14c53
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 30, 2018
9f66da4
[bugfix] AddressEdit: area popup should mount in document root
chenjiahan May 31, 2018
e46bd8b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 31, 2018
37ea372
[bugfix] Tab: title slot render
chenjiahan May 31, 2018
1aea7a7
fix snap
chenjiahan May 31, 2018
25eb49c
Merge remote-tracking branch 'main/dev' into dev
chenjiahan May 31, 2018
b66a659
[Improvement] Picker: suppot html option
chenjiahan May 31, 2018
8d6b9df
[Improvement] upgrate to jest-serializer-vue@2.0
chenjiahan Jun 1, 2018
1b3d393
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jun 1, 2018
d452902
[Improvement] Test: separate jest config from packages.json
chenjiahan Jun 3, 2018
2448adb
Merge
chenjiahan Jun 3, 2018
8320b10
fix
chenjiahan Jun 3, 2018
bc260d2
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jun 3, 2018
189de04
[Doc] add version tip
chenjiahan Jun 3, 2018
183df20
[Improvement] Field: support v-model.number
chenjiahan Jun 4, 2018
0a01193
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jun 4, 2018
69ebdff
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jun 4, 2018
da34e9d
[Improvement] Swipe: add swipeTo method
chenjiahan Jun 4, 2018
65836b9
test cases
chenjiahan Jun 4, 2018
75ed564
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jun 5, 2018
e35a466
[Improvement] Dialog: support custom className
chenjiahan Jun 5, 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
3 changes: 2 additions & 1 deletion packages/dialog/dialog.vue
@@ -1,6 +1,6 @@
<template>
<transition name="van-dialog-bounce">
<div v-show="value" :class="b()">
<div v-show="value" :class="[b(), className]">
<div v-if="title" v-text="title" :class="b('header')" />
<div :class="b('content')" class="van-hairline">
<slot>
Expand Down Expand Up @@ -49,6 +49,7 @@ export default create({
title: String,
message: String,
callback: Function,
className: [String, Object, Array],
beforeClose: Function,
confirmButtonText: String,
cancelButtonText: String,
Expand Down
7 changes: 4 additions & 3 deletions packages/dialog/en-US.md
Expand Up @@ -70,9 +70,10 @@ export default {
|-----------|-----------|-----------|-------------|
| title | Title | `String` | - |
| message | Message | `String` | - |
| showConfirmButton | Whether to show confirm button | `Boolean` | `true` |
| showCancelButton | Whether to show cancel button | `Boolean` | `false` |
| confirmButtonText | Confirm button text | `String` | `Confirm` |
| className | Custom className | `String | Array | Object` | - |
| showConfirmButton | Whether to show confirm button | `Boolean` | `true` |
| showCancelButton | Whether to show cancel button | `Boolean` | `false` |
| confirmButtonText | Confirm button text | `String` | `Confirm` |
| cancelButtonText | Cancel button test | `String` | `Cancel` |
| overlay | Whether to show overlay | `Boolean` | `true` |
| closeOnClickOverlay | Whether to close when click overlay | `Boolean` | `false` |
Expand Down
1 change: 1 addition & 0 deletions packages/dialog/index.js
Expand Up @@ -34,6 +34,7 @@ Dialog.defaultOptions = {
title: '',
message: '',
overlay: true,
className: '',
lockScroll: true,
beforeClose: null,
confirmButtonText: '',
Expand Down
7 changes: 4 additions & 3 deletions packages/dialog/zh-CN.md
Expand Up @@ -71,9 +71,10 @@ export default {
|-----------|-----------|-----------|-------------|
| title | 标题 | `String` | - |
| message | 内容 | `String` | - |
| showConfirmButton | 是否展示确认按钮 | `Boolean` | `true` |
| showCancelButton | 是否展示取消按钮 | `Boolean` | `false` |
| confirmButtonText | 确认按钮的文案 | `String` | `确认` |
| className | 自定义类名 | `String | Array | Object` | - |
| showConfirmButton | 是否展示确认按钮 | `Boolean` | `true` |
| showCancelButton | 是否展示取消按钮 | `Boolean` | `false` |
| confirmButtonText | 确认按钮的文案 | `String` | `确认` |
| cancelButtonText | 取消按钮的文案 | `String` | `取消` |
| overlay | 是否展示蒙层 | `Boolean` | `true` |
| closeOnClickOverlay | 点击蒙层时是否关闭弹窗 | `Boolean` | `false` |
Expand Down