🐛 fix(表现): go

回退错误

Author: hezhongfeng

dist/vue-page-stack.cjs.js

@@ -1,4 +1,4 @@
-import { defineComponent as R, getCurrentInstance as U, queuePostFlushCb as S, onMounted as D, onUpdated as H, onBeforeUnmount as w, isVNode as K, cloneVNode as y, callWithAsyncErrorHandling as v, ErrorCodes as x, setTransitionHooks as j } from "vue";
+import { defineComponent as R, getCurrentInstance as U, queuePostFlushCb as g, onMounted as w, onUpdated as D, onBeforeUnmount as H, isVNode as K, cloneVNode as y, callWithAsyncErrorHandling as v, ErrorCodes as x, setTransitionHooks as j } from "vue";
 const i = {
   componentName: "VuePageStack",
   pushName: "push",
@@ -55,7 +55,7 @@ const L = (e) => e.__isSuspense, V = {
 function m(e) {
   e.shapeFlag &= ~f.COMPONENT_SHOULD_KEEP_ALIVE, e.shapeFlag &= ~f.COMPONENT_KEPT_ALIVE;
 }
-function d(e) {
+function h(e) {
   return e.shapeFlag & f.SUSPENSE ? e.ssContent : e;
 }
 const o = [], q = R({
@@ -65,65 +65,65 @@ const o = [], q = R({
   setup(e, { slots: s, emit: r }) {
     const l = U(), E = l.ctx, u = l.suspense, {
       renderer: {
-        p,
-        m: h,
+        p: N,
+        m: T,
         um: A,
         o: { createElement: M }
       }
     } = E, I = M("div");
-    E.activate = (n, t, a, O, T) => {
-      const N = n.component;
-      h(n, t, a, V.ENTER, u), p(N.vnode, n, t, a, N, u, O, n.slotScopeIds, T), S(() => {
-        N.isDeactivated = !1, N.a && k(N.a);
-        const P = n.props && n.props.onVnodeMounted;
-        P && b(P, N.parent, n);
+    E.activate = (n, a, t, O, d) => {
+      const p = n.component;
+      T(n, a, t, V.ENTER, u), N(p.vnode, n, a, t, p, u, O, n.slotScopeIds, d), g(() => {
+        p.isDeactivated = !1, p.a && k(p.a);
+        const S = n.props && n.props.onVnodeMounted;
+        S && b(S, p.parent, n);
       }, u);
     }, E.deactivate = (n) => {
-      const t = n.component;
-      h(n, I, null, V.LEAVE, u), S(() => {
-        t.da && k(t.da);
-        const a = n.props && n.props.onVnodeUnmounted;
-        a && b(a, t.parent, n), t.isDeactivated = !0;
+      const a = n.component;
+      T(n, I, null, V.LEAVE, u), g(() => {
+        a.da && k(a.da);
+        const t = n.props && n.props.onVnodeUnmounted;
+        t && b(t, a.parent, n), a.isDeactivated = !0;
       }, u);
     };
     function F(n) {
       m(n), A(n, l, u, !0);
     }
     let _ = !1, C = !1;
-    const g = () => {
-      _ && (C ? o[o.length - 1] = d(l.subTree) : c.action != i.replaceName ? o.push(d(l.subTree)) : o[o.length - 1] = d(l.subTree));
+    const P = () => {
+      _ && (C ? o[o.length - 1] = h(l.subTree) : c.action != i.replaceName ? o.push(h(l.subTree)) : o[o.length - 1] = h(l.subTree));
     };
-    return D(g), H(g), w(() => {
+    return w(P), D(P), H(() => {
       for (const n of o)
         F(n);
     }), () => {
       if (_ = !1, C = !1, !s.default)
         return null;
-      const n = s.default(), t = n[0];
+      const n = s.default(), a = n[0];
       if (n.length > 1)
         return n;
-      if (!K(t) || !(t.shapeFlag & f.STATEFUL_COMPONENT) && !(t.shapeFlag & f.SUSPENSE))
-        return t;
-      let a = d(t);
-      if (a.el && (a = y(a), t.shapeFlag & f.SUSPENSE && (t.ssContent = a)), _ = !0, c.action === i.backName) {
+      if (!K(a) || !(a.shapeFlag & f.STATEFUL_COMPONENT) && !(a.shapeFlag & f.SUSPENSE))
+        return a;
+      let t = h(a);
+      if (t.el && (t = y(t), a.shapeFlag & f.SUSPENSE && (a.ssContent = t)), _ = !0, c.action === i.backName) {
         r("back");
-        const O = -c.n, T = o[o.length - O - 1];
-        if (!T || T.key != t.key)
-          return m(o[o.length - O]), o[o.length - O] = null, o.splice(o.length - O), a.shapeFlag |= f.COMPONENT_SHOULD_KEEP_ALIVE, L(t.type) ? t : a;
-        a.el = T.el, a.component = T.component, a.transition && j(a, a.transition), a.shapeFlag |= f.COMPONENT_KEPT_ALIVE;
-        for (let N = o.length - O; N < o.length; N++)
-          m(o[N]), o[N] = null;
+        const O = -c.n, d = o[o.length - O - 1];
+        if (!d || d.key != a.key)
+          return m(o[o.length - O]), o[o.length - O] = null, o.splice(o.length - O), t.shapeFlag |= f.COMPONENT_SHOULD_KEEP_ALIVE, L(a.type) ? a : t;
+        t.el = d.el, t.component = d.component, t.transition && j(t, t.transition), t.shapeFlag |= f.COMPONENT_KEPT_ALIVE;
+        for (let p = o.length - O; p < o.length; p++)
+          m(o[p]), o[p] = null;
         o.splice(o.length - O), C = !0;
       } else
         r("forward");
-      return a.shapeFlag |= f.COMPONENT_SHOULD_KEEP_ALIVE, L(t.type) ? t : a;
+      return t.shapeFlag |= f.COMPONENT_SHOULD_KEEP_ALIVE, L(a.type) ? a : t;
     };
   }
 }), z = (e) => {
   const s = e.push.bind(e), r = e.go.bind(e), l = e.replace.bind(e), E = e.back.bind(e), u = e.forward.bind(e);
-  e.push = (p) => (c.action = i.pushName, s(p)), e.go = (p) => {
-    c.action = i.goName, p < 0 && (c.action = i.backName, c.n = p), r(p);
-  }, e.replace = (p) => (c.action = i.replaceName, l(p)), e.back = () => {
+  e.push = (N) => (c.action = i.pushName, s(N)), e.go = (N) => {
+    N > 0 && (c.action = i.forwardName), N < 0 && (c.action = i.backName), c.n = N, r(N);
+  }, e.replace = (N) => (c.action = i.replaceName, l(N)), e.back = () => {
     c.action = i.backName, c.n = -1, E();
   }, e.forward = () => {
     c.action = i.forwardName, u();
@@ -137,16 +137,16 @@ const o = [], q = R({
     if (!s)
       throw Error("router is required");
     let E = null;
-    s.options.history.listen((u, p, h) => {
-      E = h;
+    s.options.history.listen((u, N, T) => {
+      E = T;
     }), s.beforeEach(() => {
-      E && (E.direction === "back" && r ? r() : E.direction === "forward" && l && l(), E = null);
+      E && (E.direction === "back" && r ? r(E.delta) : E.direction === "forward" && l && l(E.delta), E = null);
     });
   }
-}, X = () => {
-  c.n = -1, c.action = i.backName;
-}, Y = () => {
-  c.action = i.forwardName;
+}, X = (e) => {
+  c.n = e, c.action = i.backName;
+}, Y = (e) => {
+  c.n = e, c.action = i.forwardName;
 }, W = {
   install(e, { router: s }) {
     if (!s)