feat(interface): 组件自动聚焦与键盘操作改进

src/heurams/interface/widgets/cloze_puzzle.py

@@ -5,6 +5,7 @@ from typing import TypedDict
 from textual.containers import ScrollableContainer
 from textual.widget import Widget
 from textual.widgets import Button, Label, Markdown
+from textual.events import Key
 
 import heurams.kernel.particles as pt
 import heurams.kernel.puzzles as pz
@@ -50,6 +51,7 @@ class ClozePuzzle(BasePuzzleWidget):
         self.hashtable = {}
         self.alia = alia
         self._load()
+        self.btn_shortcuts = {}
         self.hashmap = dict()
 
     def _load(self):
@@ -67,15 +69,24 @@ class ClozePuzzle(BasePuzzleWidget):
         yield Label(self.puzzle.wording, id="sentence")
         yield Markdown(f"> {self.listprint(self.inputlist)}", id="inputpreview")
         # 渲染当前问题的选项
-        with ScrollableContainer(id="btn-container"):
+        with ScrollableContainer(id="btn-container") as s:
+            c = 0
             for i in self.ans:
                 h = str(hash(i))
+                if hash(i) in self.hashmap.keys():
+                    continue
+                c += 1
                 self.hashmap[h] = i
                 btnid = f"sel000-{h}"
                 logger.debug(f"建立按钮 {btnid}")
-                yield Button(i, id=f"{btnid}")
+                self.btn_shortcuts[f'{c}'] = btnid
+                yield Button(f'[{c}] {i}', id=f"{btnid}")
+            s.focus()
 
         yield Button("退格", id="delete")
+        self.btn_shortcuts[f'0'] = 'delete'
+        self.btn_shortcuts[f'backspace'] = 'delete'
+        self.btn_shortcuts[f'delete'] = 'delete'
 
     def listprint(self, lst):
         s = ""
@@ -117,3 +128,10 @@ class ClozePuzzle(BasePuzzleWidget):
             pass
         else:
             self.atom.minimize(rating)
+    
+    def on_key(self, event: Key) -> None:
+        self.notify(event.key)
+        if event.key in self.btn_shortcuts:
+            btn_id = self.btn_shortcuts.get(event.key)
+            btn_id = '#' + btn_id
+            self.query_one(btn_id, Button).press()

src/heurams/interface/widgets/mcq_puzzle.py

@@ -9,7 +9,7 @@ import heurams.kernel.particles as pt
 import heurams.kernel.puzzles as pz
 from heurams.services.hasher import hash
 from heurams.services.logger import get_logger
-
+from textual.events import Key
 from .base_puzzle_widget import BasePuzzleWidget
 
 logger = get_logger(__name__)
@@ -51,6 +51,7 @@ class MCQPuzzle(BasePuzzleWidget):
         self.hashmap = dict()
         self.cursor = 0
         self.atom = atom
+        self.btn_shortcuts = {}
         self._load()
 
     def _load(self):
@@ -75,14 +76,24 @@ class MCQPuzzle(BasePuzzleWidget):
             yield Label(f"当前输入: {self.inputlist}", id="inputpreview")
 
         # 渲染当前问题的选项
-        with ScrollableContainer(id="btn-container"):
+        c = 0
+        with ScrollableContainer(id="btn-container") as s:
             for i in current_options:
-                self.hashmap[str(hash(i))] = i
-                btnid = f"sel{str(self.cursor).zfill(3)}-{hash(i)}"
+                if i in [' ', '']:
+                    continue
+                c += 1
+                h = str(hash(i))
+                self.hashmap[h] = i
+                btnid = f"sel{str(self.cursor).zfill(3)}-{h}"
                 logger.debug(f"建立按钮 {btnid}")
-                yield Button(i, id=f"{btnid}")
+                self.btn_shortcuts[f'{c}'] = f'{btnid}'
+                yield Button(f'[{c}] ' + i, id=f"{btnid}")
+            s.focus()
+            yield Button("退格", id="delete")
 
-        yield Button("退格", id="delete")
+        self.btn_shortcuts['0'] = f'delete'
+        self.btn_shortcuts['delete'] = f'delete'
+        self.btn_shortcuts['backspace'] = f'delete'
 
     def update_display(self, error=0):
         # 更新预览标签
@@ -140,20 +151,25 @@ class MCQPuzzle(BasePuzzleWidget):
             for child in container.children
             if hasattr(child, "id") and child.id and child.id.startswith("sel")
         ]
-
+        container.focus()
         for button in buttons_to_remove:
             logger.info(button)
             container.remove_children("#" + button.id)  # type: ignore
 
         # 添加当前题目的选项按钮
+        c = 0
         current_question_index = len(self.inputlist)
         if current_question_index < len(self.puzzle.options):
             current_options = self.puzzle.options[current_question_index]
             for option in current_options:
+                if option in ['', ' ']:
+                    continue
+                c += 1
                 button_id = f"sel{str(self.cursor).zfill(3)}-{hash(option)}"
                 if button_id not in self.hashmap:
                     self.hashmap[button_id[7:]] = option
-                new_button = Button(option, id=button_id)
+                new_button = Button(f"[{c}] " + option, id=button_id)
+                self.btn_shortcuts[f"{c}"] = button_id
                 container.mount(new_button)
 
     def handler(self, rating):
@@ -161,3 +177,10 @@ class MCQPuzzle(BasePuzzleWidget):
             pass
         else:
             self.atom.minimize(rating)
+
+    def on_key(self, event: Key) -> None:
+        self.notify(event.key)
+        if event.key in self.btn_shortcuts:
+            btn_id = self.btn_shortcuts.get(event.key)
+            btn_id = '#' + btn_id
+            self.query_one(btn_id, Button).press()

src/heurams/interface/widgets/recognition.py

@@ -49,7 +49,7 @@ class Recognition(BasePuzzleWidget):
     def compose(self):
         from heurams.context import config_var
 
-        autovoice = config_var.get()["interface"]["widgets"]["autovoice"]
+        autovoice = config_var.get()["interface"]["widgets"]['recognition']["autovoice"]
         if autovoice:
             self.screen.action_play_voice()  # type: ignore
         cfg: RecognitionConfig = self.atom.registry["nucleon"]["puzzles"][self.alia]
@@ -96,8 +96,9 @@ class Recognition(BasePuzzleWidget):
             if isinstance(item, str):
                 yield Markdown(item)
 
-        with Center():
-            yield Button("我已知晓", id="ok")
+        with Center() as c:
+            with Button("我已知晓", id="ok") as b:
+                b.focus()
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "ok":