Fetch semester data from APIs and validate course submissions

Author: bingling-sama

src/modules/courseTable/components/CourseDataForm.tsx

@@ -182,6 +182,16 @@ export const CourseDataForm = (props: CourseFormProps) => {
       });
       return;
     }
+    if (!props.onSubmit && (!semester || !year)) {
+      Modal.show({
+        title: '提示',
+        children: '学期信息尚未加载，请稍后重试',
+        mode: 'middle',
+        showCancel: false,
+        confirmText: '确定',
+      });
+      return;
+    }
 
     setLoading(true);
     try {
@@ -193,18 +203,14 @@ export const CourseDataForm = (props: CourseFormProps) => {
       // default create behavior
       const data = {
         ...formData,
-        semester: semester || '1',
-        year: year || new Date().getFullYear().toString(),
+        semester,
+        year,
         is_official: false, // 自主添加而非教务系统的课
       } as any;
 
       await addCourse(data);
 
-      createAndCacheCourse(
-        formData,
-        semester || '1',
-        year || new Date().getFullYear().toString()
-      );
+      createAndCacheCourse(formData, semester, year);
 
       Modal.show({
         title: '成功',

src/modules/courseTable/components/WeekSelector.tsx

@@ -10,11 +10,11 @@ import {
 
 import Modal from '@/components/modal';
 
-import useTimeStore, { computeSemesterAndYear } from '@/store/time';
 import useVisualScheme from '@/store/visualScheme';
 
 import { commonStyles } from '@/styles/common';
 import { log } from '@/utils/logger';
+import { calculateSemesterWeekCount } from '@/utils/semesterWeeks';
 
 import { WeekSelectorProps } from './courseTable/type';
 
@@ -32,19 +32,12 @@ const WeekSelector: FC<WeekSelectorProps> = ({
   year,
   semester,
   semesterOptions,
+  currentSemester,
+  actualCurrentWeek,
   onApply,
   isLoading = false,
 }) => {
   const currentStyle = useVisualScheme(state => state.currentStyle);
-  const getCurrentWeek = useTimeStore(state => state.getCurrentWeek);
-  const schoolTime = useTimeStore(state => state.schoolTime);
-
-  // 根据 schoolTime 推算真实当前学期
-  const actualSemester = useMemo(
-    () => (schoolTime ? computeSemesterAndYear(schoolTime) : null),
-    [schoolTime]
-  );
-
   // 本地预选学期状态（箭头切换只改这里，不立即请求）
   const [pendingYear, setPendingYear] = useState(year);
   const [pendingSemester, setPendingSemester] = useState(semester);
@@ -69,15 +62,24 @@ const WeekSelector: FC<WeekSelectorProps> = ({
     pendingIndex >= 0 && pendingIndex < semesterOptions.length - 1;
   const canGoNext = pendingIndex > 0;
 
+  const pendingTotalWeeks = useMemo(() => {
+    if (pendingIndex < 0) return totalWeeks;
+    const option = semesterOptions[pendingIndex];
+    return calculateSemesterWeekCount(
+      option.startTimestamp,
+      option.endTimestamp
+    );
+  }, [pendingIndex, semesterOptions, totalWeeks]);
+
   // 预选学期是否与当前学期不同
   const hasSemesterChanged =
     pendingYear !== year || pendingSemester !== semester;
 
   // 预选学期是否为真实当前学期（用于决定是否渲染「当前周」标识）
   const isCurrentSemester =
-    actualSemester !== null &&
-    pendingYear === actualSemester.year &&
-    pendingSemester === actualSemester.semester;
+    currentSemester !== null &&
+    pendingYear === currentSemester.year &&
+    pendingSemester === currentSemester.semester;
 
   // 向前切换（更早的学期）—— 只改本地状态
   const handlePrev = useCallback(() => {
@@ -257,7 +259,7 @@ const WeekSelector: FC<WeekSelectorProps> = ({
             </View>
             {/* 周次选择区域 */}
             <View style={styles.weekGrid}>
-              {Array.from({ length: totalWeeks }).map((_, i) => (
+              {Array.from({ length: pendingTotalWeeks }).map((_, i) => (
                 <Pressable
                   key={i}
                   onPress={() => handleWeekSelect(i + 1)}
@@ -280,7 +282,7 @@ const WeekSelector: FC<WeekSelectorProps> = ({
                         color:
                           !hasSemesterChanged && currentWeek === i + 1
                             ? '#FFFFFF'
-                            : isCurrentSemester && getCurrentWeek() === i + 1
+                            : isCurrentSemester && actualCurrentWeek === i + 1
                               ? '#7878F8'
                               : currentStyle?.schedule_text_style?.color ||
                                 '#000000',
@@ -289,7 +291,7 @@ const WeekSelector: FC<WeekSelectorProps> = ({
                   >
                     {i + 1}
                   </Text>
-                  {isCurrentSemester && getCurrentWeek() === i + 1 && (
+                  {isCurrentSemester && actualCurrentWeek === i + 1 && (
                     <Text
                       style={[
                         commonStyles.fontSmall,
@@ -319,7 +321,7 @@ const WeekSelector: FC<WeekSelectorProps> = ({
 
 const styles = StyleSheet.create({
   loadingOverlay: {
-    ...StyleSheet.absoluteFillObject,
+    ...StyleSheet.absoluteFill,
     justifyContent: 'center',
     alignItems: 'center',
   },

src/modules/courseTable/components/courseTable/type.ts

@@ -5,6 +5,8 @@ import {
   PanGestureHandlerEventPayload,
 } from 'react-native-gesture-handler';
 import { StyleProps } from 'react-native-reanimated';
+
+import type { SemesterOptionBase } from '@/utils/generateSemesterOptions';
 export type courseType = {
   class_when: string;
   classname: string;
@@ -46,11 +48,7 @@ export interface CourseTransferType {
   is_official: boolean; // 是否为教务系统课程
 }
 
-export interface SemesterOption {
-  label: string;
-  year: string;
-  semester: string;
-}
+export type SemesterOption = SemesterOptionBase;
 
 /** 学期 + 周次 应用参数 */
 export interface SemesterWeekParams {
@@ -71,6 +69,10 @@ export interface WeekSelectorProps {
   semester: string;
   /** 可选学期列表 */
   semesterOptions: SemesterOption[];
+  /** 后端返回的真实当前学期 */
+  currentSemester: Pick<SemesterOption, 'year' | 'semester'> | null;
+  /** 真实当前学期的当前周 */
+  actualCurrentWeek: number;
   /** 应用学期/周次变更并关闭，由父组件负责更新状态、拉取课表、关闭弹窗 */
   onApply: (params: SemesterWeekParams) => void | Promise<void>;
   /** 拉取课表数据中，遮罩层显示 loading */