Merge branch 'dev' into next

2020-07-25 15:50:49 +08:00
parent 5879abbaf9 5c5761fc86
commit 73d538be05
109 changed files with 1699 additions and 744 deletions
@@ -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);