Upload 27 files

App.tsx

@@ -1,21 +1,23 @@
 
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, Suspense } from 'react';
 import { Sidebar } from './components/Sidebar';
 import { Header } from './components/Header';
-import { Dashboard } from './pages/Dashboard';
-import { StudentList } from './pages/StudentList';
-import { CourseList } from './pages/CourseList';
-import { ScoreList } from './pages/ScoreList';
-import { ClassList } from './pages/ClassList';
-import { Settings } from './pages/Settings';
-import { Reports } from './pages/Reports';
-import { SubjectList } from './pages/SubjectList';
-import { UserList } from './pages/UserList';
-import { SchoolList } from './pages/SchoolList';
+// Lazy load pages for performance optimization
+const Dashboard = React.lazy(() => import('./pages/Dashboard').then(module => ({ default: module.Dashboard })));
+const StudentList = React.lazy(() => import('./pages/StudentList').then(module => ({ default: module.StudentList })));
+const CourseList = React.lazy(() => import('./pages/CourseList').then(module => ({ default: module.CourseList })));
+const ScoreList = React.lazy(() => import('./pages/ScoreList').then(module => ({ default: module.ScoreList })));
+const ClassList = React.lazy(() => import('./pages/ClassList').then(module => ({ default: module.ClassList })));
+const Settings = React.lazy(() => import('./pages/Settings').then(module => ({ default: module.Settings })));
+const Reports = React.lazy(() => import('./pages/Reports').then(module => ({ default: module.Reports })));
+const SubjectList = React.lazy(() => import('./pages/SubjectList').then(module => ({ default: module.SubjectList })));
+const UserList = React.lazy(() => import('./pages/UserList').then(module => ({ default: module.UserList })));
+const SchoolList = React.lazy(() => import('./pages/SchoolList').then(module => ({ default: module.SchoolList })));
+
 import { Login } from './pages/Login';
 import { User, UserRole } from './types';
 import { api } from './services/api';
-import { AlertTriangle } from 'lucide-react';
+import { AlertTriangle, Loader2 } from 'lucide-react';
 
 // Error Boundary Component
 class ErrorBoundary extends React.Component<{children: React.ReactNode}, {hasError: boolean, error: Error | null}> {
@@ -68,6 +70,15 @@ class ErrorBoundary extends React.Component<{children: React.ReactNode}, {hasErr
   }
 }
 
+const PageLoading = () => (
+  <div className="flex h-full w-full items-center justify-center min-h-[400px]">
+    <div className="flex flex-col items-center space-y-3">
+       <Loader2 className="h-8 w-8 animate-spin text-blue-600" />
+       <p className="text-sm text-gray-400">资源加载中...</p>
+    </div>
+  </div>
+);
+
 const AppContent: React.FC = () => {
   const [isAuthenticated, setIsAuthenticated] = useState(false);
   const [currentUser, setCurrentUser] = useState<User | null>(null);
@@ -108,7 +119,7 @@ const AppContent: React.FC = () => {
       case 'reports': return <Reports />;
       case 'subjects': return <SubjectList />;
       case 'users': return <UserList />;
-      case 'schools': return <SchoolList />; // New Route
+      case 'schools': return <SchoolList />; 
       default: return <Dashboard onNavigate={(view) => setCurrentView(view)} />;
     }
   };
