修复 名单设置界面逻辑，解决 班级名称和奖池名称同时为空 及 未设置班级仍可点击其他按钮 的问题

Author: lzy98276

CHANGELOG/v1.3.2-alpha.5/CHANGELOG.md

@@ -24,6 +24,7 @@ v2.0 - Koharu（小鸟游星野） Alpha 5
 - 修复 **闪抽历史记录**，解决无法记录历史记录&临时记录的问题
 - 修复 **浮窗周期性置顶**，解决功能未生效的问题
 - 修复 **重复模式剩余人数**，解决直接显示结果时剩余人数不更新的问题
+- 修复 **名单设置界面逻辑**，解决 **班级名称和奖池名称同时为空** 及 **未设置班级仍可点击其他按钮** 的问题
 
 ## 🔧 其它变更
 

app/Language/modules/lottery_list.py

@@ -16,10 +16,6 @@
         "error_title": {"name": "错误", "description": "错误消息标题"},
         "success_title": {"name": "成功", "description": "成功消息标题"},
         "info_title": {"name": "提示", "description": "信息消息标题"},
-        "no_prize_names_error": {
-            "name": "请至少输入一个奖池名称",
-            "description": "未输入奖池名称时的错误提示",
-        },
         "invalid_names_error": {
             "name": "以下奖池名称包含非法字符或为保留字: {names}",
             "description": "奖池名称验证失败时的错误提示",

app/Language/modules/roll_call_list.py

@@ -16,10 +16,6 @@
         "error_title": {"name": "错误", "description": "错误消息标题"},
         "success_title": {"name": "成功", "description": "成功消息标题"},
         "info_title": {"name": "提示", "description": "信息消息标题"},
-        "no_class_names_error": {
-            "name": "请至少输入一个班级名称",
-            "description": "未输入班级名称时的错误提示",
-        },
         "invalid_names_error": {
             "name": "以下班级名称包含非法字符或为保留字: {names}",
             "description": "班级名称验证失败时的错误提示",

app/view/another_window/prize/set_pool_name.py

@@ -185,17 +185,6 @@ def __save_pool_names(self):
         try:
             # 获取输入的奖池名称
             pool_names_text = self.text_edit.toPlainText().strip()
-            if not pool_names_text:
-                # 显示错误消息
-                config = NotificationConfig(
-                    title=get_content_name_async("set_prize_name", "error_title"),
-                    content=get_content_name_async(
-                        "set_prize_name", "no_prize_names_error"
-                    ),
-                    duration=3000,
-                )
-                show_notification(NotificationType.ERROR, config, parent=self)
-                return
 
             # 分割奖池名称
             pool_names = [

app/view/another_window/student/set_class_name.py

@@ -185,17 +185,6 @@ def __save_class_names(self):
         try:
             # 获取输入的班级名称
             class_names_text = self.text_edit.toPlainText().strip()
-            if not class_names_text:
-                # 显示错误消息
-                config = NotificationConfig(
-                    title=get_content_name_async("set_class_name", "error_title"),
-                    content=get_content_name_async(
-                        "set_class_name", "no_class_names_error"
-                    ),
-                    duration=3000,
-                )
-                show_notification(NotificationType.ERROR, config, parent=self)
-                return
 
             # 分割班级名称
             class_names = [

app/view/settings/list_management/list_management.py

@@ -55,23 +55,6 @@ def __init__(self, parent=None):
 
         # 选择班级下拉框
         self.class_name_combo = ComboBox()
-        self.refresh_class_list()  # 初始化班级列表
-        if not get_class_name_list():
-            self.class_name_combo.setCurrentIndex(-1)
-            self.class_name_combo.setPlaceholderText(
-                get_content_name_async("roll_call_list", "select_class_name")
-            )
-        else:
-            self.class_name_combo.setCurrentText(
-                readme_settings_async("roll_call_list", "select_class_name")
-            )
-        self.class_name_combo.currentIndexChanged.connect(
-            lambda: update_settings(
-                "roll_call_list",
-                "select_class_name",
-                self.class_name_combo.currentText(),
-            )
-        )
 
         # 导入学生名单按钮
         self.import_student_button = PushButton(
@@ -147,9 +130,31 @@ def __init__(self, parent=None):
             self.export_student_button,
         )
 
+        # 初始化班级列表（在所有按钮都创建后）
+        self.refresh_class_list()
+        if not get_class_name_list():
+            self.class_name_combo.setCurrentIndex(-1)
+            self.class_name_combo.setPlaceholderText(
+                get_content_name_async("roll_call_list", "select_class_name")
+            )
+        else:
+            self.class_name_combo.setCurrentText(
+                readme_settings_async("roll_call_list", "select_class_name")
+            )
+        self.class_name_combo.currentIndexChanged.connect(
+            lambda: update_settings(
+                "roll_call_list",
+                "select_class_name",
+                self.class_name_combo.currentText(),
+            )
+        )
+
         # 设置文件系统监视器
         self.setup_file_watcher()
 
+        # 初始化按钮状态
+        self.update_button_states()
+
     # 班级名称设置
     def set_class_name(self):
         create_set_class_name_window()
@@ -376,6 +381,18 @@ def on_directory_changed(self, path):
         # 延迟刷新，避免文件操作未完成
         QTimer.singleShot(500, self.refresh_class_list)
 
+    def update_button_states(self):
+        """根据班级列表状态更新按钮禁用状态"""
+        class_list = get_class_name_list()
+        has_class = len(class_list) > 0
+
+        # 禁用/启用相关按钮
+        self.import_student_button.setEnabled(has_class)
+        self.name_setting_button.setEnabled(has_class)
+        self.gender_setting_button.setEnabled(has_class)
+        self.group_setting_button.setEnabled(has_class)
+        self.export_student_button.setEnabled(has_class)
+
     def refresh_class_list(self):
         """刷新班级下拉框列表"""
         # 保存当前选中的班级名称
@@ -398,6 +415,9 @@ def refresh_class_list(self):
                 get_content_name_async("roll_call_list", "select_class_name")
             )
 
+        # 更新按钮状态
+        self.update_button_states()
+
         # logger.debug(f"班级列表已刷新，共 {len(class_list)} 个班级")
 
 
@@ -415,26 +435,6 @@ def __init__(self, parent=None):
 
         # 选择奖池下拉框
         self.pool_name_combo = ComboBox()
-        self.refresh_pool_list()  # 初始化奖池列表
-        saved_pool = readme_settings_async("lottery_list", "select_pool_name")
-        try:
-            if isinstance(saved_pool, int):
-                if 0 <= saved_pool < self.pool_name_combo.count():
-                    self.pool_name_combo.setCurrentIndex(saved_pool)
-            elif isinstance(saved_pool, str) and saved_pool:
-                self.pool_name_combo.setCurrentText(saved_pool)
-        except Exception:
-            pass
-        if not get_pool_name_list():
-            self.pool_name_combo.setCurrentIndex(-1)
-            self.pool_name_combo.setPlaceholderText(
-                get_content_name_async("lottery_list", "select_pool_name")
-            )
-        self.pool_name_combo.currentIndexChanged.connect(
-            lambda: update_settings(
-                "lottery_list", "select_pool_name", self.pool_name_combo.currentText()
-            )
-        )
 
         # 导入奖品名单按钮
         self.import_prize_button = PushButton(
@@ -500,9 +500,34 @@ def __init__(self, parent=None):
             self.export_prize_button,
         )
 
+        # 初始化奖池列表（在所有按钮都创建后）
+        self.refresh_pool_list()
+        saved_pool = readme_settings_async("lottery_list", "select_pool_name")
+        try:
+            if isinstance(saved_pool, int):
+                if 0 <= saved_pool < self.pool_name_combo.count():
+                    self.pool_name_combo.setCurrentIndex(saved_pool)
+            elif isinstance(saved_pool, str) and saved_pool:
+                self.pool_name_combo.setCurrentText(saved_pool)
+        except Exception:
+            pass
+        if not get_pool_name_list():
+            self.pool_name_combo.setCurrentIndex(-1)
+            self.pool_name_combo.setPlaceholderText(
+                get_content_name_async("lottery_list", "select_pool_name")
+            )
+        self.pool_name_combo.currentIndexChanged.connect(
+            lambda: update_settings(
+                "lottery_list", "select_pool_name", self.pool_name_combo.currentText()
+            )
+        )
+
         # 设置文件系统监视器
         self.setup_file_watcher()
 
+        # 初始化按钮状态
+        self.update_button_states()
+
     # 奖池名称设置
     def set_pool_name(self):
         create_set_pool_name_window()
@@ -715,6 +740,17 @@ def on_directory_changed(self, path):
         # 延迟刷新，避免文件操作未完成导致的错误
         QTimer.singleShot(500, self.refresh_pool_list)
 
+    def update_button_states(self):
+        """根据奖池列表状态更新按钮禁用状态"""
+        pool_list = get_pool_name_list()
+        has_pool = len(pool_list) > 0
+
+        # 禁用/启用相关按钮
+        self.import_prize_button.setEnabled(has_pool)
+        self.prize_setting_button.setEnabled(has_pool)
+        self.prize_weight_setting_button.setEnabled(has_pool)
+        self.export_prize_button.setEnabled(has_pool)
+
     def refresh_pool_list(self):
         """刷新奖池下拉框列表"""
         # 保存当前选中的奖池名称
@@ -737,4 +773,7 @@ def refresh_pool_list(self):
                 get_content_name_async("lottery_list", "select_pool_name")
             )
 
+        # 更新按钮状态
+        self.update_button_states()
+
         # logger.debug(f"奖池列表已刷新，共 {len(pool_list)} 个奖池")