一些bug修复

Author: lzy98276

CHANGELOG/v2.3.0-beta.2/CHANGELOG.md

@@ -13,6 +13,8 @@ v2.3 - Shiroko (砂狼白子) beta 2
 ## 🐛 修复问题
 
 - 修复 **点名/抽奖**，剩余不足时不再重置抽取
+- 修复 **点名/抽奖**，重置后人数标签不更新
+- 修复 **半重复**，重置后历史缓存未刷新
 
 ## 🔧 其它变更
 

app/Language/modules/more_settings.py

@@ -246,6 +246,11 @@
 behind_scenes_settings = {
     "ZH_CN": {
         "title": {"name": "内幕设置", "description": "设置特定人员的抽取概率"},
+        "enabled_global": {
+            "name": "内幕总开关",
+            "description": "开启后启用内幕权重与必中规则",
+            "switchbutton_name": {"enable": "", "disable": ""},
+        },
         "select_mode": {"name": "选择模式", "description": "选择点名或抽奖模式"},
         "mode_options": {"combo_items": ["点名", "抽奖"]},
         "select_list": {"name": "选择名单", "description": "选择要设置概率的名单"},
@@ -268,6 +273,11 @@
             "name": "Behind the Scenes Settings",
             "description": "Set draw probability for specific persons",
         },
+        "enabled_global": {
+            "name": "Master switch",
+            "description": "Enable behind-scenes weights and guaranteed rules",
+            "switchbutton_name": {"enable": "", "disable": ""},
+        },
         "select_mode": {
             "name": "Select Mode",
             "description": "Select roll call or lottery mode",
@@ -302,6 +312,11 @@
             "name": "裏設定",
             "description": "特定の人物の抽選確率を設定",
         },
+        "enabled_global": {
+            "name": "裏設定の総スイッチ",
+            "description": "オンにすると重み付けと必中ルールを有効化",
+            "switchbutton_name": {"enable": "", "disable": ""},
+        },
         "select_mode": {
             "name": "モード選択",
             "description": "点呼または抽選モードを選択",

app/common/behind_scenes/behind_scenes_utils.py

@@ -62,6 +62,12 @@ def get_probability_settings(name, mode, pool_name=None):
         """
         try:
             settings = BehindScenesUtils.get_behind_scenes_settings()
+            if (
+                settings
+                and isinstance(settings, dict)
+                and not settings.get("enabled_global", True)
+            ):
+                return {"enabled": False, "probability": 1.0}
             if name in settings:
                 if mode == 0:
                     # 点名模式
@@ -100,6 +106,12 @@ def apply_probability_weights(
         """
         try:
             settings = BehindScenesUtils.get_behind_scenes_settings()
+            if (
+                settings
+                and isinstance(settings, dict)
+                and not settings.get("enabled_global", True)
+            ):
+                return students_dict_list, [1.0] * len(students_dict_list)
 
             # 构建抽中奖品集合（用于快速查找）
             drawn_prizes = set(prize_list) if prize_list else set()
@@ -193,6 +205,12 @@ def apply_probability_weights_to_items(items, mode, pool_name):
         """
         try:
             settings = BehindScenesUtils.get_behind_scenes_settings()
+            if (
+                settings
+                and isinstance(settings, dict)
+                and not settings.get("enabled_global", True)
+            ):
+                return items, [1.0] * len(items)
 
             filtered_items = []
             weights = []

app/common/lottery/lottery_manager.py

@@ -879,6 +879,14 @@ def stop_animation(widget):
     )
 
     if isinstance(result, dict) and result.get("reset_required"):
+        update_many_count_label(widget)
+        if (
+            hasattr(widget, "remaining_list_page")
+            and widget.remaining_list_page is not None
+            and hasattr(widget.remaining_list_page, "count_changed")
+        ):
+            widget.remaining_list_page.count_changed.emit(widget.remaining_count)
+        QTimer.singleShot(APP_INIT_DELAY, widget._update_remaining_list_delayed)
         return
 
     widget.final_selected_students = result.get("selected_prizes") or result.get(

app/common/roll_call/roll_call_manager.py

@@ -560,6 +560,16 @@ def stop_animation(widget):
 
     result = widget.manager.finalize_draw(widget.current_count, parent=widget)
     if isinstance(result, dict) and result.get("reset_required"):
+        update_many_count_label(widget)
+        if (
+            hasattr(widget, "remaining_list_page")
+            and widget.remaining_list_page is not None
+            and hasattr(widget.remaining_list_page, "count_changed")
+        ):
+            widget.remaining_list_page.count_changed.emit(widget.remaining_count)
+        QTimer.singleShot(
+            APP_INIT_DELAY, lambda: _update_remaining_list_delayed(widget)
+        )
         return
 
     widget.final_selected_students = result.get("selected_students") or []

app/common/roll_call/roll_call_utils.py

@@ -468,6 +468,9 @@ def reset_drawn_records(window, class_name, gender_filter, group_filter):
             group_filter: 小组过滤器
         """
         reset_drawn_record(window, class_name, gender_filter, group_filter)
+        record_key = f"{class_name}_{gender_filter}_{group_filter}"
+        if record_key in RollCallUtils._drawn_record_cache:
+            del RollCallUtils._drawn_record_cache[record_key]
 
     @staticmethod
     def update_start_button_state(button, total_count):

app/view/settings/more_settings/behind_scenes_settings.py

@@ -19,6 +19,7 @@
     read_behind_scenes_settings,
     write_behind_scenes_settings,
 )
+from app.common.behind_scenes.behind_scenes_utils import BehindScenesUtils
 from app.view.settings.list_management.shared_file_watcher import (
     get_shared_file_watcher,
 )
@@ -116,6 +117,22 @@ def __init__(self, parent=None):
 
     def create_class_selection(self):
         """创建班级选择区域"""
+        self.enabled_global_switch = SwitchButton()
+        self.enabled_global_switch.setOffText(
+            get_content_switchbutton_name_async(
+                "behind_scenes_settings", "enabled_global", "disable"
+            )
+        )
+        self.enabled_global_switch.setOnText(
+            get_content_switchbutton_name_async(
+                "behind_scenes_settings", "enabled_global", "enable"
+            )
+        )
+        self.enabled_global_switch.setChecked(self._get_enabled_global_value())
+        self.enabled_global_switch.checkedChanged.connect(
+            self.on_enabled_global_changed
+        )
+
         # 模式选择（点名/抽奖）
         self.mode_comboBox = ComboBox()
         self.mode_comboBox.addItems(
@@ -144,6 +161,12 @@ def create_class_selection(self):
         self.pool_comboBox.setVisible(False)
         self.pool_comboBox.currentIndexChanged.connect(self.refresh_data)
 
+        self.addGroup(
+            get_theme_icon("ic_fluent_power_20_filled"),
+            get_content_name_async("behind_scenes_settings", "enabled_global"),
+            get_content_description_async("behind_scenes_settings", "enabled_global"),
+            self.enabled_global_switch,
+        )
         self.addGroup(
             get_theme_icon("ic_fluent_lottery_20_filled"),
             get_content_name_async("behind_scenes_settings", "select_mode"),
@@ -163,6 +186,26 @@ def create_class_selection(self):
             self.pool_comboBox,
         )
 
+    def _get_enabled_global_value(self) -> bool:
+        try:
+            settings = read_behind_scenes_settings()
+            if not settings or not isinstance(settings, dict):
+                return True
+            return bool(settings.get("enabled_global", True))
+        except Exception:
+            return True
+
+    def on_enabled_global_changed(self):
+        try:
+            settings = read_behind_scenes_settings()
+            if not settings or not isinstance(settings, dict):
+                settings = {}
+            settings["enabled_global"] = bool(self.enabled_global_switch.isChecked())
+            write_behind_scenes_settings(settings)
+            BehindScenesUtils.clear_cache()
+        except Exception as e:
+            logger.exception(f"保存内幕总开关失败: {e}")
+
     def on_mode_changed(self):
         """当模式改变时，更新名单下拉框"""
         mode = self.mode_comboBox.currentIndex()