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 474273ab8..20c33ac17 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);