Skip to content

feat: 增加奖项黑名单 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sakurayang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: 增加奖项黑名单 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 3 additions & 26 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export interface Participant {
name: string;
dept: string;
mustWinPrizeId: string | null; // 内定中特定奖项 ID，null 为无内定
banned: boolean;
bannedPrizes: string[]; // 奖项黑名单：不能中这些奖项的ID数组
weight: number;
}

Expand Down
81 changes: 69 additions & 12 deletions src/pages/AdminPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import { Textarea } from "@/components/ui/textarea";
import { Label } from "@/components/ui/label";
import { Badge } from "@/components/ui/badge";
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "@/components/ui/dialog";
import { Switch } from "@/components/ui/switch";
import { Checkbox } from "@/components/ui/checkbox";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import {
Download, Upload, Trash, Play, Square,
ShieldAlert, MonitorPlay, LogOut,
Expand Down Expand Up @@ -62,7 +63,7 @@ export default function AdminPage() {
// Person Edit State
const [editingPerson, setEditingPerson] = useState<any>(null);
const [isDialogOpen, setIsDialogOpen] = useState(false);
const [editForm, setEditForm] = useState({ name: "", dept: "", mustWinPrizeId: "none", banned: false, weight: 1 });
const [editForm, setEditForm] = useState({ name: "", dept: "", mustWinPrizeId: "none", bannedPrizes: [] as string[], weight: 1 });

// Prize Edit State
const [editingPrize, setEditingPrize] = useState<any>(null);
Expand Down Expand Up @@ -280,7 +281,7 @@ export default function AdminPage() {

const openAddDialog = () => {
setEditingPerson(null);
setEditForm({ name: "", dept: "", mustWinPrizeId: "none", banned: false, weight: 1 });
setEditForm({ name: "", dept: "", mustWinPrizeId: "none", bannedPrizes: [], weight: 1 });
setIsDialogOpen(true);
};

Expand All @@ -290,7 +291,7 @@ export default function AdminPage() {
name: person.name,
dept: person.dept,
mustWinPrizeId: person.mustWinPrizeId || "none",
banned: person.banned,
bannedPrizes: person.bannedPrizes,
weight: person.weight
});
setIsDialogOpen(true);
Expand Down Expand Up @@ -425,7 +426,7 @@ export default function AdminPage() {
p.name.includes(searchTerm) || p.dept.includes(searchTerm)
);
const winnerIds = new Set(winners.map(w => w.id));
const validPool = participants.filter(p => !winnerIds.has(p.id) && !p.banned);
const validPool = participants.filter(p => !winnerIds.has(p.id) && (currentPrizeId ? !p.bannedPrizes.includes(currentPrizeId) : true));
const finalPool = currentPrizeId
? validPool.filter(p => !p.mustWinPrizeId || p.mustWinPrizeId === currentPrizeId)
: [];
Expand Down Expand Up @@ -634,7 +635,7 @@ export default function AdminPage() {
<div className="text-sm flex items-center gap-2">
<span>禁中: </span>
<span className="font-mono font-bold px-2 rounded min-w-[30px] text-center">
{participants.filter(p=>p.banned).length}
{participants.filter(p=>p.bannedPrizes.length > 0).length}
</span>
</div>
</div>
Expand Down Expand Up @@ -677,7 +678,14 @@ export default function AdminPage() {
{p.mustWinPrizeId ? <Badge variant="secondary">{prizeName || '未知奖项'}</Badge> : <span className="text-muted-foreground">-</span>}
</TableCell>
<TableCell className="text-center">
{p.banned ? <Badge variant="destructive">禁止</Badge> : <span className="text-muted-foreground">-</span>}
{p.bannedPrizes.length > 0 ? (
<div className="flex flex-wrap gap-1">
{p.bannedPrizes.map(id => {
const prize = prizes.find(pr => pr.id === id);
return prize ? <Badge key={id} variant="destructive">{prize.name}</Badge> : null;
})}
</div>
) : <span className="text-muted-foreground">-</span>}
</TableCell>
<TableCell className="text-center text-xs font-mono text-muted-foreground">{p.weight}</TableCell>
</>
Expand Down Expand Up @@ -849,12 +857,61 @@ export default function AdminPage() {
</div>
</div>
<div className="grid grid-cols-4 items-center gap-4">
<Label className="text-right">特殊标记</Label>
<Label className="text-right">奖项黑名单</Label>
<div className="col-span-3">
<div className="flex items-center space-x-2">
<Switch id="banned" checked={editForm.banned} onCheckedChange={c => setEditForm({...editForm, banned: c})} />
<Label htmlFor="banned">禁止中奖 (黑名单)</Label>
</div>
<Popover>
<PopoverTrigger asChild>
<Button
variant="outline"
className="w-full justify-between"
>
<span>
{editForm.bannedPrizes.length === 0
? "选择禁止奖项..."
: editForm.bannedPrizes.length === prizes.length
? "全选"
: `已选择 ${editForm.bannedPrizes.length} 项`}
</span>
<span className="text-xs">▼</span>
</Button>
</PopoverTrigger>
<PopoverContent className="w-56 p-0" align="start">
<div className="p-3 space-y-2">
<Button
variant="ghost"
size="sm"
className="w-full justify-start h-8 text-xs"
onClick={() => {
if (editForm.bannedPrizes.length === prizes.length) {
setEditForm({...editForm, bannedPrizes: []});
} else {
setEditForm({...editForm, bannedPrizes: prizes.map(p => p.id)});
}
}}
>
{editForm.bannedPrizes.length === prizes.length ? "取消全选" : "全选"}
</Button>
<div className="border-t pt-2">
{prizes.map(prize => (
<div key={prize.id} className="flex items-center space-x-2 p-2 hover:bg-accent rounded">
<Checkbox
id={`banned-popover-${prize.id}`}
checked={editForm.bannedPrizes.includes(prize.id)}
onCheckedChange={(checked) => {
if (checked) {
setEditForm({...editForm, bannedPrizes: [...editForm.bannedPrizes, prize.id]});
} else {
setEditForm({...editForm, bannedPrizes: editForm.bannedPrizes.filter(id => id !== prize.id)});
}
}}
/>
<Label htmlFor={`banned-popover-${prize.id}`} className="text-sm cursor-pointer">{prize.name}</Label>
</div>
))}
</div>
</div>
</PopoverContent>
</Popover>
</div>
</div>
</>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/DisplayPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function DisplayPage() {

// 当前奖项信息
const currentPrize = prizes.find(p => p.id === currentPrizeId);
const candidates = participants.filter(p => !p.banned);
const candidates = participants.filter(p => currentPrizeId ? !p.bannedPrizes.includes(currentPrizeId) : true);

// 监听 Store 变化 (仅保留状态更新，不再播放音效)
useEffect(() => {
Expand Down
20 changes: 14 additions & 6 deletions src/store/useStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const useLotteryStore = create<LotteryState>()(
name: row['姓名'] || row['name'] || 'Unknown',
dept: row['部门'] || row['dept'] || '',
mustWinPrizeId: null,
banned: false,
bannedPrizes: [],
weight: 1,
};

Expand All @@ -90,7 +90,15 @@ export const useLotteryStore = create<LotteryState>()(
const prize = currentPrizes.find(p => p.name === prizeName);
if (prize) participant.mustWinPrizeId = prize.id;
}
participant.banned = (row['禁止中奖(是/否)'] === '是' || row['banned'] === 'true');
// 解析奖项黑名单：逗号分隔的奖项名称
const bannedPrizeNames = row['禁止奖项'] || row['bannedPrizes'] || '';
if (bannedPrizeNames) {
const names = bannedPrizeNames.split(',').map((n: string) => n.trim());
participant.bannedPrizes = names.map((name: string) => {
const prize = currentPrizes.find(p => p.name === name);
return prize ? prize.id : '';
}).filter(id => id);
}
participant.weight = parseInt(row['权重(1-10)'] || row['weight'] || '1') || 1;
}

Expand Down Expand Up @@ -135,7 +143,7 @@ export const useLotteryStore = create<LotteryState>()(
}

const winnerIds = new Set(winners.map(w => w.id));
const validPool = participants.filter(p => !winnerIds.has(p.id) && !p.banned);
const validPool = participants.filter(p => !winnerIds.has(p.id) && !p.bannedPrizes.includes(currentPrizeId));
const finalPool = validPool.filter(p => !p.mustWinPrizeId || p.mustWinPrizeId === currentPrizeId);
if (finalPool.length === 0) {
set({ isRolling: false, roundWinners: [] });
Expand All @@ -161,11 +169,11 @@ export const useLotteryStore = create<LotteryState>()(

// 1. 排除历史已中奖
const winnerIds = new Set(winners.map(w => w.id));
// 2. 排除黑名单
const validPool = participants.filter(p => !winnerIds.has(p.id) && !p.banned);
// 2. 排除奖项黑名单
const validPool = participants.filter(p => !winnerIds.has(p.id) && !p.bannedPrizes.includes(currentPrizeId));
// 3. 找出当前奖项的内定者
const mustWinCandidates = participants.filter(p =>
p.mustWinPrizeId === currentPrizeId && !winnerIds.has(p.id) && !p.banned
p.mustWinPrizeId === currentPrizeId && !winnerIds.has(p.id) && !p.bannedPrizes.includes(currentPrizeId)
);

// 4. 执行算法
Expand Down
Loading