Преглед изворни кода

fix: 优化学习记录日期选择器

彭峰 пре 2 месеци
родитељ
комит
83b8b01801

+ 1 - 1
src/app/features/study-records/study-records-page.component.html

@@ -1,6 +1,6 @@
 <section class="records-page">
   @if (meta.path === 'pages/his/his') {
-    <form class="filter-row" (change)="onFilterChange()">@if (session.groupId() === 3) { <label><span>学员</span><select name="student" [(ngModel)]="studentId"><option [ngValue]="0">选择学员</option>@for (student of students(); track studentValue(student) || $index) { <option [ngValue]="studentValue(student)">{{ studentName(student) }}</option> }</select></label> }<label><span>日期</span><input name="date" type="date" [(ngModel)]="selectedDate" /></label></form>
+    <form class="filter-row" (change)="onFilterChange()">@if (session.groupId() === 3) { <label><span>学员</span><select name="student" [(ngModel)]="studentId"><option [ngValue]="0">选择学员</option>@for (student of students(); track studentValue(student) || $index) { <option [ngValue]="studentValue(student)">{{ studentName(student) }}</option> }</select></label> }<label class="date-filter"><span>日期</span><div class="date-picker-field"><button type="button" class="date-trigger" [class.placeholder]="!selectedDate" (click)="toggleDatePicker()"><b>{{ selectedDateLabel() }}</b><lucide-icon [img]="icons.CalendarDays" [size]="22" /></button>@if (datePickerOpen()) { <button type="button" class="date-picker-backdrop" aria-label="关闭日期选择" (click)="closeDatePicker()"></button><section class="date-picker-popover" aria-label="选择学习记录日期"><header><strong>{{ datePickerMonthLabel() }}</strong><nav><button type="button" aria-label="上个月" (click)="shiftDatePickerMonth(-1)"><lucide-icon [img]="icons.ChevronLeft" [size]="22" /></button><button type="button" aria-label="下个月" (click)="shiftDatePickerMonth(1)"><lucide-icon [img]="icons.ChevronRight" [size]="22" /></button></nav></header><div class="date-picker-weekdays" aria-hidden="true"><span>日</span><span>一</span><span>二</span><span>三</span><span>四</span><span>五</span><span>六</span></div><div class="date-picker-grid">@for (day of datePickerDays(); track day.date) { <button type="button" class="date-picker-day" [class.outside]="!day.inMonth" [class.today]="day.isToday" [class.selected]="selectedDate === day.date" [attr.aria-pressed]="selectedDate === day.date" (click)="selectDate(day.date)">{{ day.day }}</button> }</div><footer><button type="button" (click)="clearDate()">清除</button><button type="button" (click)="selectToday()">今天</button></footer></section> }</div></label></form>
   }
   @if (meta.path === 'pages/his/his') {
     <section class="ai-reading-feature" aria-labelledby="ai-reading-title">

+ 23 - 1
src/app/features/study-records/study-records-page.component.scss

@@ -5,6 +5,27 @@
 .filter-row label:only-child { grid-column: 1 / -1; }
 .filter-row span { color: var(--ink-soft); font-size: 11px; }
 .filter-row :is(select, input) { width: 100%; min-height: 40px; padding: 7px 9px; background: white; border: 1px solid var(--line); border-radius: var(--radius-sm); }
+.date-filter { position: relative; }
+.date-picker-field { position: relative; }
+.date-trigger { display: flex; width: 100%; min-height: 48px; align-items: center; justify-content: space-between; padding: 0 14px; color: var(--ink); background: white; border: 1px solid var(--line); border-radius: var(--radius-md); }
+.date-trigger b { overflow: hidden; font-size: 16px; font-weight: 750; text-overflow: ellipsis; white-space: nowrap; }
+.date-trigger.placeholder b { color: var(--ink-faint); font-weight: 650; }
+.date-trigger lucide-icon { color: var(--brand-strong); }
+.date-picker-backdrop { position: fixed; inset: 0; z-index: 29; background: transparent; border: 0; }
+.date-picker-popover { position: absolute; top: calc(100% + 8px); right: 0; z-index: 30; width: min(520px, calc(100vw - 32px)); padding: 16px; background: white; border: 1px solid color-mix(in srgb, var(--brand) 18%, var(--line)); border-radius: 22px; box-shadow: 0 18px 44px rgb(15 84 70 / 18%); }
+.date-picker-popover header { display: flex; align-items: center; justify-content: space-between; margin-bottom: 14px; gap: 12px; }
+.date-picker-popover header strong { color: var(--ink); font-size: 18px; }
+.date-picker-popover nav { display: flex; align-items: center; gap: 8px; }
+.date-picker-popover nav button { display: grid; width: 42px; height: 42px; color: var(--brand-strong); background: var(--brand-pale); border: 1px solid color-mix(in srgb, var(--brand) 20%, var(--line)); border-radius: 999px; place-items: center; }
+.date-picker-weekdays, .date-picker-grid { display: grid; grid-template-columns: repeat(7, minmax(0, 1fr)); gap: 7px; }
+.date-picker-weekdays { margin-bottom: 8px; }
+.date-picker-weekdays span { color: var(--ink-soft); font-size: 12px; font-weight: 700; text-align: center; }
+.date-picker-day { min-width: 0; height: 50px; color: var(--ink); background: var(--surface-muted); border: 1px solid transparent; border-radius: 16px; font: inherit; font-size: 16px; font-weight: 750; cursor: pointer; }
+.date-picker-day.outside { color: var(--ink-faint); background: transparent; }
+.date-picker-day.today { color: var(--brand-strong); border-color: color-mix(in srgb, var(--brand) 38%, var(--line)); }
+.date-picker-day.selected { color: white; background: linear-gradient(135deg, var(--brand-strong), var(--brand)); border-color: var(--brand-strong); box-shadow: 0 8px 18px rgb(20 126 96 / 25%); }
+.date-picker-popover footer { display: flex; justify-content: space-between; margin-top: 14px; }
+.date-picker-popover footer button { min-height: 38px; padding: 0 14px; color: var(--brand-strong); background: var(--brand-pale); border: 1px solid color-mix(in srgb, var(--brand) 24%, var(--line)); border-radius: 999px; font-size: 13px; font-weight: 750; }
 .record-tabs { display: grid; grid-template-columns: 1fr 1fr; background: white; border-bottom: 1px solid var(--line); }
 .record-tabs button { min-height: 46px; color: var(--ink-soft); background: transparent; border: 0; border-bottom: 2px solid transparent; }
 .record-tabs button.active { color: var(--brand-strong); border-bottom-color: var(--brand-strong); }
@@ -55,5 +76,6 @@
 .chevron { color: var(--ink-soft); }
 .spin { animation: spin .8s linear infinite; }
 @keyframes spin { to { transform: rotate(360deg); } }
-@media (max-width: 360px) { .learning-record-card { margin-inline: 10px; } }
+@media (max-width: 420px) { .date-picker-popover { position: fixed; top: 96px; right: 12px; left: 12px; width: auto; } .date-picker-day { height: 46px; border-radius: 14px; } }
+@media (max-width: 360px) { .learning-record-card { margin-inline: 10px; } .date-picker-weekdays, .date-picker-grid { gap: 5px; } .date-picker-day { height: 42px; font-size: 15px; } }
 @media (min-width: 760px) { .records-page { max-width: 760px; margin: 0 auto; border-inline: 1px solid var(--line); } }

+ 74 - 2
src/app/features/study-records/study-records-page.component.ts

@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, inject, OnInit, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
-import { AlertCircle, ArrowRight, BookOpen, CalendarDays, CheckCircle2, ChevronRight, Clock3, LoaderCircle, LucideAngularModule, RotateCcw, Sparkles } from 'lucide-angular';
+import { AlertCircle, ArrowRight, BookOpen, CalendarDays, CheckCircle2, ChevronLeft, ChevronRight, Clock3, LoaderCircle, LucideAngularModule, RotateCcw, Sparkles } from 'lucide-angular';
 import { catchError, finalize, forkJoin, of } from 'rxjs';
 import { ApiError, ApiService } from '../../core/api.service';
 import { extractReadingWords, readNcloudSessionToken } from '../../core/external-reading';
@@ -11,6 +11,13 @@ import { SessionService } from '../../core/session.service';
 
 type Item = Record<string, unknown>;
 
+interface DatePickerDay {
+  date: string;
+  day: number;
+  inMonth: boolean;
+  isToday: boolean;
+}
+
 @Component({
   selector: 'app-study-records-page',
   standalone: true,
@@ -28,6 +35,23 @@ export class StudyRecordsPageComponent implements OnInit {
   readonly error = signal('');
   readonly totalIncome = signal(0);
   readonly activeTab = signal(0);
+  readonly datePickerOpen = signal(false);
+  readonly datePickerMonth = signal(this.firstOfMonth(new Date()));
+  readonly datePickerMonthLabel = computed(() => new Intl.DateTimeFormat('zh-CN', { year: 'numeric', month: 'long' }).format(this.datePickerMonth()));
+  readonly datePickerDays = computed<DatePickerDay[]>(() => {
+    const month = this.datePickerMonth();
+    const year = month.getFullYear();
+    const monthIndex = month.getMonth();
+    const offset = new Date(year, monthIndex, 1, 12).getDay();
+    const start = new Date(year, monthIndex, 1 - offset, 12);
+    const today = this.dateKey(new Date());
+    return Array.from({ length: 42 }, (_, index) => {
+      const date = new Date(start);
+      date.setDate(start.getDate() + index);
+      const key = this.dateKey(date);
+      return { date: key, day: date.getDate(), inMonth: date.getMonth() === monthIndex, isToday: key === today };
+    });
+  });
   readonly visibleItems = computed(() => this.items());
   readonly latestReadingRecord = computed(() => this.items().find((item) => extractReadingWords(item['xxqs']).length > 0));
   readonly latestReadingWordCount = computed(() => {
@@ -41,7 +65,7 @@ export class StudyRecordsPageComponent implements OnInit {
     return new Intl.DateTimeFormat('zh-CN', { month: 'long', day: 'numeric', weekday: 'short' })
       .format(new Date(year, month - 1, day, 12));
   };
-  readonly icons = { AlertCircle, ArrowRight, BookOpen, CalendarDays, CheckCircle2, ChevronRight, Clock3, LoaderCircle, RotateCcw, Sparkles };
+  readonly icons = { AlertCircle, ArrowRight, BookOpen, CalendarDays, CheckCircle2, ChevronLeft, ChevronRight, Clock3, LoaderCircle, RotateCcw, Sparkles };
   studentId = 0;
   selectedDate = '';
 
@@ -89,6 +113,7 @@ export class StudyRecordsPageComponent implements OnInit {
   onFilterChange(): void {
     this.studentId = Number(this.studentId || 0);
     this.selectedDate = this.dateKey(this.selectedDate);
+    this.syncDatePickerMonth();
     this.syncHistoryState();
     this.load();
   }
@@ -99,6 +124,44 @@ export class StudyRecordsPageComponent implements OnInit {
     this.load();
   }
 
+  toggleDatePicker(): void {
+    if (!this.datePickerOpen()) this.syncDatePickerMonth();
+    this.datePickerOpen.update((open) => !open);
+  }
+
+  closeDatePicker(): void { this.datePickerOpen.set(false); }
+
+  shiftDatePickerMonth(amount: number): void {
+    const month = this.datePickerMonth();
+    this.datePickerMonth.set(new Date(month.getFullYear(), month.getMonth() + amount, 1, 12));
+  }
+
+  selectDate(date: string): void {
+    this.selectedDate = date;
+    this.closeDatePicker();
+    this.syncHistoryState();
+    this.load();
+  }
+
+  selectToday(): void {
+    const today = this.dateKey(new Date());
+    this.datePickerMonth.set(this.firstOfMonth(new Date()));
+    this.selectDate(today);
+  }
+
+  clearDate(): void {
+    this.selectedDate = '';
+    this.closeDatePicker();
+    this.syncHistoryState();
+    this.load();
+  }
+
+  selectedDateLabel(): string {
+    if (!this.selectedDate) return '全部日期';
+    const [year, month, day] = this.selectedDate.split('-').map(Number);
+    return `${year}年${String(month).padStart(2, '0')}月${String(day).padStart(2, '0')}日`;
+  }
+
   courseId(item: Item): string {
     return String(item['kcid'] ?? item['kcId'] ?? item['NodeID'] ?? item['nodeId'] ?? '');
   }
@@ -247,6 +310,7 @@ export class StudyRecordsPageComponent implements OnInit {
     const query = this.route.snapshot.queryParamMap;
     this.studentId = Number(query.get('uid') ?? 0);
     this.selectedDate = this.dateKey(query.get('date') ?? query.get('hisDay') ?? '');
+    this.syncDatePickerMonth();
   }
 
   private syncHistoryState(): void {
@@ -277,4 +341,12 @@ export class StudyRecordsPageComponent implements OnInit {
     return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
   }
 
+  private firstOfMonth(date: Date): Date { return new Date(date.getFullYear(), date.getMonth(), 1, 12); }
+
+  private syncDatePickerMonth(): void {
+    if (!this.selectedDate) return;
+    const [year, month] = this.selectedDate.split('-').map(Number);
+    this.datePickerMonth.set(new Date(year, month - 1, 1, 12));
+  }
+
 }