fix(comp:tour): async appended steps doesn't work (#1866)

IDuxFE · Mar 25, 2024 · 0c6c54d · 0c6c54d
1 parent 094f62a
commit 0c6c54d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/packages/components/tour/src/composables/useActiveStep.ts b/packages/components/tour/src/composables/useActiveStep.ts
@@ -33,12 +33,11 @@ export function useActiveStep(
 
   const getActiveStep = async (index: number) => {
     const props = mergedProps.value
-    if (!props.steps) {
+    const step = props.steps?.[index]
+    if (!step) {
       return
     }
 
-    const step = props.steps[index]
-
     if (step.beforeEnter) {
       await step.beforeEnter()
     }
@@ -117,9 +116,9 @@ export function useActiveStep(
   }
 
   watch(
-    activeIndex,
-    async current => {
-      if (current === activeStep.value?.index) {
+    [activeIndex, () => mergedProps.value.steps],
+    ([current, steps], [, preSteps]) => {
+      if (current === activeStep.value?.index && steps === preSteps) {
         return
       }
 

diff --git a/packages/components/tour/src/composables/useStepChange.ts b/packages/components/tour/src/composables/useStepChange.ts
@@ -76,7 +76,7 @@ export function useStepChange(
   watch(
     activeIndex,
     (current, pre) => {
-      if (current !== pre) {
+      if (current !== pre && visible.value) {
         transitionTmr && clearTimeout(transitionTmr)
         lock()
       }