diff --git a/frontend/src/CalendarIntegration.test.ts b/frontend/src/CalendarIntegration.test.ts index d6a2bf3..1f42306 100644 --- a/frontend/src/CalendarIntegration.test.ts +++ b/frontend/src/CalendarIntegration.test.ts @@ -7,4 +7,5 @@ describe('calendar shell integration',()=>{ it('places desktop event detail in the shell right pane while retaining the mobile sheet',()=>{const panel=readFileSync('src/CalendarPanel.vue','utf8');expect(app).toContain("'detail-open': Boolean(selectedTask) || habitDetailOpen || calendarDetailOpen");expect(app).toContain(':compact-layout="compactLayout" @detail="calendarDetailOpen=$event"');expect(app).toContain("selectedTask || habitDetailOpen || calendarDetailOpen");expect(app).toContain('watch([selectedTask, habitDetailOpen, calendarDetailOpen, sidebarCollapsed], reconcileDesktopPaneWidths)');expect(panel).toContain('defineProps<{ compactLayout: boolean }>()');expect(panel).toContain(':modal="compactLayout"');expect(panel).toContain('inline-target=".shell"');expect(panel).toContain("watch(selected,event=>emit('detail',Boolean(event)))");expect(panel).toContain("watch(()=>props.compactLayout,()=>{selected.value=null},{flush:'sync'})");expect(panel).not.toContain("onBeforeUnmount(()=>emit('detail',false))");expect(css).toContain('@media(min-width:931px){.calendar-view{padding-top:4px}.calendar-event-detail')}) it('keeps five 44px mobile targets across required breakpoints',()=>{const shellCss=readFileSync('src/style.css','utf8');expect(shellCss).toContain('grid-template-columns:repeat(5,minmax(0,1fr))');expect(css).toContain('min-height:44px');expect(css).toContain('@media(max-width:720px)');expect(css).toContain('@media(min-width:931px)');expect(css).toContain('@media(min-width:1440px)')}) it('uses the shell page title once and contains the horizontal source scroller',()=>{const panel=readFileSync('src/CalendarPanel.vue','utf8');expect(panel).not.toContain('

日历订阅

');expect(css).toContain('.calendar-view{min-width:0;');expect(css).toContain('.calendar-filters{min-width:0;max-width:100%;')}) + it('uses the approved minimal reading layout for event details',()=>{const panel=readFileSync('src/CalendarPanel.vue','utf8');expect(panel).toContain('class="calendar-event-detail__meta"');expect(panel).toContain('class="calendar-event-detail__content"');expect(panel).not.toContain('
时间
');expect(css).toContain('.calendar-event-detail__meta{');expect(css).toContain('.calendar-event-detail__content{')}) }) diff --git a/frontend/src/CalendarPanel.test.ts b/frontend/src/CalendarPanel.test.ts index 8a233d5..8a6449a 100644 --- a/frontend/src/CalendarPanel.test.ts +++ b/frontend/src/CalendarPanel.test.ts @@ -62,6 +62,10 @@ describe('CalendarPanel',()=>{ expect(host.textContent).toContain('发布会');expect(host.textContent).toContain('工作') host.querySelector('[data-event-id="e1"]')!.click();await nextTick() expect(document.querySelector('.calendar-event-detail')?.textContent).toContain('产品发布') + expect(document.querySelector('.calendar-event-detail__meta')?.textContent).toContain('9月22日周二') + expect(document.querySelector('.calendar-event-detail__meta')?.textContent).toContain('工作') + expect(document.querySelector('.calendar-event-detail__content')?.textContent).toContain('产品发布') + expect(document.querySelector('.calendar-event-detail dl')).toBeNull() host.querySelector('input[aria-label="筛选工作"]')!.click();await nextTick() expect(host.querySelector('[data-event-id="e1"]')).toBeNull() vi.useRealTimers() diff --git a/frontend/src/CalendarPanel.vue b/frontend/src/CalendarPanel.vue index 45bc874..762e3af 100644 --- a/frontend/src/CalendarPanel.vue +++ b/frontend/src/CalendarPanel.vue @@ -69,7 +69,7 @@ onMounted(()=>void load())

{{selectedDayLabel}} · {{visibleEvents.length}} 个日程

这一天还没有日程{{subscriptions.length?'可以选择本周其他日期或检查来源筛选':'先添加一个 iCal 日历订阅'}}
- +

日历源

{{source.name}}{{source.url}}{{source.last_error}}

{{editing?'编辑订阅':'添加订阅'}}

diff --git a/frontend/src/calendar.css b/frontend/src/calendar.css index 01df0aa..d71b00d 100644 --- a/frontend/src/calendar.css +++ b/frontend/src/calendar.css @@ -1 +1 @@ -.calendar-view{min-width:0;width:min(100%,900px);margin:0 auto;padding-bottom:42px;display:grid;gap:16px}.calendar-heading{display:flex;align-items:center;justify-content:space-between;gap:16px}.calendar-heading p{margin:0;color:var(--muted);font-size:13px}.calendar-manage{min-height:44px}.calendar-toolbar{min-height:48px;display:grid;grid-template-columns:44px 64px minmax(0,1fr) 44px;align-items:center;border-block:1px solid #e8e0d5}.calendar-toolbar button{width:44px;height:44px;display:grid;place-items:center;border:0;background:transparent;border-radius:10px}.calendar-toolbar .calendar-today{width:64px}.calendar-toolbar strong{text-align:center;font-size:16px}.calendar-week-strip{display:grid;grid-template-columns:repeat(7,minmax(0,1fr));gap:8px;padding:10px;border:1px solid var(--border-cream);border-radius:16px;background:var(--surface-raised);box-shadow:inset 0 1px rgba(255,255,255,.9)}.calendar-week-day{position:relative;min-width:0;min-height:76px;display:grid;place-items:center;align-content:center;gap:4px;border:0;border-radius:12px;background:transparent}.calendar-week-day small{color:var(--muted);font-size:11px}.calendar-week-day b{font-size:18px}.calendar-week-day i{position:absolute;right:7px;top:7px;min-width:18px;height:18px;display:grid;place-items:center;border-radius:999px;background:#f5dfcc;color:#8d4929;font-size:10px;font-style:normal}.calendar-week-day.is-selected{background:var(--accent);color:#fff;box-shadow:0 8px 18px rgba(241,90,41,.22)}.calendar-week-day.is-selected small{color:#fff5ef}.calendar-week-day.is-selected i{background:#fff3e9;color:var(--accent)}.calendar-week-day.is-today:not(.is-selected){box-shadow:inset 0 0 0 1px #edc5ab}.calendar-filters{min-width:0;max-width:100%;display:flex;gap:8px;overflow-x:auto;overflow-y:hidden;contain:layout paint;padding-bottom:2px;overscroll-behavior-inline:contain}.calendar-filters label{min-height:44px;display:flex;align-items:center;gap:7px;padding:0 12px;border:1px solid var(--border-cream);border-radius:999px;background:var(--surface-raised);font-size:12px;white-space:nowrap}.calendar-filters input{position:absolute;opacity:0;pointer-events:none}.calendar-filters label:has(input:not(:checked)){opacity:.48}.calendar-filters i,.calendar-event-row>i,.calendar-event-detail dd i,.calendar-source-copy i{width:9px;height:9px;display:inline-block;flex:0 0 auto;border-radius:50%}.calendar-agenda{display:grid;gap:20px}.calendar-agenda section{display:grid}.calendar-agenda h2{min-height:40px;margin:0;display:flex;align-items:center;border-bottom:1px solid #e8e0d5;font-size:13px}.calendar-event-row{min-height:62px;display:grid;grid-template-columns:10px 54px minmax(0,1fr) 24px;align-items:center;gap:10px;padding:0 4px;border:0;border-bottom:1px solid #e8e0d5;background:transparent;text-align:left}.calendar-event-row:hover{background:#fff8ee}.calendar-event-row time{color:var(--muted);font-size:12px}.calendar-event-row span{min-width:0;display:grid;gap:4px}.calendar-event-row b,.calendar-event-row small{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.calendar-event-row b{font-size:14px;font-weight:620}.calendar-event-row small{color:var(--muted);font-size:11px}.calendar-event-row>svg{color:#aa9f92}.calendar-empty{min-height:260px;display:grid;place-items:center;align-content:center;gap:9px;color:var(--muted);text-align:center}.calendar-empty svg{width:32px;height:32px}.calendar-empty b{color:var(--text-primary)}.calendar-event-detail,.calendar-sources-sheet{width:min(520px,100%);max-height:min(88dvh,760px)}.calendar-event-detail dl{margin:0}.calendar-event-detail dl>div{min-height:52px;display:grid;grid-template-columns:72px minmax(0,1fr);align-items:center;border-bottom:1px solid #e8e0d5}.calendar-event-detail dt{color:var(--muted);font-size:11px}.calendar-event-detail dd{margin:0;display:flex;align-items:center;gap:7px;font-size:13px}.calendar-event-detail h4{margin:2px 0 8px;font-size:13px}.calendar-event-detail p{margin:0;white-space:pre-wrap;line-height:1.6;font-size:13px}.calendar-source-add{justify-self:start}.calendar-source-list{display:grid}.calendar-source-list article{min-height:72px;display:grid;grid-template-columns:minmax(0,1fr) auto 44px 44px 44px;align-items:center;gap:4px;border-bottom:1px solid #e8e0d5}.calendar-source-copy{min-width:0;display:grid;gap:3px}.calendar-source-copy b{display:flex;align-items:center;gap:7px;font-size:13px}.calendar-source-copy small{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--muted);font-size:10px}.calendar-source-copy .calendar-source-error{color:var(--danger);white-space:normal}.calendar-source-list article>button{width:44px;height:44px;display:grid;place-items:center;border:0;background:transparent;border-radius:9px}.calendar-source-toggle{min-height:44px;display:flex;align-items:center;gap:5px;font-size:11px}.calendar-subscription-form{width:min(460px,100%)}.calendar-subscription-form .app-sheet__body label{display:grid;gap:6px;color:#756d61;font-size:12px;font-weight:650}.calendar-subscription-form input{min-height:44px;width:100%;padding:8px 11px;border:1px solid var(--border-cream)}.calendar-subscription-form input[type=color]{padding:5px;width:72px}.calendar-subscription-form .calendar-form-toggle{display:flex;align-items:center;min-height:44px}.calendar-subscription-form .calendar-form-toggle input{width:18px;min-height:18px}.calendar-view.loading{opacity:.72}@media(max-width:930px){.calendar-view{width:min(100%,630px)}.calendar-event-detail,.calendar-sources-sheet,.calendar-subscription-form{width:100%;max-width:100%;border-radius:20px 20px 0 0!important}}@media(max-width:720px){.calendar-view{width:100%;gap:13px}.calendar-heading .calendar-manage{font-size:0;padding:0;width:44px}.calendar-heading .calendar-manage svg{width:19px;height:19px}.calendar-toolbar{grid-template-columns:44px 54px minmax(0,1fr) 44px}.calendar-toolbar .calendar-today{width:54px}.calendar-week-strip{gap:3px;padding:7px}.calendar-week-day{min-height:64px}.calendar-week-day i{right:4px;top:4px;min-width:16px;height:16px}.calendar-source-list article{grid-template-columns:minmax(0,1fr) 44px 44px 44px}.calendar-source-toggle{grid-column:1/-1;grid-row:2}.calendar-event-row{grid-template-columns:9px 48px minmax(0,1fr) 20px}.calendar-filters{width:100%;margin-inline:-4px;padding-inline:4px}}@media(max-width:390px){.calendar-week-strip{display:flex;overflow-x:auto;scroll-snap-type:x proximity}.calendar-week-day{flex:0 0 44px;scroll-snap-align:start}.calendar-event-row{gap:7px}.calendar-source-list article{gap:1px}}@media(min-width:931px){.calendar-view{padding-top:4px}.calendar-event-detail{grid-column:3;grid-row:1;width:var(--detail-width,350px);height:100vh;max-height:none;padding:0;border-radius:0;border-top:0;border-right:0;border-bottom:0;box-shadow:inset 1px 0 0 #fff;overflow:hidden;display:flex;flex-direction:column}.calendar-event-detail .app-sheet__body{flex:1 1 auto;overflow-y:auto}.calendar-sources-sheet{border-radius:var(--radius-panel)}}@media(min-width:1440px){.calendar-view{width:min(100%,1040px)}} +.calendar-view{min-width:0;width:min(100%,900px);margin:0 auto;padding-bottom:42px;display:grid;gap:16px}.calendar-heading{display:flex;align-items:center;justify-content:space-between;gap:16px}.calendar-heading p{margin:0;color:var(--muted);font-size:13px}.calendar-manage{min-height:44px}.calendar-toolbar{min-height:48px;display:grid;grid-template-columns:44px 64px minmax(0,1fr) 44px;align-items:center;border-block:1px solid #e8e0d5}.calendar-toolbar button{width:44px;height:44px;display:grid;place-items:center;border:0;background:transparent;border-radius:10px}.calendar-toolbar .calendar-today{width:64px}.calendar-toolbar strong{text-align:center;font-size:16px}.calendar-week-strip{display:grid;grid-template-columns:repeat(7,minmax(0,1fr));gap:8px;padding:10px;border:1px solid var(--border-cream);border-radius:16px;background:var(--surface-raised);box-shadow:inset 0 1px rgba(255,255,255,.9)}.calendar-week-day{position:relative;min-width:0;min-height:76px;display:grid;place-items:center;align-content:center;gap:4px;border:0;border-radius:12px;background:transparent}.calendar-week-day small{color:var(--muted);font-size:11px}.calendar-week-day b{font-size:18px}.calendar-week-day i{position:absolute;right:7px;top:7px;min-width:18px;height:18px;display:grid;place-items:center;border-radius:999px;background:#f5dfcc;color:#8d4929;font-size:10px;font-style:normal}.calendar-week-day.is-selected{background:var(--accent);color:#fff;box-shadow:0 8px 18px rgba(241,90,41,.22)}.calendar-week-day.is-selected small{color:#fff5ef}.calendar-week-day.is-selected i{background:#fff3e9;color:var(--accent)}.calendar-week-day.is-today:not(.is-selected){box-shadow:inset 0 0 0 1px #edc5ab}.calendar-filters{min-width:0;max-width:100%;display:flex;gap:8px;overflow-x:auto;overflow-y:hidden;contain:layout paint;padding-bottom:2px;overscroll-behavior-inline:contain}.calendar-filters label{min-height:44px;display:flex;align-items:center;gap:7px;padding:0 12px;border:1px solid var(--border-cream);border-radius:999px;background:var(--surface-raised);font-size:12px;white-space:nowrap}.calendar-filters input{position:absolute;opacity:0;pointer-events:none}.calendar-filters label:has(input:not(:checked)){opacity:.48}.calendar-filters i,.calendar-event-row>i,.calendar-event-detail dd i,.calendar-source-copy i{width:9px;height:9px;display:inline-block;flex:0 0 auto;border-radius:50%}.calendar-agenda{display:grid;gap:20px}.calendar-agenda section{display:grid}.calendar-agenda h2{min-height:40px;margin:0;display:flex;align-items:center;border-bottom:1px solid #e8e0d5;font-size:13px}.calendar-event-row{min-height:62px;display:grid;grid-template-columns:10px 54px minmax(0,1fr) 24px;align-items:center;gap:10px;padding:0 4px;border:0;border-bottom:1px solid #e8e0d5;background:transparent;text-align:left}.calendar-event-row:hover{background:#fff8ee}.calendar-event-row time{color:var(--muted);font-size:12px}.calendar-event-row span{min-width:0;display:grid;gap:4px}.calendar-event-row b,.calendar-event-row small{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.calendar-event-row b{font-size:14px;font-weight:620}.calendar-event-row small{color:var(--muted);font-size:11px}.calendar-event-row>svg{color:#aa9f92}.calendar-empty{min-height:260px;display:grid;place-items:center;align-content:center;gap:9px;color:var(--muted);text-align:center}.calendar-empty svg{width:32px;height:32px}.calendar-empty b{color:var(--text-primary)}.calendar-event-detail,.calendar-sources-sheet{width:min(520px,100%);max-height:min(88dvh,760px)}.calendar-event-detail .app-sheet__header{padding:24px 24px 18px;align-items:flex-start;border-bottom:0}.calendar-event-detail .app-sheet__header h3{max-width:calc(100% - 48px);font-size:22px;font-weight:720;line-height:1.38;letter-spacing:-.02em}.calendar-event-detail .app-sheet__body{padding:0 24px 32px}.calendar-event-detail__meta{display:flex;flex-wrap:wrap;gap:8px 14px;padding:0 0 20px;border-bottom:1px solid #e8e0d5;color:var(--muted);font-size:12px;line-height:1.45}.calendar-event-detail__meta span{display:inline-flex;align-items:center;gap:7px;min-width:0}.calendar-event-detail__meta i{width:8px;height:8px;display:inline-block;flex:0 0 auto;border-radius:50%}.calendar-event-detail__content{padding-top:22px}.calendar-event-detail__content p{margin:0;white-space:pre-wrap;overflow-wrap:anywhere;color:var(--text);font-size:14px;line-height:1.9}.calendar-event-detail__empty{margin:0;padding-top:22px;color:var(--muted);font-size:13px}.calendar-source-add{justify-self:start}.calendar-source-list{display:grid}.calendar-source-list article{min-height:72px;display:grid;grid-template-columns:minmax(0,1fr) auto 44px 44px 44px;align-items:center;gap:4px;border-bottom:1px solid #e8e0d5}.calendar-source-copy{min-width:0;display:grid;gap:3px}.calendar-source-copy b{display:flex;align-items:center;gap:7px;font-size:13px}.calendar-source-copy small{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--muted);font-size:10px}.calendar-source-copy .calendar-source-error{color:var(--danger);white-space:normal}.calendar-source-list article>button{width:44px;height:44px;display:grid;place-items:center;border:0;background:transparent;border-radius:9px}.calendar-source-toggle{min-height:44px;display:flex;align-items:center;gap:5px;font-size:11px}.calendar-subscription-form{width:min(460px,100%)}.calendar-subscription-form .app-sheet__body label{display:grid;gap:6px;color:#756d61;font-size:12px;font-weight:650}.calendar-subscription-form input{min-height:44px;width:100%;padding:8px 11px;border:1px solid var(--border-cream)}.calendar-subscription-form input[type=color]{padding:5px;width:72px}.calendar-subscription-form .calendar-form-toggle{display:flex;align-items:center;min-height:44px}.calendar-subscription-form .calendar-form-toggle input{width:18px;min-height:18px}.calendar-view.loading{opacity:.72}@media(max-width:930px){.calendar-view{width:min(100%,630px)}.calendar-event-detail,.calendar-sources-sheet,.calendar-subscription-form{width:100%;max-width:100%;border-radius:20px 20px 0 0!important}}@media(max-width:720px){.calendar-view{width:100%;gap:13px}.calendar-heading .calendar-manage{font-size:0;padding:0;width:44px}.calendar-heading .calendar-manage svg{width:19px;height:19px}.calendar-toolbar{grid-template-columns:44px 54px minmax(0,1fr) 44px}.calendar-toolbar .calendar-today{width:54px}.calendar-week-strip{gap:3px;padding:7px}.calendar-week-day{min-height:64px}.calendar-week-day i{right:4px;top:4px;min-width:16px;height:16px}.calendar-source-list article{grid-template-columns:minmax(0,1fr) 44px 44px 44px}.calendar-source-toggle{grid-column:1/-1;grid-row:2}.calendar-event-row{grid-template-columns:9px 48px minmax(0,1fr) 20px}.calendar-filters{width:100%;margin-inline:-4px;padding-inline:4px}}@media(max-width:390px){.calendar-week-strip{display:flex;overflow-x:auto;scroll-snap-type:x proximity}.calendar-week-day{flex:0 0 44px;scroll-snap-align:start}.calendar-event-row{gap:7px}.calendar-source-list article{gap:1px}}@media(min-width:931px){.calendar-view{padding-top:4px}.calendar-event-detail{grid-column:3;grid-row:1;width:var(--detail-width,350px);height:100vh;max-height:none;padding:0;border-radius:0;border-top:0;border-right:0;border-bottom:0;box-shadow:inset 1px 0 0 #fff;overflow:hidden;display:flex;flex-direction:column}.calendar-event-detail .app-sheet__body{flex:1 1 auto;overflow-y:auto}.calendar-sources-sheet{border-radius:var(--radius-panel)}}@media(min-width:1440px){.calendar-view{width:min(100%,1040px)}}