From e9fc10c89db9fef7117b2fe7b87b8b5f6f02f435 Mon Sep 17 00:00:00 2001
From: zikai <zikai@zikai.wang>
Date: Wed, 22 Jul 2026 02:45:04 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20WEEKLY=20=E4=BA=8B=E4=BB=B6=E7=9A=84=20B?=
 =?UTF-8?q?YDAY=20=E4=B8=8E=20dtstartDate=20=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=20ICS=20=E8=BE=93=E5=87=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

applyChanges 中 BYDAY 此前取自表单下拉框(默认 'MO'), 与 dtstartDate
的星期可能不一致。expandOccurrences 按 dtstartDate 展开 occurrence,
但序列化的 RRULE 写入表单选择的 BYDAY, 两者不匹配时日历应用会显示
错误的星期。

修复: BYDAY 始终由 dtstartDate 的星期自动推导(bydayFromDate), 下拉框
改为只读展示。确保 RRULE BYDAY 与实际 occurrence 日期始终一致。
---
 src/components/EventDetail.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/EventDetail.vue b/src/components/EventDetail.vue
index 9ce48df..4a7254e 100644
--- a/src/components/EventDetail.vue
+++ b/src/components/EventDetail.vue
@@ -1,7 +1,8 @@
 <script setup>
 import { ref, watch } from 'vue'
 import { useCalendar } from '../composables/useCalendar.js'
-import { DOW, DOW_EN } from '../lib/weekday.js'
+import { DOW, DOW_EN, bydayFromDate } from '../lib/weekday.js'
+import { toDate } from '../lib/date.js'
 import OccurrenceGrid from './OccurrenceGrid.vue'
 
 const { selectedEvent, updateEvent, deleteEvent, splitEvent, toggleOccurrence } = useCalendar()
@@ -40,10 +41,16 @@ function applyChanges() {
     dtendTime: form.value.dtend_time,
   }
   if (form.value.is_recurring) {
+    // BYDAY 必须与 dtstartDate 的星期一致, 否则 ICS 输出的 RRULE BYDAY
+    // 与 expandOccurrences 按 dtstartDate 展开的网格不匹配, 导致日历应用
+    // 显示的日期与应用内网格不一致。
+    const byday = form.value.freq === 'WEEKLY'
+      ? bydayFromDate(toDate(ev.dtstartDate))
+      : null
     patch.rrule = {
       freq: form.value.freq,
       interval: Number(form.value.interval) || 1,
-      byday: form.value.freq === 'WEEKLY' ? form.value.byday : null,
+      byday,
       untilDate: form.value.until_date || ev.rrule?.untilDate || '',
     }
   } else {
@@ -139,8 +146,8 @@ function onToggleOcc(date) {
           <input type="date" v-model="form.until_date" />
         </div>
         <div class="form-group" v-if="form.freq === 'WEEKLY'">
-          <label>星期 (BYDAY)</label>
-          <select v-model="form.byday">
+          <label>星期 (BYDAY, 由开始日期自动确定)</label>
+          <select v-model="form.byday" disabled>
             <option v-for="(d, i) in DOW_EN" :key="d" :value="d">
               {{ DOW[i] }}
             </option>