Upload 26 files

pages/Login.tsx

@@ -33,6 +33,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
   // School Specific Metadata for linkage
   const [schoolClasses, setSchoolClasses] = useState<ClassInfo[]>([]);
   const [schoolSubjects, setSchoolSubjects] = useState<Subject[]>([]);
+  const [publicConfig, setPublicConfig] = useState({ allowRegister: true, allowAdminRegister: false });
 
   const [error, setError] = useState('');
   const [loading, setLoading] = useState(false);
@@ -41,6 +42,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
   useEffect(() => {
     if (view === 'register') {
       api.schools.getPublic().then(setSchools).catch(console.error);
+      api.config.getPublic().then(setPublicConfig).catch(console.error);
     }
   }, [view]);
 
@@ -89,7 +91,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
   // Render Steps
   const renderStep1 = () => (
     <div className="space-y-4 animate-in fade-in">
-      <h3 className="text-center font-bold text-gray-700 mb-4">第一步: 选择所属学校</h3>
+      <h3 className="text-center font-bold text-gray-700 mb-4">第一步: 选择所属学校 & 角色</h3>
       <div>
         <label className="text-sm font-medium text-gray-700">学校列表</label>
         <select 
@@ -100,7 +102,20 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
           <option value="">-- 请选择 --</option>
           {schools.map(s => <option key={s._id} value={s._id}>{s.name}</option>)}
         </select>
-        <p className="text-xs text-gray-500 mt-2">提示：系统仅面向教职工开放注册</p>
+      </div>
+      <div>
+        <label className="text-sm font-medium text-gray-700">申请身份</label>
+        <select 
+          className="w-full mt-1 p-2 border rounded-lg focus:ring-2 focus:ring-blue-500 h-10 bg-white"
+          value={regForm.role}
+          onChange={e => setRegForm({...regForm, role: e.target.value as any})}
+        >
+          <option value={UserRole.TEACHER}>教师</option>
+          {publicConfig.allowAdminRegister && <option value={UserRole.ADMIN}>学校管理员</option>}
+        </select>
+        {regForm.role === UserRole.ADMIN && (
+           <p className="text-xs text-amber-600 mt-1">注意：管理员权限需要经过严格审核</p>
+        )}
       </div>
       <button 
         type="button" 
@@ -115,7 +130,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
 
   const renderStep2 = () => (
     <div className="space-y-3 animate-in fade-in">
-      <h3 className="text-center font-bold text-gray-700 mb-2">第二步: 完善教职工信息</h3>
+      <h3 className="text-center font-bold text-gray-700 mb-2">第二步: 完善信息</h3>
       
       {/* Account Info */}
       <div className="grid grid-cols-2 gap-2">
@@ -145,9 +160,9 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
         />
       </div>
 
-      {/* Teacher Linkage */}
+      {/* Teacher Linkage - Show for both Teachers AND Admins who might teach */}
       <div className="bg-blue-50 p-3 rounded-lg space-y-2 border border-blue-100">
-         <p className="text-xs font-bold text-blue-600 uppercase">教学信息绑定</p>
+         <p className="text-xs font-bold text-blue-600 uppercase">教学信息绑定 (可选)</p>
          <div>
             <label className="text-xs text-gray-600 block mb-1">主要任教科目</label>
             <select 
@@ -160,7 +175,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
             </select>
          </div>
          <div>
-            <label className="text-xs text-gray-600 block mb-1">我是班主任 (可选)</label>
+            <label className="text-xs text-gray-600 block mb-1">我是班主任</label>
             <select 
                className="w-full p-1.5 border rounded text-sm"
                value={regForm.homeroomClass}
@@ -269,4 +284,4 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
       </div>
     </div>
   );
-};
+};

pages/Settings.tsx

