Merge branch '2.x' into dev

2020-11-21 18:47:31 +08:00
parent de10a2a956 5605b0aa57
commit f34d828f25
59 changed files with 277 additions and 264 deletions
@@ -63,7 +63,7 @@ export const popupSharedProps = {
    type: Boolean,
    default: true,
  },
-  // whether to close popup when click overlay
+  // whether to close popup when overlay is clicked
  closeOnClickOverlay: {
    type: Boolean,
    default: true,