From dd17a4075725afe4b810d8ca6ce53606833cfa33 Mon Sep 17 00:00:00 2001
From: daiwanxing <david377099119@gmail.com>
Date: Fri, 12 Jul 2024 22:18:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20tour=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE=20curren?=
 =?UTF-8?q?t=20=E6=8C=87=E5=AE=9A=E5=B1=95=E7=A4=BA=E7=9A=84=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E4=BB=A5=E5=8F=8A=20change=20=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=BE=97=E5=88=B0=E7=9A=84=E5=80=BC=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/__VUE/tour/index.taro.vue | 70 ++++++++++----------------
 1 file changed, 27 insertions(+), 43 deletions(-)

diff --git a/src/packages/__VUE/tour/index.taro.vue b/src/packages/__VUE/tour/index.taro.vue
index 4e295ad550..56835fb7cb 100644
--- a/src/packages/__VUE/tour/index.taro.vue
+++ b/src/packages/__VUE/tour/index.taro.vue
@@ -1,5 +1,5 @@
 <template>
-  <view :class="classes">
+  <view class="nut-tour">
     <view v-if="showTour" class="nut-tour-masked" @click="handleClickMask"></view>
 
     <view v-for="(step, i) in steps" :key="i" style="height: 0">
@@ -42,8 +42,7 @@
                       @click="changeStep('prev')"
                     >
                       {{ prevStepTxt }}
-                    </view
-                    >
+                    </view>
                   </slot>
                   <view
                     v-if="steps.length - 1 == active"
@@ -51,8 +50,7 @@
                     @click="close"
                   >
                     {{ completeTxt }}
-                  </view
-                  >
+                  </view>
 
                   <slot name="next-step">
                     <view
@@ -61,8 +59,7 @@
                       @click="changeStep('next')"
                     >
                       {{ nextStepTxt }}
-                    </view
-                    >
+                    </view>
                   </slot>
                 </view>
               </view>
@@ -80,7 +77,7 @@
   </view>
 </template>
 <script lang="ts">
-import { computed, watch, ref, reactive, toRefs, PropType, onMounted } from 'vue'
+import { watch, ref, reactive, toRefs, PropType, onMounted, CSSProperties } from 'vue'
 import { PopoverLocation, PopoverTheme } from '../popover/type'
 import { createComponent } from '@/packages/utils/create'
 import { rectTaro, useTaroRectById } from '@/packages/utils/useTaroRect'
@@ -179,17 +176,12 @@ export default create({
 
     let maskRect: rectTaro[] = []
 
-    let maskStyles = ref<any[]>([])
-
-    const classes = computed(() => {
-      const prefixCls = 'nut-tour'
-      return `${prefixCls}`
-    })
+    let maskStyles = ref<CSSProperties[]>([])
 
     const maskStyle = (index: number) => {
       const { offset, maskWidth, maskHeight } = props
 
-      if (!maskRect[index]) return {}
+      if (!maskRect[index]) return
       const { width, height, left, top } = maskRect[index]
 
       const center = [left + width / 2, top + height / 2] // 中心点 【横，纵】
@@ -209,31 +201,26 @@ export default create({
       const current = state.active
       let next = current
 
-      if (type == 'next') {
-        next = current + 1
-      } else {
-        next = current - 1
-      }
+      next = type == 'next' ? current + 1 : current - 1
       showPopup.value[current] = false
 
       setTimeout(() => {
-        showPopup.value[next] = true
         state.active = next
+        emit('change', state.active)
+        showPopup.value[state.active] = true
       }, 300)
-
-      emit('change', state.active)
     }
 
-    const getRootPosition = () => {
-      props.steps.forEach(async (item, i) => {
-        useTaroRectById(item.target).then(
-          (rect: any) => {
-            maskRect[i] = rect
-            maskStyle(i)
-          },
-          () => {}
-        )
-      })
+    const getRootPosition = async () => {
+      for (const [index, step] of props.steps.entries()) {
+        try {
+          const rect = await useTaroRectById(step.target)
+          maskRect[index] = rect as rectTaro
+          maskStyle(index)
+        } catch (error) {
+          console.warn(`[NutUI] Failed to get rect for step ${index}:`, error)
+        }
+      }
     }
 
     const close = () => {
@@ -248,20 +235,18 @@ export default create({
     }
 
     onMounted(() => {
-      setTimeout(() => {
-        getRootPosition()
-      }, 500)
+      getRootPosition()
     })
 
     watch(
       () => props.modelValue,
-      (val) => {
-        if (val) {
-          state.active = 0
+      (visible) => {
+        if (visible) {
+          state.active = props.type === 'step' ? Math.min(props.current, props.steps.length - 1) : 0
           getRootPosition()
         }
-        state.showTour = val
-        showPopup.value[state.active] = val
+        state.showTour = visible
+        showPopup.value[state.active] = visible
       }
     )
 
@@ -269,12 +254,11 @@ export default create({
 
     return {
       ...toRefs(state),
-      classes,
       maskStyle,
       changeStep,
-      showPopup,
       close,
       handleClickMask,
+      showPopup,
       maskStyles,
       refRandomId
     }

From 43cf731ef544212b579a6ca6789d4fa87dea1229 Mon Sep 17 00:00:00 2001
From: daiwanxing <david377099119@gmail.com>
Date: Fri, 12 Jul 2024 22:28:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20current=20?=
 =?UTF-8?q?=E7=9A=84=E8=BE=B9=E7=95=8C=E5=80=BC=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/__VUE/tour/index.taro.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/__VUE/tour/index.taro.vue b/src/packages/__VUE/tour/index.taro.vue
index 56835fb7cb..60b5629dcf 100644
--- a/src/packages/__VUE/tour/index.taro.vue
+++ b/src/packages/__VUE/tour/index.taro.vue
@@ -242,7 +242,7 @@ export default create({
       () => props.modelValue,
       (visible) => {
         if (visible) {
-          state.active = props.type === 'step' ? Math.min(props.current, props.steps.length - 1) : 0
+          state.active = props.type === 'step' ? Math.min(Math.max(0, props.current), props.steps.length - 1) : 0
           getRootPosition()
         }
         state.showTour = visible

From 5f7c046f1af0f5241b20661cf2afdc685ffeab77 Mon Sep 17 00:00:00 2001
From: daiwanxing <david377099119@gmail.com>
Date: Wed, 31 Jul 2024 21:16:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=20CSSProperties?=
 =?UTF-8?q?=20=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/__VUE/tour/index.taro.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/packages/__VUE/tour/index.taro.vue b/src/packages/__VUE/tour/index.taro.vue
index 60b5629dcf..d63e631656 100644
--- a/src/packages/__VUE/tour/index.taro.vue
+++ b/src/packages/__VUE/tour/index.taro.vue
@@ -77,7 +77,7 @@
   </view>
 </template>
 <script lang="ts">
-import { watch, ref, reactive, toRefs, PropType, onMounted, CSSProperties } from 'vue'
+import { watch, ref, reactive, toRefs, PropType, onMounted } from 'vue'
 import { PopoverLocation, PopoverTheme } from '../popover/type'
 import { createComponent } from '@/packages/utils/create'
 import { rectTaro, useTaroRectById } from '@/packages/utils/useTaroRect'
@@ -176,7 +176,7 @@ export default create({
 
     let maskRect: rectTaro[] = []
 
-    let maskStyles = ref<CSSProperties[]>([])
+    let maskStyles = ref<any[]>([])
 
     const maskStyle = (index: number) => {
       const { offset, maskWidth, maskHeight } = props