@@ -149,7 +160,9 @@ const AppContent: React.FC = () => {
         />
         <main className="flex-1 overflow-x-hidden overflow-y-auto bg-gray-50 p-4 md:p-6 w-full">
           <div className="max-w-7xl mx-auto w-full">
-            {renderContent()}
+            <Suspense fallback={<PageLoading />}>
+              {renderContent()}
+            </Suspense>
           </div>
         </main>
       </div>

components/Sidebar.tsx

@@ -1,3 +1,4 @@
+
 import React from 'react';
 import { LayoutDashboard, Users, BookOpen, GraduationCap, Settings, LogOut, FileText, School, UserCog, Palette, X, Building } from 'lucide-react';
 import { UserRole } from '../types';
@@ -21,7 +22,8 @@ export const Sidebar: React.FC<SidebarProps> = ({ currentView, onChangeView, use
     { id: 'grades', label: '成绩管理', icon: GraduationCap, roles: [UserRole.ADMIN, UserRole.TEACHER, UserRole.STUDENT] },
     // Update: Allow TEACHER to access reports
     { id: 'reports', label: '报表统计', icon: FileText, roles: [UserRole.ADMIN, UserRole.TEACHER] },
-    { id: 'subjects', label: '学科设置', icon: Palette, roles: [UserRole.ADMIN] },
+    // Update: Allow TEACHER to access subjects (limited view)
+    { id: 'subjects', label: '学科设置', icon: Palette, roles: [UserRole.ADMIN, UserRole.TEACHER] },
     { id: 'users', label: '用户管理', icon: UserCog, roles: [UserRole.ADMIN] },
     { id: 'settings', label: '系统设置', icon: Settings, roles: [UserRole.ADMIN] },
   ];
@@ -80,4 +82,4 @@ export const Sidebar: React.FC<SidebarProps> = ({ currentView, onChangeView, use
       </div>
     </>
   );
-};
+};

metadata.json

@@ -1,5 +1,5 @@
 {
-  "name": "智慧校园管理系统",
+  "name": "Copy of 智慧校园管理系统",
   "description": "一个综合性的学生管理系统仪表板，具有基于角色的访问控制、学生档案、课程管理和绩效分析功能。",
   "requestFramePermissions": []
 }

pages/Dashboard.tsx

@@ -1,3 +1,4 @@
+
 import React, { useEffect, useState } from 'react';
 import { Users, BookOpen, GraduationCap, TrendingUp, AlertTriangle, ArrowRight, Activity, Calendar, X, CheckCircle, Plus, Trash2 } from 'lucide-react';
 import { api } from '../services/api';
@@ -8,10 +9,23 @@ interface DashboardProps {
   onNavigate: (view: string) => void;
 }
 
-// 排序辅助函数
-const gradeOrder: Record<string, number> = { '一年级': 1, '二年级': 2, '三年级': 3, '四年级': 4, '五年级': 5, '六年级': 6, '初一': 7, '七年级': 7, '初二': 8, '八年级': 8, '初三': 9, '九年级': 9, '高一': 10, '高二': 11, '高三': 12 };
-const sortGrades = (a: string, b: string) => (gradeOrder[a] || 99) - (gradeOrder[b] || 99);
-const sortClasses = (a: string, b: string) => a.localeCompare(b, 'zh-CN', { numeric: true });
+// 优化后的年级排序：支持 K12 全学段中文习惯排序
+export const gradeOrder: Record<string, number> = { 
+    '一年级': 1, '二年级': 2, '三年级': 3, '四年级': 4, '五年级': 5, '六年级': 6, 
+    '初一': 7, '七年级': 7, '初二': 8, '八年级': 8, '初三': 9, '九年级': 9, 
+    '高一': 10, '高二': 11, '高三': 12 
+};
+export const sortGrades = (a: string, b: string) => (gradeOrder[a] || 99) - (gradeOrder[b] || 99);
+export const sortClasses = (a: string, b: string) => {
+    // 提取年级部分
+    const getGrade = (s: string) => Object.keys(gradeOrder).find(g => s.startsWith(g)) || '';
+    const gradeA = getGrade(a);
+    const gradeB = getGrade(b);
+    if (gradeA !== gradeB) return sortGrades(gradeA, gradeB);
+    // 年级相同，比较班级号 (假设格式如 (1)班, 1班)
+    const getNum = (s: string) => parseInt(s.replace(/[^0-9]/g, '')) || 0;
+    return getNum(a) - getNum(b);
+};
 
 export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
   const [stats, setStats] = useState({ studentCount: 0, courseCount: 0, avgScore: 0, excellentRate: '0%' });
@@ -28,10 +42,8 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
   
   // 课表视图状态
   const [viewGrade, setViewGrade] = useState(''); // 管理员年级视角
-  // 注意：viewClass 状态移除，改为在排课弹窗中临时选择
   
   const [editingCell, setEditingCell] = useState<{day: number, period: number} | null>(null);
-  // 排课表单增加 className 字段
   const [editForm, setEditForm] = useState({ className: '', subject: '', teacherName: '' });
 
   // Chart Data
@@ -39,6 +51,7 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
 
   const currentUser = api.auth.getCurrentUser();
   const isAdmin = currentUser?.role === 'ADMIN';
+  const isTeacher = currentUser?.role === 'TEACHER';
 
   useEffect(() => {
     const loadData = async () => {
@@ -58,7 +71,6 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
 
         // 如果是管理员，且没有选年级，默认选中第一个有数据的年级
         if (isAdmin && classes.length > 0) {
-            // Explicitly cast mapped array to string[] to fix TS error
             const grades = Array.from(new Set((classes as ClassInfo[]).map((c: ClassInfo) => c.grade))).sort(sortGrades);
             if (grades.length > 0) {
                 setViewGrade(grades[0] as string);
@@ -68,7 +80,6 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
         // Generate Warnings (Simplified)
         const newWarnings: string[] = [];
         subs.forEach((sub: Subject) => {
-           // Explicitly cast scores
            const subScores = (scores as Score[]).filter((s: Score) => s.courseName === sub.name && s.status === 'Normal');
            if (subScores.length > 0) {
               const avg = subScores.reduce((a: number, b: Score) => a + b.score, 0) / subScores.length;
@@ -119,19 +130,24 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
      } catch(e) { console.error(e); }
   };
 
+  const handleOpenAddModal = (day: number, period: number) => {
+      setEditingCell({ day, period });
+      setEditForm({ 
+         className: '', // 需选择
+         subject: isTeacher ? (currentUser?.teachingSubject || '') : '', // 老师自动填科目
+         teacherName: isTeacher ? (currentUser?.trueName || currentUser?.username || '') : '' // 老师自动填名字
+      });
+  };
+
   const handleSaveSchedule = async () => {
      if (!editingCell) return;
      
      // 校验
-     if (isAdmin && !editForm.className) return alert('请选择班级');
+     if (!editForm.className) return alert('请选择班级');
      if (!editForm.subject) return alert('请选择科目');
      if (!editForm.teacherName) return alert('请选择任课教师');
 
-     // 如果是老师排课（虽然通常不开放），班级可能是空的，这里假设老师排课时不需要选班级或者逻辑不同
-     // 但为了兼容管理员排班逻辑，这里主要处理管理员
-     
-     // 构造班级全名：如果是管理员模式，editForm.className 只是 "(1)班"，需要拼上年级 viewGrade
-     // 但为了方便，下拉框可以直接存全名 "六年级(1)班"
+     // 构造班级全名
      const targetClassName = editForm.className; 
 
      await api.schedules.save({
@@ -156,14 +172,15 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
      fetchSchedules();
   };
 
-  // 排序后的年级选项
+  // 排序后的年级选项 (Admin Only)
   const uniqueGrades = Array.from(new Set(classList.map(c => c.grade))).sort(sortGrades);
   
-  // 当前选中年级的所有班级（用于排课下拉框）
-  const currentGradeClasses = classList
-    .filter(c => c.grade === viewGrade)
-    .map(c => c.grade + c.className)
-    .sort(sortClasses);
+  // 弹窗中可选的班级列表：
+  // 1. 如果是管理员，显示当前选中年级 viewGrade 的班级 (保持上下文一致)
+  // 2. 如果是老师，显示全校所有班级 (因为老师可能跨年级授课)
+  const modalClassOptions = isAdmin 
+      ? classList.filter(c => c.grade === viewGrade).map(c => c.grade + c.className).sort(sortClasses)
+      : classList.map(c => c.grade + c.className).sort(sortClasses);
 
   const cards = [
     { label: '在校学生', value: stats.studentCount, icon: Users, color: 'bg-blue-500', trend: '+12%' },
@@ -280,7 +297,7 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
                         </div>
                      )}
 
-                     {!isAdmin && currentUser?.role === 'TEACHER' && (
+                     {!isAdmin && isTeacher && (
                         <div className="text-sm text-gray-500">
                            查看: <span className="font-bold text-gray-800">{currentUser.trueName || currentUser.username}</span> 的课表
                         </div>
@@ -303,8 +320,9 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
                               <td className="p-4 border-b border-r font-bold text-gray-400 bg-gray-50/50">第{period}节</td>
                               {[1,2,3,4,5].map(day => {
                                  const slotItems = schedules.filter(s => s.dayOfWeek === day && s.period === period);
-                                 // 是否为管理员（始终可以编辑）或老师（看情况，暂定老师只能看）
-                                 const canAdd = isAdmin;
+                                 // Update: Admins OR Teachers can add/edit
+                                 // Teacher can add slots for themselves
+                                 const canAdd = isAdmin || isTeacher;
                                  
                                  return (
                                     <td 
@@ -312,43 +330,39 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
                                        className="p-2 border-b h-28 align-top transition-colors relative group"
                                     >
                                        <div className="flex flex-wrap gap-2 content-start h-full overflow-y-auto custom-scrollbar pb-6">
-                                          {slotItems.map(item => (
-                                             <div key={item._id} className="text-xs text-left bg-white border border-blue-200 rounded-md p-2 w-full shadow-sm relative group/item hover:border-blue-400 hover:shadow-md transition-all">
-                                                <div className="font-bold text-blue-700 flex justify-between items-center mb-1">
-                                                   <span className="truncate mr-1">{item.subject}</span>
-                                                   {/* 删除按钮 */}
-                                                   {isAdmin && (
-                                                      <button 
-                                                         onClick={(e)=>{ e.stopPropagation(); handleDeleteSchedule(item); }}
-                                                         className="text-gray-300 hover:text-red-500 transition-colors p-0.5"
-                                                         title="删除课程"
-                                                      >
-                                                         <X size={14}/>
-                                                      </button>
-                                                   )}
+                                          {slotItems.map(item => {
+                                             // Teacher can only delete their own lessons
+                                             const canDelete = isAdmin || (isTeacher && (item.teacherName === currentUser.trueName || item.teacherName === currentUser.username));
+                                             return (
+                                                <div key={item._id} className="text-xs text-left bg-white border border-blue-200 rounded-md p-2 w-full shadow-sm relative group/item hover:border-blue-400 hover:shadow-md transition-all">
+                                                   <div className="font-bold text-blue-700 flex justify-between items-center mb-1">
+                                                      <span className="truncate mr-1">{item.subject}</span>
+                                                      {canDelete && (
+                                                         <button 
+                                                            onClick={(e)=>{ e.stopPropagation(); handleDeleteSchedule(item); }}
+                                                            className="text-gray-300 hover:text-red-500 transition-colors p-0.5"
+                                                            title="删除课程"
+                                                         >
+                                                            <X size={14}/>
+                                                         </button>
+                                                      )}
+                                                   </div>
+                                                   <div className="flex justify-between items-center text-gray-600">
+                                                      {/* 显示班级名 */}
+                                                      <span className="bg-blue-50 text-blue-600 px-1.5 rounded font-mono text-[10px] font-bold">
+                                                         {item.className.replace(viewGrade, '')}
+                                                      </span>
+                                                      <span className="text-[10px] truncate max-w-[50%]">{item.teacherName}</span>
+                                                   </div>
                                                 </div>
-                                                <div className="flex justify-between items-center text-gray-600">
-                                                   {/* 显示班级名（去除年级前缀，保持简洁）和教师 */}
-                                                   <span className="bg-blue-50 text-blue-600 px-1.5 rounded font-mono text-[10px] font-bold">
-                                                      {item.className.replace(viewGrade, '')}
-                                                   </span>
-                                                   <span className="text-[10px] truncate max-w-[50%]">{item.teacherName}</span>
-                                                </div>
-                                             </div>
-                                          ))}
+                                             );
+                                          })}
                                           
-                                          {/* Add Button (Only for Admin) */}
+                                          {/* Add Button */}
                                           {canAdd && (
                                              <div className="absolute bottom-1 right-1 left-1 flex justify-center opacity-0 group-hover:opacity-100 transition-opacity">
                                                  <button 
-                                                    onClick={() => {
-                                                       setEditingCell({ day, period });
-                                                       setEditForm({ 
-                                                          className: '', // 需要在弹窗选
-                                                          subject: '', 
-                                                          teacherName: '' 
-                                                       });
-                                                    }}
+                                                    onClick={() => handleOpenAddModal(day, period)}
                                                     className="w-full bg-blue-50 border border-blue-200 text-blue-500 rounded py-1 hover:bg-blue-100 flex items-center justify-center shadow-sm"
                                                  >
                                                     <Plus size={14}/>
@@ -371,28 +385,31 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
                <div className="absolute inset-0 bg-black/20 flex items-center justify-center backdrop-blur-[1px] z-50">
                   <div className="bg-white p-6 rounded-xl shadow-2xl w-80 animate-in zoom-in-95 border border-gray-100">
                      <h4 className="font-bold mb-4 text-gray-800 border-b pb-2">
-                        排课信息 <br/>
-                        <span className="text-sm font-normal text-gray-500">{viewGrade} 周{['一','二','三','四','五'][editingCell.day-1]} 第{editingCell.period}节</span>
+                        {isTeacher ? '我的排课' : '排课管理'} <br/>
+                        <span className="text-sm font-normal text-gray-500">周{['一','二','三','四','五'][editingCell.day-1]} 第{editingCell.period}节</span>
                      </h4>
                      <div className="space-y-4">
-                        {/* 班级选择 (仅管理员) */}
-                        {isAdmin && (
-                           <div>
-                              <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">班级</label>
-                              <select 
-                                 className="w-full border border-gray-300 rounded-lg p-2.5 text-sm focus:ring-2 focus:ring-blue-500 outline-none" 
-                                 value={editForm.className} 
-                                 onChange={e=>setEditForm({...editForm, className: e.target.value})}
-                              >
-                                 <option value="">-- 请选择班级 --</option>
-                                 {currentGradeClasses.map(c => <option key={c} value={c}>{c}</option>)}
-                              </select>
-                           </div>
-                        )}
+                        {/* 班级选择: Admin 选择 viewGrade 下的班级，Teacher 可以选全校班级 */}
+                        <div>
+                           <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">班级</label>
+                           <select 
+                              className="w-full border border-gray-300 rounded-lg p-2.5 text-sm focus:ring-2 focus:ring-blue-500 outline-none" 
+                              value={editForm.className} 
+                              onChange={e=>setEditForm({...editForm, className: e.target.value})}
+                           >
+                              <option value="">-- 请选择班级 --</option>
+                              {modalClassOptions.map(c => <option key={c} value={c}>{c}</option>)}
+                           </select>
+                        </div>
 
                         <div>
                            <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">科目</label>
-                           <select className="w-full border border-gray-300 rounded-lg p-2.5 text-sm focus:ring-2 focus:ring-blue-500 outline-none" value={editForm.subject} onChange={e=>setEditForm({...editForm, subject: e.target.value})}>
+                           <select 
+                              className="w-full border border-gray-300 rounded-lg p-2.5 text-sm focus:ring-2 focus:ring-blue-500 outline-none disabled:bg-gray-100 disabled:text-gray-500" 
+                              value={editForm.subject} 
+                              onChange={e=>setEditForm({...editForm, subject: e.target.value})}
+                              disabled={isTeacher && !!currentUser?.teachingSubject} // 老师如果有任教科目则锁定
+                           >
                               <option value="">-- 请选择科目 --</option>
                               {subjects.map(s=><option key={s._id} value={s.name}>{s.name}</option>)}
                            </select>
@@ -400,7 +417,12 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
                         
                         <div>
                            <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">任课教师</label>
-                           <select className="w-full border border-gray-300 rounded-lg p-2.5 text-sm focus:ring-2 focus:ring-blue-500 outline-none" value={editForm.teacherName} onChange={e=>setEditForm({...editForm, teacherName: e.target.value})}>
+                           <select 
+                              className="w-full border border-gray-300 rounded-lg p-2.5 text-sm focus:ring-2 focus:ring-blue-500 outline-none disabled:bg-gray-100 disabled:text-gray-500" 
+                              value={editForm.teacherName} 
+                              onChange={e=>setEditForm({...editForm, teacherName: e.target.value})}
+                              disabled={isTeacher} // 老师只能给自己排课
+                           >
                               <option value="">-- 请选择教师 --</option>
                               {teachers.map(t=><option key={t._id} value={t.trueName || t.username}>{t.trueName} ({t.teachingSubject || '无科目'})</option>)}
                            </select>
@@ -433,4 +455,4 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
       )}
     </div>
   );
-};
+};

pages/Reports.tsx

@@ -1,3 +1,4 @@
+
 import React, { useState, useEffect } from 'react';
 import { 
   BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer, 
@@ -7,6 +8,12 @@ import { api } from '../services/api';
 import { Loader2, Download, Filter, TrendingUp, Grid, BarChart2, User, PieChart as PieChartIcon } from 'lucide-react';
 import { Score, Student, ClassInfo, Subject, Exam } from '../types';
 
+// Reuse sort logic
+const localSortGrades = (a: string, b: string) => {
+    const order: Record<string, number> = { '一年级': 1, '二年级': 2, '三年级': 3, '四年级': 4, '五年级': 5, '六年级': 6, '初一': 7, '七年级': 7, '初二': 8, '八年级': 8, '初三': 9, '九年级': 9, '高一': 10, '高二': 11, '高三': 12 };
+    return (order[a] || 99) - (order[b] || 99);
+};
+
 export const Reports: React.FC = () => {
   const [loading, setLoading] = useState(true);
   const [activeTab, setActiveTab] = useState<'overview' | 'grade' | 'trend' | 'matrix' | 'student'>('overview');
@@ -80,7 +87,7 @@ export const Reports: React.FC = () => {
     const passRate = normalScores.length ? (totalPass / normalScores.length)*100 : 0;
     
     // Grade Ladder (Avg score by grade)
-    const uniqueGradesList = Array.from(new Set(classes.map(c => c.grade))).sort();
+    const uniqueGradesList = Array.from(new Set(classes.map(c => c.grade))).sort(localSortGrades);
     const ladderData = uniqueGradesList.map(g => {
        const gradeClasses = classes.filter(c => c.grade === g).map(c => c.grade+c.className);
        const gradeStus = students.filter(s => gradeClasses.includes(s.className)).map(s => s.studentNo);
@@ -258,7 +265,7 @@ export const Reports: React.FC = () => {
       };
   };
 
-  const uniqueGrades = Array.from(new Set(classes.map(c => c.grade))).sort();
+  const uniqueGrades = Array.from(new Set(classes.map(c => c.grade))).sort(localSortGrades);
   const allClasses = classes.map(c => c.grade + c.className);
   
   // Student List for Focus Tab
@@ -604,4 +611,4 @@ export const Reports: React.FC = () => {
       )}
     </div>
   );
-};
+};

pages/ScoreList.tsx

@@ -1,8 +1,15 @@
+
 import React, { useState, useEffect } from 'react';
 import { api } from '../services/api';
 import { Score, Student, Subject, ClassInfo, ExamStatus, Exam, SystemConfig } from '../types';
 import { Loader2, Plus, Trash2, Award, FileSpreadsheet, X, Upload, Edit, Save, Calendar } from 'lucide-react';
 
+// Reuse sort helper
+const localSortGrades = (a: string, b: string) => {
+    const order: Record<string, number> = { '一年级': 1, '二年级': 2, '三年级': 3, '四年级': 4, '五年级': 5, '六年级': 6, '初一': 7, '七年级': 7, '初二': 8, '八年级': 8, '初三': 9, '九年级': 9, '高一': 10, '高二': 11, '高三': 12 };
+    return (order[a] || 99) - (order[b] || 99);
+};
+
 export const ScoreList: React.FC = () => {
   // ... state ...
   const [subjects, setSubjects] = useState<Subject[]>([]);
@@ -178,7 +185,10 @@ export const ScoreList: React.FC = () => {
 
   const handleUpdateExamDate = async (name: string, date: string) => { await api.exams.save({ name, date }); loadData(); };
   const toggleSelect = (id: string) => { const newSet = new Set(selectedIds); if (newSet.has(id)) newSet.delete(id); else newSet.add(id); setSelectedIds(newSet); };
-  const uniqueGrades = Array.from(new Set(classList.map(c => c.grade))).sort();
+  
+  // SORTED Grades
+  const uniqueGrades = Array.from(new Set(classList.map(c => c.grade))).sort(localSortGrades);
+  
   const filteredClasses = classList.filter(c => selectedGrade === 'All' || c.grade === selectedGrade);
   const uniqueClasses = Array.from(new Set(filteredClasses.map(c => c.className))).sort();
   const uniqueExamNames = Array.from(new Set(scores.map(s => s.examName || s.type)));
@@ -405,4 +415,4 @@ export const ScoreList: React.FC = () => {
        )}
     </div>
   );
-};
+};

pages/StudentList.tsx

@@ -1,10 +1,17 @@
+
 import React, { useState, useEffect } from 'react';
 import { Search, Plus, Upload, Edit, Trash2, X, Loader2, User, FileSpreadsheet } from 'lucide-react';
 import { api } from '../services/api';
 import { Student, ClassInfo } from '../types';
+import { sortGrades, sortClasses } from './Dashboard'; // Reuse Sort Logic if possible, otherwise define locally
+
+// Re-define sort logic locally to be safe if imports fail or circular dependency risks
+const localSortGrades = (a: string, b: string) => {
+    const order: Record<string, number> = { '一年级': 1, '二年级': 2, '三年级': 3, '四年级': 4, '五年级': 5, '六年级': 6, '初一': 7, '七年级': 7, '初二': 8, '八年级': 8, '初三': 9, '九年级': 9, '高一': 10, '高二': 11, '高三': 12 };
+    return (order[a] || 99) - (order[b] || 99);
+};
 
 export const StudentList: React.FC = () => {
-  // ... (你的 state 定义保持不变) ...
   const [searchTerm, setSearchTerm] = useState('');
   const [students, setStudents] = useState<Student[]>([]);
   const [classList, setClassList] = useState<ClassInfo[]>([]);
@@ -15,6 +22,9 @@ export const StudentList: React.FC = () => {
   const [submitting, setSubmitting] = useState(false);
   const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
 
+  // Edit Mode State
+  const [editStudentId, setEditStudentId] = useState<string | null>(null);
+
   // Filters
   const [selectedGrade, setSelectedGrade] = useState('All');
   const [selectedClass, setSelectedClass] = useState('All');
@@ -24,7 +34,7 @@ export const StudentList: React.FC = () => {
   const [importTargetClass, setImportTargetClass] = useState('');
 
   // Form State
-  const [formData, setFormData] = useState({
+  const initialForm = {
     name: '',
     studentNo: '',
     gender: 'Male',
@@ -34,7 +44,8 @@ export const StudentList: React.FC = () => {
     parentName: '',
     parentPhone: '',
     address: ''
-  });
+  };
+  const [formData, setFormData] = useState(initialForm);
 
   const currentUser = api.auth.getCurrentUser();
 
@@ -56,19 +67,14 @@ export const StudentList: React.FC = () => {
 
   useEffect(() => { loadData(); }, []);
 
-  // --------------- 修复点开始 ---------------
-  // 这里删除了原来的 return false; }; 
-  // 并添加了 hasPermission 函数定义
   const hasPermission = (className: string) => {
     if (!currentUser) return false;
     if (currentUser.role === 'ADMIN') return true;
-    // 如果是老师，检查是否是班主任
     if (currentUser.role === 'TEACHER') {
         return currentUser.homeroomClass === className; 
     }
     return false;
   };
-  // --------------- 修复点结束 ---------------
 
   const handleDelete = async (id: string, className: string) => {
     if (!hasPermission(className)) return alert('您没有权限操作此班级学生');
@@ -102,19 +108,48 @@ export const StudentList: React.FC = () => {
     }
   };
 
-  const handleAddSubmit = async (e: React.FormEvent) => {
+  const handleOpenAdd = () => {
+      setEditStudentId(null);
+      setFormData(initialForm);
+      setIsModalOpen(true);
+  };
+
+  const handleOpenEdit = (student: Student) => {
+      if (!hasPermission(student.className)) return alert('无权编辑此学生');
+      setEditStudentId(student._id || String(student.id));
+      setFormData({
+          name: student.name,
+          studentNo: student.studentNo,
+          gender: (student.gender === 'Female' ? 'Female' : 'Male'), // Ensure type match
+          className: student.className,
+          phone: student.phone || '',
+          idCard: student.idCard || '',
+          parentName: student.parentName || '',
+          parentPhone: student.parentPhone || '',
+          address: student.address || ''
+      });
+      setIsModalOpen(true);
+  };
+
+  const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     setSubmitting(true);
     try {
-      await api.students.add({
+      const payload = {
         ...formData,
-        birthday: '2015-01-01',
+        birthday: '2015-01-01', // Default for now, could add to form
         status: 'Enrolled',
         gender: formData.gender as any
-      });
+      };
+
+      if (editStudentId) {
+         await api.students.update(editStudentId, payload);
+      } else {
+         await api.students.add(payload);
+      }
       setIsModalOpen(false);
       loadData();
-    } catch (error) { alert('添加失败'); } 
+    } catch (error) { alert(editStudentId ? '更新失败' : '添加失败'); } 
     finally { setSubmitting(false); }
   };
 
@@ -181,7 +216,6 @@ export const StudentList: React.FC = () => {
            
            const targetClassName = importTargetClass || getVal(['班级', 'Class'], 99) || '未分配';
            
-           // 使用我们修复好的 hasPermission 函数
            if (!hasPermission(targetClassName)) {
               console.warn('Skipping import for class due to permission:', targetClassName);
               continue; 
@@ -221,9 +255,9 @@ export const StudentList: React.FC = () => {
     return matchesSearch && matchesGrade && matchesClass;
   });
 
-  const uniqueGrades = Array.from(new Set(classList.map(c => c.grade))).sort();
+  const uniqueGrades = Array.from(new Set(classList.map(c => c.grade))).sort(localSortGrades);
   const filteredClasses = classList.filter(c => selectedGrade === 'All' || c.grade === selectedGrade);
-  const uniqueClasses = Array.from(new Set(filteredClasses.map(c => c.className))).sort();
+  const uniqueClasses = Array.from(new Set(filteredClasses.map(c => c.className))).sort(); // Class names usually 1班 2班 sort naturally
 
   const canGlobalAdd = currentUser?.role === 'ADMIN' || (currentUser?.role === 'TEACHER' && currentUser.homeroomClass);
 
@@ -242,7 +276,7 @@ export const StudentList: React.FC = () => {
               <button onClick={() => { setIsImportOpen(true); setImportFile(null); }} className="flex-1 md:flex-none btn-secondary flex items-center justify-center space-x-2 px-3 py-2 border rounded-lg text-sm bg-emerald-50 text-emerald-600 hover:bg-emerald-100 border-emerald-200">
                 <FileSpreadsheet size={16}/><span>Excel导入</span>
               </button>
-              <button onClick={() => setIsModalOpen(true)} className="flex-1 md:flex-none btn-primary flex items-center justify-center space-x-2 px-3 py-2 bg-blue-600 text-white rounded-lg text-sm hover:bg-blue-700">
+              <button onClick={handleOpenAdd} className="flex-1 md:flex-none btn-primary flex items-center justify-center space-x-2 px-3 py-2 bg-blue-600 text-white rounded-lg text-sm hover:bg-blue-700">
                 <Plus size={16}/><span>新增</span>
               </button>
            </div>
@@ -276,13 +310,17 @@ export const StudentList: React.FC = () => {
               <th className="px-6 py-3">基本信息</th>
               <th className="px-6 py-3">学号</th>
               <th className="px-6 py-3">班级</th>
+              <th className="px-6 py-3">家长/住址</th>
+              <th className="px-6 py-3 text-right">操作</th>
             </tr>
           </thead>
           <tbody className="divide-y divide-gray-100">
-            {filteredStudents.length > 0 ? filteredStudents.map(s => (
+            {filteredStudents.length > 0 ? filteredStudents.map(s => {
+              const canEdit = hasPermission(s.className);
+              return (
               <tr key={s._id || s.id} className="hover:bg-blue-50/30 transition-colors">
                 <td className="px-6 py-4">
-                  {hasPermission(s.className) && <input type="checkbox" checked={selectedIds.has(s._id || String(s.id))} onChange={() => toggleSelect(s._id || String(s.id))} />}
+                  {canEdit && <input type="checkbox" checked={selectedIds.has(s._id || String(s.id))} onChange={() => toggleSelect(s._id || String(s.id))} />}
                 </td>
                 <td className="px-6 py-4 flex items-center space-x-3">
                    <div className={`w-8 h-8 rounded-full flex items-center justify-center text-xs text-white ${s.gender==='Male'?'bg-blue-400':'bg-pink-400'}`}>{s.name[0]}</div>
@@ -303,16 +341,16 @@ export const StudentList: React.FC = () => {
                       </div>
                    ) : '-'}
                 </td>
-                <td className="px-6 py-4 text-right">
-                   {hasPermission(s.className) ? (
-                      <button onClick={() => handleDelete(s._id || String(s.id), s.className)} className="text-red-400 hover:text-red-600"><Trash2 size={16}/></button>
-
-
-
+                <td className="px-6 py-4 text-right flex justify-end space-x-2">
+                   {canEdit ? (
+                      <>
+                        <button onClick={() => handleOpenEdit(s)} className="text-blue-400 hover:text-blue-600" title="编辑"><Edit size={16}/></button>
+                        <button onClick={() => handleDelete(s._id || String(s.id), s.className)} className="text-red-400 hover:text-red-600" title="删除"><Trash2 size={16}/></button>
+                      </>
                    ) : <span className="text-gray-300 text-xs">只读</span>}
                 </td>
               </tr>
-            )) : (
+            )}) : (
               <tr>
                 <td colSpan={6} className="text-center py-10 text-gray-400">没有找到匹配的学生</td>
               </tr>
@@ -328,12 +366,12 @@ export const StudentList: React.FC = () => {
          </div>
       )}
 
-      {/* Modal and Import Modal logic remains same, just ensure class selection in Add Modal respects permission */}
+      {/* Modal */}
       {isModalOpen && (
         <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
            <div className="bg-white rounded-xl p-6 w-full max-w-lg max-h-[90vh] overflow-y-auto">
-              <h3 className="font-bold text-lg mb-4">新增学生档案</h3>
-              <form onSubmit={handleAddSubmit} className="space-y-4">
+              <h3 className="font-bold text-lg mb-4">{editStudentId ? '编辑学生档案' : '新增学生档案'}</h3>
+              <form onSubmit={handleSubmit} className="space-y-4">
                  <div className="grid grid-cols-2 gap-4">
                     <input className="w-full border p-2 rounded" placeholder="姓名 *" value={formData.name} onChange={e=>setFormData({...formData, name:e.target.value})} required/>
                     <input className="w-full border p-2 rounded" placeholder="学号 *" value={formData.studentNo} onChange={e=>setFormData({...formData, studentNo:e.target.value})} required/>
@@ -364,8 +402,6 @@ export const StudentList: React.FC = () => {
                  </div>
                  <button type="submit" disabled={submitting} className="w-full bg-blue-600 text-white py-2 rounded mt-4">{submitting?'提交中':'保存'}</button>
                  <button type="button" onClick={()=>setIsModalOpen(false)} className="w-full border py-2 rounded mt-2">取消</button>
-
-
               </form>
            </div>
         </div>
@@ -411,4 +447,4 @@ export const StudentList: React.FC = () => {
       )}
     </div> 
   ); 
-};
+};

pages/SubjectList.tsx

@@ -2,11 +2,13 @@
 import React, { useState, useEffect } from 'react';
 import { Subject } from '../types';
 import { api } from '../services/api';
-import { Loader2, Plus, Trash2, Palette, Edit, Save, X } from 'lucide-react';
+import { Loader2, Plus, Trash2, Palette, Edit, Save, X, Lock } from 'lucide-react';
 
 export const SubjectList: React.FC = () => {
   const [subjects, setSubjects] = useState<Subject[]>([]);
   const [loading, setLoading] = useState(true);
+  const currentUser = api.auth.getCurrentUser();
+  const isAdmin = currentUser?.role === 'ADMIN';
   
   // State for adding new subject
   const [newSub, setNewSub] = useState({ name: '', code: '', color: '#3b82f6', excellenceThreshold: 90 });
@@ -55,6 +57,14 @@ export const SubjectList: React.FC = () => {
     }
   };
 
+  // Permission Check for Teachers
+  const canEditSubject = (sub: Subject) => {
+     if (isAdmin) return true;
+     // Teacher can only edit if it matches their teaching subject
+     if (currentUser?.role === 'TEACHER' && currentUser.teachingSubject === sub.name) return true;
+     return false;
+  };
+
   if(loading) return <div className="flex justify-center p-10"><Loader2 className="animate-spin text-blue-600"/></div>;
 
   return (
@@ -65,7 +75,15 @@ export const SubjectList: React.FC = () => {
            学科设置
          </h2>
 
-         {/* Add Form */}
+         {!isAdmin && (
+            <div className="bg-blue-50 text-blue-700 px-4 py-2 rounded-lg text-sm mb-4 border border-blue-100 flex items-center">
+               <Lock size={14} className="mr-2"/>
+               教师权限提示：您仅可调整自己任教科目 ({currentUser?.teachingSubject || '无'}) 的“优秀线”标准，其他信息只读。
+            </div>
+         )}
+
+         {/* Add Form (Only Admin) */}
+         {isAdmin && (
          <div className="flex flex-col md:flex-row gap-4 mb-8 bg-gray-50 p-4 rounded-lg md:items-end">
             <div className="flex-1">
                <label className="text-xs font-bold text-gray-500 uppercase">学科名称</label>
@@ -95,38 +113,75 @@ export const SubjectList: React.FC = () => {
                <Plus size={16} className="mr-1" /> 添加
             </button>
          </div>
+         )}
 
          {/* List */}
          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
             {subjects.map(sub => {
                const isEditing = editingId === (sub._id || String(sub.id));
+               const canEdit = canEditSubject(sub);
+
                return (
                  <div key={sub._id || sub.id} className="border border-gray-200 rounded-lg p-4 bg-white shadow-sm hover:shadow-md transition-shadow">
                     {isEditing ? (
                        <div className="space-y-3">
-                          <input className="w-full border p-1 rounded text-sm" value={editForm.name} onChange={e => setEditForm({...editForm, name: e.target.value})} />
-                          <div className="flex gap-2">
-                            <input className="w-1/2 border p-1 rounded text-sm" placeholder="代码" value={editForm.code} onChange={e => setEditForm({...editForm, code: e.target.value})} />
-                            <input className="w-1/2 border p-1 rounded text-sm" type="number" placeholder="优秀线" value={editForm.excellenceThreshold} onChange={e => setEditForm({...editForm, excellenceThreshold: Number(e.target.value)})} />
+                          {/* Admin gets full edit, Teacher gets limited edit */}
+                          <div className="space-y-1">
+                             <label className="text-xs text-gray-400">学科名称</label>
+                             <input 
+                                className={`w-full border p-1 rounded text-sm ${!isAdmin ? 'bg-gray-100 text-gray-500' : ''}`} 
+                                value={editForm.name} 
+                                onChange={e => setEditForm({...editForm, name: e.target.value})} 
+                                disabled={!isAdmin}
+                             />
                           </div>
+                          
                           <div className="flex gap-2">
-                             <input type="color" className="h-8 flex-1 cursor-pointer" value={editForm.color} onChange={e => setEditForm({...editForm, color: e.target.value})} />
-                             <button onClick={handleUpdate} className="text-green-600 p-1 border rounded hover:bg-green-50"><Save size={16}/></button>
-                             <button onClick={() => setEditingId(null)} className="text-gray-500 p-1 border rounded hover:bg-gray-50"><X size={16}/></button>
+                            <div className="w-1/2 space-y-1">
+                               <label className="text-xs text-gray-400">代码</label>
+                               <input 
+                                  className={`w-full border p-1 rounded text-sm ${!isAdmin ? 'bg-gray-100 text-gray-500' : ''}`} 
+                                  placeholder="代码" 
+                                  value={editForm.code} 
+                                  onChange={e => setEditForm({...editForm, code: e.target.value})} 
+                                  disabled={!isAdmin}
+                               />
+                            </div>
+                            <div className="w-1/2 space-y-1">
+                               <label className="text-xs text-blue-600 font-bold">优秀线</label>
+                               <input 
+                                  className="w-full border p-1 rounded text-sm border-blue-300 focus:ring-1 focus:ring-blue-500" 
+                                  type="number" 
+                                  placeholder="优秀线" 
+                                  value={editForm.excellenceThreshold} 
+                                  onChange={e => setEditForm({...editForm, excellenceThreshold: Number(e.target.value)})} 
+                                  autoFocus={!isAdmin}
+                               />
+                            </div>
+                          </div>
+                          
+                          <div className="flex gap-2 items-end">
+                             <div className="flex-1">
+                                 <label className="text-xs text-gray-400 block mb-1">颜色</label>
+                                 <input type="color" className="h-8 w-full cursor-pointer" value={editForm.color} onChange={e => setEditForm({...editForm, color: e.target.value})} disabled={!isAdmin} />
+                             </div>
+                             <button onClick={handleUpdate} className="text-green-600 p-1.5 border rounded hover:bg-green-50"><Save size={16}/></button>
+                             <button onClick={() => setEditingId(null)} className="text-gray-500 p-1.5 border rounded hover:bg-gray-50"><X size={16}/></button>
                           </div>
                        </div>
                     ) : (
-                       <div className="flex justify-between items-center">
+                       <div className="flex justify-between items-center h-full">
                           <div className="flex items-center space-x-3">
-                             <div className="w-4 h-4 rounded-full" style={{ backgroundColor: sub.color }}></div>
+                             <div className="w-4 h-4 rounded-full shadow-sm" style={{ backgroundColor: sub.color }}></div>
                              <div>
                                 <p className="font-bold text-gray-800">{sub.name}</p>
-                                <p className="text-xs text-gray-500">{sub.code || '-'} | 优秀线: {sub.excellenceThreshold || 90}</p>
+                                <p className="text-xs text-gray-500">{sub.code || '-'} | 优秀线: <span className="font-bold text-blue-600">{sub.excellenceThreshold || 90}</span></p>
                              </div>
                           </div>
                           <div className="flex space-x-1">
-                             <button onClick={() => handleEdit(sub)} className="text-gray-400 hover:text-blue-500 p-1"><Edit size={16} /></button>
-                             <button onClick={() => handleDelete(sub._id || String(sub.id))} className="text-gray-400 hover:text-red-500 p-1"><Trash2 size={16} /></button>
+                             {canEdit && <button onClick={() => handleEdit(sub)} className="text-gray-400 hover:text-blue-500 p-1" title="编辑"><Edit size={16} /></button>}
+                             {isAdmin && <button onClick={() => handleDelete(sub._id || String(sub.id))} className="text-gray-400 hover:text-red-500 p-1" title="删除"><Trash2 size={16} /></button>}
+                             {!canEdit && !isAdmin && <span className="text-xs text-gray-300">只读</span>}
                           </div>
                        </div>
                     )}