Update pages/GameRandom.tsx

pages/GameRandom.tsx

@@ -32,7 +32,7 @@ export const GameRandom: React.FC = () => {
   const [rewardType, setRewardType] = useState<'DRAW_COUNT' | 'ITEM' | 'ACHIEVEMENT'>('DRAW_COUNT');
   const [rewardId, setRewardId] = useState(''); // Achievement ID or Item Name
   const [rewardCount, setRewardCount] = useState(1);
-  const [enableReward, setEnableReward] = useState(true);
+  // Removed explicit enableReward state dependency for immediate actions to avoid async bugs
 
   const timerRef = useRef<any>(null);
   const speedRef = useRef<number>(50);
@@ -48,7 +48,7 @@ export const GameRandom: React.FC = () => {
   // Clear picked IDs when mode changes to avoid ID confusion
   useEffect(() => {
       setPickedIds(new Set());
-  }, [mode]);
+  }, [mode, scopeTeamId]);
 
   const loadData = async () => {
     if (!homeroomClass) return setLoading(false);
@@ -92,7 +92,7 @@ export const GameRandom: React.FC = () => {
           baseList = baseList.filter(s => !excludedStudentIds.has(s._id || String(s.id)));
       }
       
-      // NEW: Filter out previously picked if mode is on
+      // 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))));
       }
@@ -104,7 +104,11 @@ export const GameRandom: React.FC = () => {
       const list = getTargetList();
       if (list.length === 0) {
           if (avoidRepeat && pickedIds.size > 0) {
-              return alert('本轮所有候选对象已全部点完！请点击上方“重置记录”重新开始。');
+              if (confirm('本轮所有候选对象已全部点完！是否重置记录并重新开始？')) {
+                  setPickedIds(new Set());
+                  // Logic to restart immediately after reset could go here, but let's just reset first
+              }
+              return;
           }
           return alert('当前范围内没有可选对象');
       }
@@ -156,8 +160,9 @@ export const GameRandom: React.FC = () => {
       setIsRunning(false);
   };
 
-  const handleGrantReward = async () => {
-      if (!selectedResult || !enableReward) {
+  // Fixed: Pass `shouldReward` directly to avoid async state issues
+  const handleGrantReward = async (shouldReward: boolean) => {
+      if (!selectedResult || !shouldReward) {
           setShowResultModal(false);
           return;
       }
@@ -200,7 +205,7 @@ export const GameRandom: React.FC = () => {
               }
           });
           await Promise.all(promises);
-          alert(`已发放奖励给 ${targets.length} 名学生！`);
+          // Optional: Show success toast
       } catch (e) {
           console.error(e);
           alert('发放失败');
@@ -227,6 +232,7 @@ export const GameRandom: React.FC = () => {
             {isFullscreen ? <Minimize size={20}/> : <Maximize size={20}/>}
             <span className="text-xs font-bold hidden sm:inline">{isFullscreen ? '退出全屏' : '全屏模式'}</span>
         </button>
+        
         {/* Header Config */}
         <div className="bg-white p-4 shadow-sm border-b border-gray-200 z-10 flex flex-wrap gap-4 items-center justify-between shrink-0 pr-36">
             <div className="flex flex-wrap gap-4 items-center">
@@ -247,15 +253,15 @@ export const GameRandom: React.FC = () => {
                 
                 {/* 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">
+                    <div className="flex items-center gap-2" title="开启后，已点过的学生/小组不会再次被选中">
                         <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>
+                        <label htmlFor="avoidRepeat" className={`text-sm font-bold cursor-pointer select-none ${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="重置记录">
+                            <button onClick={() => setPickedIds(new Set())} className="text-indigo-400 hover:text-indigo-700 p-1 rounded-full hover:bg-indigo-100 transition-colors" title="重置记录">
                                 <RotateCcw size={14}/>
                             </button>
                         </>
@@ -290,6 +296,7 @@ export const GameRandom: React.FC = () => {
                 </div>
             </div>
         </div>
+        
         {/* Grid Area */}
         <div className="flex-1 overflow-y-auto p-6 custom-scrollbar bg-slate-50">
             <div className={`grid gap-4 transition-all pb-24 ${mode==='STUDENT' ? (isFullscreen ? 'grid-cols-6 sm:grid-cols-8 md:grid-cols-10 lg:grid-cols-12' : 'grid-cols-4 sm:grid-cols-6 md:grid-cols-8 lg:grid-cols-10') : 'grid-cols-2 md:grid-cols-3 lg:grid-cols-4'}`}>
@@ -325,6 +332,7 @@ export const GameRandom: React.FC = () => {
                 })}
             </div>
         </div>
+        
         {/* Start Button */}
         <div className="absolute bottom-0 left-0 right-0 p-6 flex justify-center bg-white/90 backdrop-blur-sm border-t border-gray-200 z-10 shadow-[0_-4px_10px_-1px_rgba(0,0,0,0.1)]">
             <button 
@@ -389,12 +397,12 @@ export const GameRandom: React.FC = () => {
                     {/* @ts-ignore */}
                     <div className="text-gray-400 mb-8">{mode==='STUDENT' ? `座号: ${selectedResult.seatNo || '-'}` : `${selectedResult.members.length} 位成员`}</div>
                     <div className="grid grid-cols-2 gap-4 mb-4">
-                        <button onClick={() => { setEnableReward(true); handleGrantReward(); }} className="bg-green-500 hover:bg-green-600 text-white py-4 rounded-2xl font-bold text-lg flex flex-col items-center justify-center shadow-md transition-transform hover:-translate-y-1">
+                        <button onClick={() => handleGrantReward(true)} className="bg-green-500 hover:bg-green-600 text-white py-4 rounded-2xl font-bold text-lg flex flex-col items-center justify-center shadow-md transition-transform hover:-translate-y-1">
                             <CheckCircle size={32} className="mb-1"/>
                             回答正确
                             <span className="text-xs font-normal opacity-80 mt-1">发放奖励</span>
                         </button>
-                        <button onClick={() => { setEnableReward(false); handleGrantReward(); }} className="bg-gray-100 hover:bg-gray-200 text-gray-600 py-4 rounded-2xl font-bold text-lg flex flex-col items-center justify-center shadow-sm transition-transform hover:-translate-y-1">
+                        <button onClick={() => handleGrantReward(false)} className="bg-gray-100 hover:bg-gray-200 text-gray-600 py-4 rounded-2xl font-bold text-lg flex flex-col items-center justify-center shadow-sm transition-transform hover:-translate-y-1">
                             <XCircle size={32} className="mb-1"/>
                             回答错误
                             <span className="text-xs font-normal opacity-80 mt-1">无奖励</span>