From c25654d15381567a4b35e6aaaf8cd8991e9ddde0 Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 3 Dec 2018 16:36:01 +0800 Subject: [PATCH] [bugfix] Dialog: default options (#999) --- packages/dialog/dialog.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/dialog/dialog.ts b/packages/dialog/dialog.ts index 0a3423c7..997e141d 100644 --- a/packages/dialog/dialog.ts +++ b/packages/dialog/dialog.ts @@ -38,6 +38,11 @@ function getContext() { } const Dialog: Dialog = options => { + options = { + ...Dialog.currentOptions, + ...options + }; + return new Promise((resolve, reject) => { const context = options.context || getContext(); const dialog = context.selectComponent(options.selector); @@ -73,15 +78,10 @@ Dialog.defaultOptions = { transition: true }; -Dialog.alert = options => - Dialog({ - ...Dialog.currentOptions, - ...options - }); +Dialog.alert = Dialog; Dialog.confirm = options => Dialog({ - ...Dialog.currentOptions, showCancelButton: true, ...options });