+
-
+
-
00
@@ -157,7 +157,7 @@ exports[`max-hour & max-minute 1`] = `
-
+
-
00
@@ -169,7 +169,7 @@ exports[`max-hour & max-minute 1`] = `
-
+
diff --git a/src/dialog/Dialog.js b/src/dialog/Dialog.js
index 7c341c609..815dad25c 100644
--- a/src/dialog/Dialog.js
+++ b/src/dialog/Dialog.js
@@ -21,6 +21,14 @@ export default createComponent({
confirmButtonText: String,
confirmButtonColor: String,
showCancelButton: Boolean,
+ overlay: {
+ type: Boolean,
+ default: true,
+ },
+ allowHtml: {
+ type: Boolean,
+ default: true,
+ },
transition: {
type: String,
default: 'van-dialog-bounce',
@@ -29,7 +37,7 @@ export default createComponent({
type: Boolean,
default: true,
},
- overlay: {
+ closeOnPopstate: {
type: Boolean,
default: true,
},
@@ -37,10 +45,6 @@ export default createComponent({
type: Boolean,
default: false,
},
- allowHtml: {
- type: Boolean,
- default: true,
- },
},
data() {
diff --git a/src/dialog/README.md b/src/dialog/README.md
index 941616d97..4dbcace02 100644
--- a/src/dialog/README.md
+++ b/src/dialog/README.md
@@ -130,7 +130,7 @@ export default {
| overlay | Whether to show overlay | _boolean_ | `true` |
| overlayClass `v2.2.7` | Custom overlay class | _string_ | - |
| overlayStyle `v2.2.7` | Custom overlay style | _object_ | - |
-| closeOnPopstate `v2.0.5` | Whether to close when popstate | _boolean_ | `false` |
+| closeOnPopstate `v2.0.5` | Whether to close when popstate | _boolean_ | `true` |
| closeOnClickOverlay | Whether to close when click overlay | _boolean_ | `false` |
| lockScroll | Whether to lock body scroll | _boolean_ | `true` |
| allowHtml `v2.8.7` | Whether to allow HTML rendering in message | _boolean_ | `true` |
@@ -156,7 +156,7 @@ export default {
| overlay | Whether to show overlay | _boolean_ | `true` |
| overlay-class `v2.2.7` | Custom overlay class | _string_ | - |
| overlay-style `v2.2.7` | Custom overlay style | _object_ | - |
-| close-on-popstate `v2.0.5` | Whether to close when popstate | _boolean_ | `false` |
+| close-on-popstate `v2.0.5` | Whether to close when popstate | _boolean_ | `true` |
| close-on-click-overlay | Whether to close when click overlay | _boolean_ | `false` |
| lazy-render | Whether to lazy render util appeared | _boolean_ | `true` |
| lock-scroll | Whether to lock background scroll | _boolean_ | `true` |
diff --git a/src/dialog/README.zh-CN.md b/src/dialog/README.zh-CN.md
index 4845d1ca2..7ead0b38c 100644
--- a/src/dialog/README.zh-CN.md
+++ b/src/dialog/README.zh-CN.md
@@ -160,7 +160,7 @@ export default {
| overlay | 是否展示遮罩层 | _boolean_ | `true` |
| overlayClass `v2.2.7` | 自定义遮罩层类名 | _string_ | - |
| overlayStyle `v2.2.7` | 自定义遮罩层样式 | _object_ | - |
-| closeOnPopstate `v2.0.5` | 是否在页面回退时自动关闭 | _boolean_ | `false` |
+| closeOnPopstate `v2.0.5` | 是否在页面回退时自动关闭 | _boolean_ | `true` |
| closeOnClickOverlay | 是否在点击遮罩层后关闭弹窗 | _boolean_ | `false` |
| lockScroll | 是否锁定背景滚动 | _boolean_ | `true` |
| allowHtml `v2.8.7` | 是否允许 message 内容中渲染 HTML | _boolean_ | `true` |
@@ -188,7 +188,7 @@ export default {
| overlay | 是否展示遮罩层 | _boolean_ | `true` |
| overlay-class `v2.2.7` | 自定义遮罩层类名 | _string_ | - |
| overlay-style `v2.2.7` | 自定义遮罩层样式 | _object_ | - |
-| close-on-popstate `v2.0.5` | 是否在页面回退时自动关闭 | _boolean_ | `false` |
+| close-on-popstate `v2.0.5` | 是否在页面回退时自动关闭 | _boolean_ | `true` |
| close-on-click-overlay | 是否在点击遮罩层后关闭弹窗 | _boolean_ | `false` |
| lazy-render | 是否在显示弹层时才渲染节点 | _boolean_ | `true` |
| lock-scroll | 是否锁定背景滚动 | _boolean_ | `true` |
diff --git a/src/dialog/index.js b/src/dialog/index.js
index 48f4f9d5a..2805cdaaf 100644
--- a/src/dialog/index.js
+++ b/src/dialog/index.js
@@ -65,7 +65,7 @@ Dialog.defaultOptions = {
confirmButtonColor: null,
showConfirmButton: true,
showCancelButton: false,
- closeOnPopstate: false,
+ closeOnPopstate: true,
closeOnClickOverlay: false,
callback: (action) => {
instance[action === 'confirm' ? 'resolve' : 'reject'](action);
diff --git a/src/dropdown-menu/README.md b/src/dropdown-menu/README.md
index d3b5526be..0805893f3 100644
--- a/src/dropdown-menu/README.md
+++ b/src/dropdown-menu/README.md
@@ -50,7 +50,11 @@ export default {
- Confirm
+
+
+ Confirm
+
+
```
@@ -112,7 +116,7 @@ Use `active-color` prop to custom active color of the title and options
| Attribute | Description | Type | Default |
| --- | --- | --- | --- |
-| active-color | Active color of title and option | _string_ | `#1989fa` |
+| active-color | Active color of title and option | _string_ | `#ee0a24` |
| direction `v2.0.1` | Expand direction, can be set to `up` | _string_ | `down` |
| z-index | z-index of menu item | _number \| string_ | `10` |
| duration | Transition duration, unit second | _number \| string_ | `0.2` |
diff --git a/src/dropdown-menu/README.zh-CN.md b/src/dropdown-menu/README.zh-CN.md
index 2336c71d6..ac1547b93 100644
--- a/src/dropdown-menu/README.zh-CN.md
+++ b/src/dropdown-menu/README.zh-CN.md
@@ -52,7 +52,11 @@ export default {
- 确认
+
+
+ 确认
+
+
```
@@ -116,7 +120,7 @@ export default {
| 参数 | 说明 | 类型 | 默认值 |
| --- | --- | --- | --- |
-| active-color | 菜单标题和选项的选中态颜色 | _string_ | `#1989fa` |
+| active-color | 菜单标题和选项的选中态颜色 | _string_ | `#ee0a24` |
| direction `v2.0.1` | 菜单展开方向，可选值为`up` | _string_ | `down` |
| z-index | 菜单栏 z-index 层级 | _number \| string_ | `10` |
| duration | 动画时长，单位秒 | _number \| string_ | `0.2` |
diff --git a/src/dropdown-menu/demo/index.vue b/src/dropdown-menu/demo/index.vue
index 18e8ef119..4eeb25073 100644
--- a/src/dropdown-menu/demo/index.vue
+++ b/src/dropdown-menu/demo/index.vue
@@ -13,9 +13,17 @@
-
- {{ t('confirm') }}
-
+
+
+ {{ t('confirm') }}
+
+
diff --git a/src/field/index.js b/src/field/index.js
index abf59cb12..8150656f3 100644
--- a/src/field/index.js
+++ b/src/field/index.js
@@ -282,7 +282,7 @@ export default createComponent({
},
resetValidation() {
- if (this.validateMessage) {
+ if (this.validateFailed) {
this.validateFailed = false;
this.validateMessage = '';
}
diff --git a/src/field/index.less b/src/field/index.less
index 305c8fe23..88712250b 100644
--- a/src/field/index.less
+++ b/src/field/index.less
@@ -123,7 +123,7 @@
}
&__left-icon {
- margin-right: 5px;
+ margin-right: @padding-base;
}
&__right-icon {
diff --git a/src/form/test/__snapshots__/methods.spec.js.snap b/src/form/test/__snapshots__/methods.spec.js.snap
deleted file mode 100644
index 6c019b6b1..000000000
--- a/src/form/test/__snapshots__/methods.spec.js.snap
+++ /dev/null
@@ -1,19 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`resetValidation method - reset one field 1`] = `
-
-`;
diff --git a/src/form/test/methods.spec.js b/src/form/test/methods.spec.js
index d00cd0679..5acb4549b 100644
--- a/src/form/test/methods.spec.js
+++ b/src/form/test/methods.spec.js
@@ -50,12 +50,12 @@ test('validate method - validate one field and passed', (done) => {
test('validate method - validate one field and failed', (done) => {
mountForm({
- template: `
-
-
-
-
-
+ template: `
+
+
+
+
+
`,
data: getSimpleRules,
mounted() {
@@ -90,7 +90,27 @@ test('resetValidation method - reset one field', (done) => {
mounted() {
this.$refs.form.validate().catch(() => {
this.$refs.form.resetValidation('A');
- expect(wrapper).toMatchSnapshot();
+ expect(wrapper.findAll('.van-field--error').length).toEqual(1);
+ this.$refs.form.resetValidation('B');
+ expect(wrapper.findAll('.van-field--error').length).toEqual(0);
+ done();
+ });
+ },
+ });
+});
+
+test('resetValidation method - reset when rule message is empty', (done) => {
+ const wrapper = mountSimpleRulesForm({
+ data() {
+ return {
+ rulesA: [{ required: true, message: '' }],
+ rulesB: [{ required: true, message: '' }],
+ };
+ },
+ mounted() {
+ this.$refs.form.validate().catch(() => {
+ this.$refs.form.resetValidation('A');
+ expect(wrapper.findAll('.van-field--error').length).toEqual(1);
done();
});
},
diff --git a/src/icon/index.less b/src/icon/index.less
index f1b78f967..803156141 100644
--- a/src/icon/index.less
+++ b/src/icon/index.less
@@ -3,6 +3,7 @@
.van-icon {
&__image {
+ display: block;
width: 1em;
height: 1em;
object-fit: contain;
diff --git a/src/image-preview/ImagePreview.js b/src/image-preview/ImagePreview.js
index 9c03d4e7c..3b56ee72e 100644
--- a/src/image-preview/ImagePreview.js
+++ b/src/image-preview/ImagePreview.js
@@ -20,6 +20,7 @@ export default createComponent({
}),
BindEventMixin(function (bind) {
bind(window, 'resize', this.resize, true);
+ bind(window, 'orientationchange', this.resize, true);
}),
],
@@ -36,22 +37,10 @@ export default createComponent({
type: Boolean,
default: true,
},
- swipeDuration: {
- type: [Number, String],
- default: 500,
- },
overlay: {
type: Boolean,
default: true,
},
- showIndex: {
- type: Boolean,
- default: true,
- },
- startPosition: {
- type: [Number, String],
- default: 0,
- },
minZoom: {
type: [Number, String],
default: 1 / 3,
@@ -60,6 +49,18 @@ export default createComponent({
type: [Number, String],
default: 3,
},
+ showIndex: {
+ type: Boolean,
+ default: true,
+ },
+ swipeDuration: {
+ type: [Number, String],
+ default: 500,
+ },
+ startPosition: {
+ type: [Number, String],
+ default: 0,
+ },
overlayClass: {
type: String,
default: bem('overlay'),
@@ -68,6 +69,10 @@ export default createComponent({
type: String,
default: 'clear',
},
+ closeOnPopstate: {
+ type: Boolean,
+ default: true,
+ },
closeIconPosition: {
type: String,
default: 'top-right',
diff --git a/src/image-preview/README.md b/src/image-preview/README.md
index 3ccfdf6a5..e46997566 100644
--- a/src/image-preview/README.md
+++ b/src/image-preview/README.md
@@ -109,7 +109,7 @@ export default {
| onClose | Triggered when close | _Function_ | - |
| onChange `v2.0.3` | Triggered when current image change | _Function_ | - |
| onScale | Triggered when current image scale | _Function_ | - |
-| closeOnPopstate | Whether to close when popstate | _boolean_ | `false` |
+| closeOnPopstate | Whether to close when popstate | _boolean_ | `true` |
| asyncClose | Whether to enable async close | _boolean_ | `false` |
| className | Custom className | _any_ | - |
| maxZoom | Max zoom | _number \| string_ | `3` |
@@ -130,7 +130,7 @@ export default {
| show-indicators | Whether to show indicators | _boolean_ | `false` |
| loop | Whether to enable loop | _boolean_ | `true` |
| async-close | Whether to enable async close | _boolean_ | `false` |
-| close-on-popstate | Whether to close when popstate | _boolean_ | `false` |
+| close-on-popstate | Whether to close when popstate | _boolean_ | `true` |
| class-name | Custom className | _any_ | - |
| max-zoom | Max zoom | _number \| string_ | `3` |
| min-zoom | Min zoom | _number \| string_ | `1/3` |
diff --git a/src/image-preview/README.zh-CN.md b/src/image-preview/README.zh-CN.md
index ed1ba9ce3..defe34bc8 100644
--- a/src/image-preview/README.zh-CN.md
+++ b/src/image-preview/README.zh-CN.md
@@ -144,7 +144,7 @@ export default {
| onChange `v2.0.3` | 切换图片时的回调函数，回调参数为当前索引 | _Function_ | - |
| onScale | 缩放图片时的回调函数，回调参数为当前索引和当前缩放值组成的对象 | _Function_ | - |
| asyncClose | 是否开启异步关闭 | _boolean_ | `false` |
-| closeOnPopstate | 是否在页面回退时自动关闭 | _boolean_ | `false` |
+| closeOnPopstate | 是否在页面回退时自动关闭 | _boolean_ | `true` |
| className | 自定义类名 | _any_ | - |
| maxZoom | 手势缩放时，最大缩放比例 | _number \| string_ | `3` |
| minZoom | 手势缩放时，最小缩放比例 | _number \| string_ | `1/3` |
@@ -166,7 +166,7 @@ export default {
| show-indicators | 是否显示轮播指示器 | _boolean_ | `false` |
| loop | 是否开启循环播放 | _boolean_ | `true` |
| async-close | 是否开启异步关闭 | _boolean_ | `false` |
-| close-on-popstate | 是否在页面回退时自动关闭 | _boolean_ | `false` |
+| close-on-popstate | 是否在页面回退时自动关闭 | _boolean_ | `true` |
| class-name | 自定义类名 | _any_ | - |
| max-zoom | 手势缩放时，最大缩放比例 | _number \| string_ | `3` |
| min-zoom | 手势缩放时，最小缩放比例 | _number \| string_ | `1/3` |
diff --git a/src/image-preview/demo/index.vue b/src/image-preview/demo/index.vue
index ec4960fdb..79a3f1742 100644
--- a/src/image-preview/demo/index.vue
+++ b/src/image-preview/demo/index.vue
@@ -88,7 +88,6 @@ export default {
swipeDuration: 300,
asyncClose: !!timer,
closeable,
- closeOnPopstate: true,
startPosition: typeof position === 'number' ? position : 0,
});
diff --git a/src/image-preview/index.js b/src/image-preview/index.js
index eae0c340b..5bc02398f 100644
--- a/src/image-preview/index.js
+++ b/src/image-preview/index.js
@@ -6,23 +6,23 @@ let instance;
const defaultConfig = {
loop: true,
- images: [],
value: true,
- minZoom: 1 / 3,
+ images: [],
maxZoom: 3,
- className: '',
+ minZoom: 1 / 3,
onClose: null,
onChange: null,
+ className: '',
showIndex: true,
closeable: false,
closeIcon: 'clear',
asyncClose: false,
+ getContainer: 'body',
startPosition: 0,
swipeDuration: 500,
showIndicators: false,
- closeOnPopstate: false,
+ closeOnPopstate: true,
closeIconPosition: 'top-right',
- getContainer: 'body',
};
const initInstance = () => {
diff --git a/src/image-preview/index.less b/src/image-preview/index.less
index 0de2d1fd8..adf1433d2 100644
--- a/src/image-preview/index.less
+++ b/src/image-preview/index.less
@@ -14,6 +14,7 @@
display: flex;
align-items: center;
justify-content: center;
+ overflow: hidden;
}
}
diff --git a/src/mixins/portal.js b/src/mixins/portal.js
new file mode 100644
index 000000000..ec3e65f26
--- /dev/null
+++ b/src/mixins/portal.js
@@ -0,0 +1,47 @@
+function getElement(selector) {
+ if (typeof selector === 'string') {
+ return document.querySelector(selector);
+ }
+
+ return selector();
+}
+
+export function PortalMixin({ ref, afterPortal } = {}) {
+ return {
+ props: {
+ getContainer: [String, Function],
+ },
+
+ watch: {
+ getContainer: 'portal',
+ },
+
+ mounted() {
+ if (this.getContainer) {
+ this.portal();
+ }
+ },
+
+ methods: {
+ portal() {
+ const { getContainer } = this;
+ const el = ref ? this.$refs[ref] : this.$el;
+
+ let container;
+ if (getContainer) {
+ container = getElement(getContainer);
+ } else if (this.$parent) {
+ container = this.$parent.$el;
+ }
+
+ if (container && container !== el.parentNode) {
+ container.appendChild(el);
+ }
+
+ if (afterPortal) {
+ afterPortal.call(this);
+ }
+ },
+ },
+ };
+}
diff --git a/src/number-keyboard/Key.js b/src/number-keyboard/Key.js
index 158aa0a57..858af2257 100644
--- a/src/number-keyboard/Key.js
+++ b/src/number-keyboard/Key.js
@@ -78,8 +78,9 @@ export default createComponent({
render() {
return (
-
+
);
},
diff --git a/src/number-keyboard/README.md b/src/number-keyboard/README.md
index 67faf36b7..ba612b0e8 100644
--- a/src/number-keyboard/README.md
+++ b/src/number-keyboard/README.md
@@ -160,6 +160,7 @@ export default {
| close-button-loading `v2.7.0` | Whether to show loading close button in custom theme | _boolean_ | `false` |
| show-delete-key `v2.5.9` | Whether to show delete button | _boolean_ | `true` |
| hide-on-click-outside | Whether to hide keyboard when click outside | _boolean_ | `true` |
+| get-container `v2.10.0` | Return the mount node for NumberKeyboard | _string \| () => Element_ | - |
| safe-area-inset-bottom | Whether to enable bottom safe area adaptation | _boolean_ | `true` |
### Events
diff --git a/src/number-keyboard/README.zh-CN.md b/src/number-keyboard/README.zh-CN.md
index 24bea797a..4228b1b9a 100644
--- a/src/number-keyboard/README.zh-CN.md
+++ b/src/number-keyboard/README.zh-CN.md
@@ -173,6 +173,7 @@ export default {
| close-button-loading `v2.7.0` | 是否将关闭按钮设置为加载中状态，仅在 `theme="custom"` 时有效 | _boolean_ | `false` |
| show-delete-key `v2.5.9` | 是否展示删除图标 | _boolean_ | `true` |
| hide-on-click-outside | 点击外部时是否收起键盘 | _boolean_ | `true` |
+| get-container `v2.10.0` | 指定挂载的节点，[用法示例](#/zh-CN/popup#zhi-ding-gua-zai-wei-zhi) | _string \| () => Element_ | - |
| safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | _boolean_ | `true` |
### Events
diff --git a/src/number-keyboard/index.js b/src/number-keyboard/index.js
index ebd1c85f8..3ea42df30 100644
--- a/src/number-keyboard/index.js
+++ b/src/number-keyboard/index.js
@@ -1,5 +1,6 @@
import { createNamespace } from '../utils';
import { stopPropagation } from '../utils/dom/event';
+import { PortalMixin } from '../mixins/portal';
import { BindEventMixin } from '../mixins/bind-event';
import Key from './Key';
@@ -7,6 +8,7 @@ const [createComponent, bem] = createNamespace('number-keyboard');
export default createComponent({
mixins: [
+ PortalMixin(),
BindEventMixin(function (bind) {
if (this.hideOnClickOutside) {
bind(document.body, 'touchstart', this.onBlur);
diff --git a/src/number-keyboard/index.less b/src/number-keyboard/index.less
index da0cb56aa..a6dcb5805 100644
--- a/src/number-keyboard/index.less
+++ b/src/number-keyboard/index.less
@@ -79,13 +79,10 @@
display: flex;
align-items: center;
justify-content: center;
- width: 100%;
height: @number-keyboard-key-height;
- padding: 0;
font-size: @number-keyboard-key-font-size;
line-height: 1.5;
background-color: @white;
- border: none;
border-radius: @border-radius-lg;
cursor: pointer;
diff --git a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap
index a420dbc39..8de8b1efe 100644
--- a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap
+++ b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap
@@ -41,45 +41,95 @@ exports[`renders demo correctly 1`] = `