@@ -10,6 +10,7 @@ export const Settings: React.FC = () => {
   const [config, setConfig] = useState({
     systemName: '智慧校园管理系统',
     allowRegister: true,
+    allowAdminRegister: false,
     maintenanceMode: false,
     emailNotify: true,
     semester: '2023-2024学年 第一学期'
@@ -143,8 +144,8 @@ export const Settings: React.FC = () => {
         <div className="p-6 space-y-4">
           <div className="flex items-center justify-between p-4 bg-gray-50 rounded-lg">
             <div>
-              <p className="font-medium text-gray-900">开放新用户注册</p>
-              <p className="text-sm text-gray-500">允许教师或学生自行注册账号</p>
+              <p className="font-medium text-gray-900">开放教师注册</p>
+              <p className="text-sm text-gray-500">允许教师自行注册账号</p>
             </div>
             <label className="relative inline-flex items-center cursor-pointer">
               <input type="checkbox" checked={config.allowRegister} onChange={(e) => setConfig({...config, allowRegister: e.target.checked})} className="sr-only peer" />
@@ -152,6 +153,17 @@ export const Settings: React.FC = () => {
             </label>
           </div>
 
+          <div className="flex items-center justify-between p-4 bg-gray-50 rounded-lg">
+            <div>
+              <p className="font-medium text-gray-900">开放管理员注册申请</p>
+              <p className="text-sm text-gray-500">允许用户在注册时申请成为管理员 (需审核)</p>
+            </div>
+            <label className="relative inline-flex items-center cursor-pointer">
+              <input type="checkbox" checked={config.allowAdminRegister} onChange={(e) => setConfig({...config, allowAdminRegister: e.target.checked})} className="sr-only peer" />
+              <div className="w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-blue-600"></div>
+            </label>
+          </div>
+
           <div className="flex items-center justify-between p-4 bg-gray-50 rounded-lg">
             <div>
               <p className="font-medium text-gray-900">系统维护模式</p>

pages/UserList.tsx

@@ -9,11 +9,17 @@ export const UserList: React.FC = () => {
   const [schools, setSchools] = useState<School[]>([]);
   const [loading, setLoading] = useState(true);
   const [editingUser, setEditingUser] = useState<User | null>(null);
+  
+  const currentUser = api.auth.getCurrentUser();
 
   const loadData = async () => {
     setLoading(true);
     try {
-      const [u, s] = await Promise.all([api.users.getAll(), api.schools.getAll()]);
+      // Load ALL users globally, bypassing school filter
+      const [u, s] = await Promise.all([
+         api.users.getAll({ global: true }), 
+         api.schools.getAll()
+      ]);
       setUsers(u);
       setSchools(s);
     } catch (e) { console.error(e); }
@@ -55,7 +61,10 @@ export const UserList: React.FC = () => {
 
   return (
     <div className="bg-white rounded-xl shadow-sm border border-gray-100 p-6">
-      <h2 className="text-xl font-bold text-gray-800 mb-4">用户权限与审核</h2>
+      <div className="flex justify-between items-center mb-4">
+         <h2 className="text-xl font-bold text-gray-800">用户权限与审核</h2>
+         <span className="text-xs text-gray-500 bg-gray-100 px-2 py-1 rounded">全局视图 (显示所有学校用户)</span>
+      </div>
       
       <div className="overflow-x-auto">
         <table className="w-full text-left border-collapse min-w-[1000px]">
@@ -71,13 +80,15 @@ export const UserList: React.FC = () => {
             </tr>
           </thead>
           <tbody className="divide-y divide-gray-100">
-            {users.map(user => (
+            {users.map(user => {
+              const isSelf = currentUser && (user._id === currentUser._id || user.username === currentUser.username);
+              return (
               <tr key={user._id || user.id} className="hover:bg-gray-50">
                 <td className="px-4 py-3">
                    <div className="flex items-center space-x-3">
                       <img src={user.avatar || `https://api.dicebear.com/7.x/avataaars/svg?seed=${user.username}`} className="w-8 h-8 rounded-full" />
                       <div>
-                         <p className="font-bold text-gray-800 text-sm">{user.trueName || user.username}</p>
+                         <p className="font-bold text-gray-800 text-sm">{user.trueName || user.username} {isSelf && '(我)'}</p>
                          <p className="text-xs text-gray-500">@{user.username}</p>
                       </div>
                    </div>
@@ -87,7 +98,7 @@ export const UserList: React.FC = () => {
                    <div className="text-xs text-gray-400">{user.email}</div>
                 </td>
                 <td className="px-4 py-3 text-sm">
-                   {editingUser?._id === user._id ? (
+                   {editingUser?._id === user._id && !isSelf ? (
                       <select 
                         className="border rounded p-1 text-xs w-32"
                         value={user.schoolId} 
@@ -98,9 +109,9 @@ export const UserList: React.FC = () => {
                          {schools.map(s => <option key={s._id} value={s._id}>{s.name}</option>)}
                       </select>
                    ) : (
-                      <div className="flex items-center space-x-1 group cursor-pointer" onClick={() => setEditingUser(user)}>
+                      <div className={`flex items-center space-x-1 group ${!isSelf ? 'cursor-pointer' : ''}`} onClick={() => !isSelf && setEditingUser(user)}>
                          <span className="text-gray-700">{getSchoolName(user.schoolId)}</span>
-                         <Edit size={12} className="text-gray-300 opacity-0 group-hover:opacity-100"/>
+                         {!isSelf && <Edit size={12} className="text-gray-300 opacity-0 group-hover:opacity-100"/>}
                       </div>
                    )}
                 </td>
@@ -120,8 +131,8 @@ export const UserList: React.FC = () => {
                    <select 
                      value={user.role} 
                      onChange={(e) => handleRoleChange(user, e.target.value as UserRole)}
-                     disabled={user.username === 'admin'}
-                     className="bg-white border border-gray-200 rounded px-2 py-1 text-xs focus:ring-2 focus:ring-blue-500"
+                     disabled={user.username === 'admin' || isSelf} // Cannot change self or super admin
+                     className="bg-white border border-gray-200 rounded px-2 py-1 text-xs focus:ring-2 focus:ring-blue-500 disabled:bg-gray-100 disabled:text-gray-400"
                    >
                      <option value={UserRole.ADMIN}>管理员</option>
                      <option value={UserRole.TEACHER}>教师</option>
@@ -137,13 +148,20 @@ export const UserList: React.FC = () => {
                    {user.status === UserStatus.PENDING && (
                      <button onClick={() => handleApprove(user)} className="text-green-600 hover:bg-green-50 p-1 rounded" title="通过审核"><Check size={18} /></button>
                    )}
-                   <button onClick={() => handleDelete(user)} className="text-red-600 hover:bg-red-50 p-1 rounded" title="删除" disabled={user.username === 'admin'}><Trash2 size={18} /></button>
+                   <button 
+                     onClick={() => handleDelete(user)} 
+                     className={`p-1 rounded ${user.username === 'admin' || isSelf ? 'text-gray-300 cursor-not-allowed' : 'text-red-600 hover:bg-red-50'}`}
+                     title="删除" 
+                     disabled={user.username === 'admin' || isSelf}
+                   >
+                     <Trash2 size={18} />
+                   </button>
                 </td>
               </tr>
-            ))}
+            );})}
           </tbody>
         </table>
       </div>
     </div>
   );
-};
+};

server.js

@@ -147,6 +147,7 @@ const ConfigSchema = new mongoose.Schema({
   systemName: String,
   semester: String,
   allowRegister: Boolean,
+  allowAdminRegister: { type: Boolean, default: false }, // New
   maintenanceMode: Boolean,
   emailNotify: Boolean
 });
@@ -223,6 +224,14 @@ app.get('/api/public/schools', async (req, res) => {
   res.json(schools);
 });
 
+app.get('/api/public/config', async (req, res) => {
+  // Try to find any config or default
+  if (InMemoryDB.isFallback) return res.json({ allowRegister: true, allowAdminRegister: true });
+  // In a real multi-tenant system, config might depend on domain, but here we pick the first available or default
+  const config = await ConfigModel.findOne() || { allowRegister: true, allowAdminRegister: false };
+  res.json(config);
+});
+
 app.get('/api/public/meta', async (req, res) => {
   const { schoolId } = req.query;
   if (!schoolId) return res.json({ classes: [], subjects: [] });
@@ -306,8 +315,14 @@ app.put('/api/schools/:id', async (req, res) => {
 
 // --- Users ---
 app.get('/api/users', async (req, res) => {
-  const filter = getQueryFilter(req);
-  if (InMemoryDB.isFallback) return res.json(InMemoryDB.users.filter(u => !filter.schoolId || u.schoolId === filter.schoolId));
+  // If global=true is passed, ignore school filter (for User Management page)
+  const { global } = req.query;
+  const filter = global === 'true' ? {} : getQueryFilter(req);
+  
+  if (InMemoryDB.isFallback) {
+    if (global === 'true') return res.json(InMemoryDB.users);
+    return res.json(InMemoryDB.users.filter(u => !filter.schoolId || u.schoolId === filter.schoolId));
+  }
   const users = await User.find(filter).sort({ createTime: -1 });
   res.json(users);
 });
@@ -327,10 +342,6 @@ app.put('/api/users/:id', async (req, res) => {
     // Linkage Logic: If approving a teacher, and they are a homeroom teacher, update the Class record.
     if (updateData.status === 'active' && user.role === 'TEACHER' && user.homeroomClass) {
         // Find Class by name (e.g. "六年级(1)班") and SchoolId
-        // Need to parse grade and className or store exact match.
-        // Assuming user.homeroomClass stores "六年级(1)班", we need to match it.
-        // Simple regex or strict match if format aligns.
-        // For robustness, let's try to match concatenation.
         const classes = await ClassModel.find({ schoolId: user.schoolId });
         const targetClass = classes.find(c => (c.grade + c.className) === user.homeroomClass);
         
@@ -515,4 +526,4 @@ app.get('*', (req, res) => {
   res.sendFile(path.join(__dirname, 'dist', 'index.html'));
 });
 
-app.listen(PORT, () => console.log(`🚀 Service running on port ${PORT}`));
+app.listen(PORT, () => console.log(`🚀 Service running on port ${PORT}`));

services/api.ts

@@ -92,7 +92,8 @@ export const api = {
   },
 
   users: {
-    getAll: () => request('/users'),
+    // If global is true, ask backend to ignore schoolId filter
+    getAll: (options?: { global?: boolean }) => request(`/users${options?.global ? '?global=true' : ''}`),
     update: (id: string, data: Partial<User>) => request(`/users/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
     delete: (id: string) => request(`/users/${id}`, { method: 'DELETE' })
   },
@@ -141,6 +142,7 @@ export const api = {
 
   config: {
     get: () => request('/config'),
+    getPublic: () => request('/public/config'),
     save: (data: SystemConfig) => request('/config', { method: 'POST', body: JSON.stringify(data) })
   },
 

types.ts

@@ -61,6 +61,7 @@ export interface SystemConfig {
   systemName: string;
   semester: string;
   allowRegister: boolean;
+  allowAdminRegister: boolean; // New: Admin registration toggle
   maintenanceMode: boolean;
   emailNotify: boolean;
 }
@@ -121,4 +122,4 @@ export interface ApiResponse<T> {
   message: string;
   data: T;
   timestamp: number;
-}
+}