From fe8fc9eb80cb43ae43063012f355ecae4c52a8c1 Mon Sep 17 00:00:00 2001
From: Eiinu <eiinu@qq.com>
Date: Wed, 10 Jan 2024 18:11:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(calendar):=20=E4=BF=AE=E5=A4=8D=E5=88=9D?=
 =?UTF-8?q?=E6=AC=A1=E6=89=93=E5=BC=80=E9=BB=98=E8=AE=A4=E5=80=BC=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E9=97=AE=E9=A2=98=20(#2829)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/__VUE/calendar/index.taro.vue | 32 ++++++++++++++++++----
 src/packages/__VUE/calendar/index.vue      | 19 +++++++++++--
 src/packages/__VUE/calendaritem/index.vue  |  6 ++--
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/packages/__VUE/calendar/index.taro.vue b/src/packages/__VUE/calendar/index.taro.vue
index 8ea0b4da10..3b17e72739 100644
--- a/src/packages/__VUE/calendar/index.taro.vue
+++ b/src/packages/__VUE/calendar/index.taro.vue
@@ -1,7 +1,7 @@
 <template>
   <nut-popup
     v-if="poppable"
-    :visible="visible"
+    v-model:visible="visible"
     position="bottom"
     round
     closeable
@@ -9,8 +9,8 @@
     :style="{ height: '85vh' }"
     :lock-scroll="lockScroll"
     :catch-move="lockScroll"
-    @click-overlay="closePopup"
-    @click-close-icon="closePopup"
+    :destroy-on-close="false"
+    @opened="opened"
   >
     <nut-calendar-item
       ref="calendarRef"
@@ -90,7 +90,7 @@
   </nut-calendar-item>
 </template>
 <script lang="ts">
-import { ref, computed } from 'vue';
+import { ref, computed, PropType } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 const { create } = createComponent('calendar');
 import NutCalendarItem from '../calendaritem/index.taro.vue';
@@ -153,7 +153,7 @@ export default create({
       default: ''
     },
     defaultValue: {
-      type: [String, Array]
+      type: [String, Array] as PropType<string | string[]>
     },
     startDate: {
       type: String,
@@ -176,6 +176,14 @@ export default create({
   },
   emits: ['choose', 'close', 'update:visible', 'select'],
   setup(props, { emit, slots, expose }) {
+    const visible = computed({
+      get() {
+        return props.visible;
+      },
+      set(val) {
+        emit('update:visible', val);
+      }
+    });
     const showTopBtn = computed(() => {
       return slots.btn;
     });
@@ -226,8 +234,22 @@ export default create({
       emit('select', param);
     };
 
+    const opened = () => {
+      if (props.defaultValue) {
+        if (Array.isArray(props.defaultValue)) {
+          if (props.defaultValue?.length) {
+            calendarRef.value?.scrollToDate(props.defaultValue?.[0]);
+          }
+        } else {
+          calendarRef.value?.scrollToDate(props.defaultValue);
+        }
+      }
+    };
+
     return {
+      visible,
       closePopup,
+      opened,
       update,
       close,
       select,
diff --git a/src/packages/__VUE/calendar/index.vue b/src/packages/__VUE/calendar/index.vue
index 1d189f9d86..6a72149ca8 100644
--- a/src/packages/__VUE/calendar/index.vue
+++ b/src/packages/__VUE/calendar/index.vue
@@ -1,15 +1,14 @@
 <template>
   <nut-popup
     v-if="poppable"
-    :visible="visible"
+    v-model:visible="visible"
     position="bottom"
     round
     closeable
     v-bind="$attrs"
     :style="{ height: '85vh' }"
     :lock-scroll="lockScroll"
-    @click-overlay="closePopup"
-    @click-close-icon="closePopup"
+    @opened="opened"
   >
     <nut-calendar-item
       ref="calendarRef"
@@ -176,6 +175,14 @@ export default create({
   },
   emits: ['choose', 'close', 'update:visible', 'select'],
   setup(props, { emit, slots, expose }) {
+    const visible = computed({
+      get() {
+        return props.visible;
+      },
+      set(val) {
+        emit('update:visible', val);
+      }
+    });
     const showTopBtn = computed(() => {
       return slots.btn;
     });
@@ -226,8 +233,14 @@ export default create({
       emit('select', param);
     };
 
+    const opened = () => {
+      calendarRef.value?.initPosition();
+    };
+
     return {
+      visible,
       closePopup,
+      opened,
       update,
       close,
       select,
diff --git a/src/packages/__VUE/calendaritem/index.vue b/src/packages/__VUE/calendaritem/index.vue
index 83d5146acd..26bd3b5968 100644
--- a/src/packages/__VUE/calendaritem/index.vue
+++ b/src/packages/__VUE/calendaritem/index.vue
@@ -75,7 +75,7 @@
   </view>
 </template>
 <script lang="ts">
-import { reactive, ref, watch, toRefs, computed } from 'vue';
+import { reactive, ref, watch, toRefs, computed, onMounted } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import Utils from '@/packages/utils/date';
 import requestAniFrame from '@/packages/utils/raf';
@@ -810,7 +810,9 @@ export default create({
     };
 
     // 初始化数据
-    initData();
+    onMounted(() => {
+      initData();
+    });
 
     //监听 默认值更改
     watch(