进一步实现 interface

src/heurams/interface/widgets/cloze_puzzle.py

@@ -1,12 +1,5 @@
-from textual.app import App, ComposeResult
-from textual.events import Event
 from textual.widgets import (
-    Collapsible,
-    Header,
-    Footer,
     Markdown,
-    ListView,
-    ListItem,
     Label,
     Static,
     Button,
@@ -14,56 +7,52 @@ from textual.widgets import (
 from textual.containers import Container, Horizontal, Center
 from textual.screen import Screen
 from textual.widget import Widget
-import uuid
-from typing import Tuple, Dict
 import heurams.kernel.particles as pt
 import heurams.kernel.puzzles as pz
-import re
-import random
+from .base_puzzle_widget import BasePuzzleWidget
 import copy
+import random
+from .. import shim
 
+class ClozePuzzle(BasePuzzleWidget):
 
-class FillBlank(Composition):
-    def __init__(self, screen: Screen, reactor, atom: Tuple[pt.Electron, pt.Nucleon, Dict], extra:Dict = {}):
-        super().__init__(screen, reactor, atom)
-        self.extra = extra
-        self.inputlist = []
+    def __init__(self, *children: Widget, atom: pt.Atom, name: str | None = None, id: str | None = None, classes: str | None = None, disabled: bool = False, markup: bool = True) -> None:
+        super().__init__(*children, atom=atom, name=name, id=id, classes=classes, disabled=disabled, markup=markup)
+        self.inputlist = list()
         self.hashtable = {}
         self._work()
 
     def _work(self):
-        self.puzzle = pz.BlankPuzzle(self.atom[1]["content"], 2)
+        self.puzzle = pz.ClozePuzzle(text=self.atom.register["nucleon"]["content"], min_denominator=2)
         self.puzzle.refresh()
         self.ans = copy.copy(self.puzzle.answer)
         random.shuffle(self.ans)
 
     def compose(self):
-        if self.extra.get("feedback_msg"):
-            yield Label("反馈提示:" + self.extra["feedback_msg"])
-        yield Label(self.puzzle.wording, id=self.regid("sentence"))
-        yield Label(f"当前输入: {self.inputlist}", id=self.regid("inputpreview"))
+        yield Label(self.puzzle.wording, id="sentence")
+        yield Label(f"当前输入: {self.inputlist}", id="inputpreview")
         for i in self.ans:
             self.hashtable[str(hash(i))] = i
-            yield Button(i, id=self.regid(f"select{hash(i)}"))
-        yield Button("退格", id=self.regid(f"delete"))
+            yield Button(i, id=f"{hash(i)}")
+        yield Button("退格", id=f"delete")
 
     def handler(self, event, type_):
         # TODO: 改动：在线错误纠正
         if type_ == "button":
-            if self.recid(event.button.id) == "delete":
+            if event.button.id == "delete":
                 if len(self.inputlist) > 0:
                     self.inputlist.pop()
                 else:
                     return 1
             else:
-                self.inputlist.append(self.hashtable[self.recid(event.button.id)[6:]])
+                self.inputlist.append(self.hashtable[event.button.id[6:]])
             if len(self.inputlist) < len(self.puzzle.answer):
                 return 1
             else:
                 if self.inputlist == self.puzzle.answer:
-                    self.reactor.report(self.atom, 4)
+                    shim.report_to_staging(self.atom, 4)
                     return 0
                 else:
                     self.inputlist = []
-                    self.reactor.report(self.atom, 2)
+                    shim.report_to_staging(self.atom, 2)
                     return 2