Merge branch 'dev' into next

2020-10-18 20:10:42 +08:00
parent 9cd48e0e33 efc05af6f6
commit 791d9e2315
21 changed files with 145 additions and 62 deletions
@@ -60,11 +60,12 @@ export default createComponent({
    );

    return () => {
-      if (!slots.default) {
+      const { animated, swipeable, scrollspy, lazyRender } = parent.props;
+
+      if (!slots.default && !animated) {
        return;
      }

-      const { animated, swipeable, scrollspy, lazyRender } = parent.props;
      const active = isActive();
      const show = scrollspy || active;