Update pages/GameRandom.tsx

pages/GameRandom.tsx

@@ -3,7 +3,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import { api } from '../services/api';
 import { Student, GameSession, GameTeam, AchievementConfig } from '../types';
-import { Loader2, User, Users, Play, Pause, Gift, CheckCircle, XCircle, Award, Volume2, Settings, Maximize, Minimize, UserX } from 'lucide-react';
+import { Loader2, User, Users, Play, Pause, Gift, CheckCircle, XCircle, Award, Volume2, Settings, Maximize, Minimize, UserX, RotateCcw, Repeat } from 'lucide-react';
 
 export const GameRandom: React.FC = () => {
   const [loading, setLoading] = useState(true);
@@ -20,6 +20,10 @@ export const GameRandom: React.FC = () => {
   const [showResultModal, setShowResultModal] = useState(false);
   const [isFullscreen, setIsFullscreen] = useState(false);
 
+  // Avoidance / No Repeat State
+  const [avoidRepeat, setAvoidRepeat] = useState(false);
+  const [pickedIds, setPickedIds] = useState<Set<string>>(new Set());
+
   // Filter State
   const [excludedStudentIds, setExcludedStudentIds] = useState<Set<string>>(new Set());
   const [isFilterOpen, setIsFilterOpen] = useState(false);
@@ -41,6 +45,11 @@ export const GameRandom: React.FC = () => {
     return () => stopAnimation();
   }, []);
 
+  // Clear picked IDs when mode changes to avoid ID confusion
+  useEffect(() => {
+      setPickedIds(new Set());
+  }, [mode]);
+
   const loadData = async () => {
     if (!homeroomClass) return setLoading(false);
     try {
@@ -67,23 +76,38 @@ export const GameRandom: React.FC = () => {
   };
 
   const getTargetList = () => {
-      if (mode === 'TEAM') return teams;
-      
-      let baseList = students;
-      if (scopeTeamId !== 'ALL') {
-          const team = teams.find(t => t.id === scopeTeamId);
-          if (team) {
-              baseList = students.filter(s => team.members.includes(s._id || String(s.id)));
+      let baseList: any[] = [];
+
+      if (mode === 'TEAM') {
+          baseList = teams;
+      } else {
+          baseList = students;
+          if (scopeTeamId !== 'ALL') {
+              const team = teams.find(t => t.id === scopeTeamId);
+              if (team) {
+                  baseList = students.filter(s => team.members.includes(s._id || String(s.id)));
+              }
           }
+          // Filter out excluded (absent) students
+          baseList = baseList.filter(s => !excludedStudentIds.has(s._id || String(s.id)));
       }
       
-      // Filter out excluded students
-      return baseList.filter(s => !excludedStudentIds.has(s._id || String(s.id)));
+      // NEW: Filter out previously picked if mode is on
+      if (avoidRepeat) {
+          baseList = baseList.filter(item => !pickedIds.has(mode === 'TEAM' ? item.id : (item._id || String(item.id))));
+      }
+
+      return baseList;
   };
 
   const startRandom = () => {
       const list = getTargetList();
-      if (list.length === 0) return alert('当前范围内没有可选对象');
+      if (list.length === 0) {
+          if (avoidRepeat && pickedIds.size > 0) {
+              return alert('本轮所有候选对象已全部点完！请点击上方“重置记录”重新开始。');
+          }
+          return alert('当前范围内没有可选对象');
+      }
       
       setIsRunning(true);
       setShowResultModal(false);
@@ -116,6 +140,13 @@ export const GameRandom: React.FC = () => {
           const result = list[prev];
           setSelectedResult(result);
           setShowResultModal(true);
+
+          // Add to picked history
+          if (avoidRepeat) {
+              const id = mode === 'TEAM' ? result.id : (result._id || String(result.id));
+              setPickedIds(prev => new Set(prev).add(id));
+          }
+
           return prev;
       });
   };
@@ -214,6 +245,23 @@ export const GameRandom: React.FC = () => {
                     </select>
                 )}
                 
+                {/* Avoid Repeat Logic */}
+                <div className={`flex items-center gap-2 px-3 py-2 rounded-lg border transition-colors ${avoidRepeat ? 'bg-indigo-50 border-indigo-200' : 'bg-gray-50 border-gray-200'}`}>
+                    <div className="flex items-center gap-2">
+                        <input type="checkbox" id="avoidRepeat" checked={avoidRepeat} onChange={e => setAvoidRepeat(e.target.checked)} className="w-4 h-4 text-indigo-600 rounded focus:ring-indigo-500 cursor-pointer"/>
+                        <label htmlFor="avoidRepeat" className={`text-sm font-bold cursor-pointer ${avoidRepeat ? 'text-indigo-700' : 'text-gray-600'}`}>不重复</label>
+                    </div>
+                    {avoidRepeat && pickedIds.size > 0 && (
+                        <>
+                            <div className="w-px h-4 bg-indigo-200 mx-1"></div>
+                            <span className="text-xs text-indigo-500 font-mono">已点{pickedIds.size}</span>
+                            <button onClick={() => setPickedIds(new Set())} className="text-indigo-400 hover:text-indigo-700 p-1 rounded-full hover:bg-indigo-100" title="重��记录">
+                                <RotateCcw size={14}/>
+                            </button>
+                        </>
+                    )}
+                </div>
+
                 <button 
                     onClick={() => setIsFilterOpen(true)} 
                     className={`flex items-center gap-1 px-3 py-2 rounded-lg text-sm border font-medium ${excludedStudentIds.size > 0 ? 'bg-red-50 text-red-600 border-red-200' : 'bg-gray-50 text-gray-600 border-gray-200'}`}