diff --git a/breaking-changes.md b/breaking-changes.md index a5d59d872..e2350b66d 100644 --- a/breaking-changes.md +++ b/breaking-changes.md @@ -7,6 +7,7 @@ - Tabs: `v-model` 重命名为 `v-model:active` - Popup: `v-model` 重命名为 `v-model:show` - Circle: `v-model` 重命名为 `v-model:currentRate` +- Dialog: `v-model` 重命名为 `v-model:show` - ShareSheet: `v-model` 重命名为 `v-model:show` - ActionSheet: `v-model` 重命名为 `v-model:show` - List: `v-model` 重命名为 `v-model:loading`,`error.sync` 重命名为 `v-model:error` diff --git a/components.js b/components.js index 5169725a9..caa3f4ba0 100644 --- a/components.js +++ b/components.js @@ -44,4 +44,5 @@ module.exports = [ 'tabs', 'sticky', 'picker', + 'dialog', ]; diff --git a/src/dialog/Dialog.js b/src/dialog/Dialog.js index 815dad25c..85e84a27a 100644 --- a/src/dialog/Dialog.js +++ b/src/dialog/Dialog.js @@ -1,19 +1,19 @@ import { createNamespace, addUnit } from '../utils'; import { BORDER_TOP, BORDER_LEFT } from '../utils/constant'; -import { PopupMixin } from '../mixins/popup'; +import Popup from '../popup'; import Button from '../button'; const [createComponent, bem, t] = createNamespace('dialog'); export default createComponent({ - mixins: [PopupMixin()], - props: { + show: Boolean, title: String, width: [Number, String], message: String, className: null, callback: Function, + lazyRender: Boolean, beforeClose: Function, messageAlign: String, cancelButtonText: String, @@ -65,7 +65,7 @@ export default createComponent({ this.$emit(action); // show not trigger close event when hidden - if (!this.value) { + if (!this.show) { return; } @@ -85,7 +85,7 @@ export default createComponent({ }, onClose(action) { - this.close(); + this.$emit('update:show', false); if (this.callback) { this.callback(action); @@ -133,9 +133,9 @@ export default createComponent({ ); }, - genContent(hasTitle, messageSlot) { - if (messageSlot) { - return