Merge branch 'dev' into next

2020-08-07 06:33:04 +08:00
parent 49206598fc db94fa3193
commit 17c64b24e7
84 changed files with 898 additions and 345 deletions
@@ -87,6 +87,10 @@ export function PopupMixin(options = {}) {
    beforeDestroy() {
      this.removeLock();

+      if (this.opened) {
+        this.removeLock();
+      }
+
      if (this.getContainer) {
        removeNode(this.$refs.root);
      }