⭐ 支持包含字母的委托单号

easytrader/clienttrader.py

@@ -188,7 +188,6 @@ def reverse_repo(self, security, price, amount, **kwargs):
 
         return self.trade(security, price, amount)
 
-
     @perf_clock
     def buy(self, security, price, amount, **kwargs):
         self._switch_left_menus(["买入[F1]"])
@@ -288,7 +287,9 @@ def auto_ipo(self):
 
         if len(stock_list) == 0:
             return {"message": "今日无新股"}
-        invalid_list_idx = [i for i, v in enumerate(stock_list) if v[self.config.AUTO_IPO_NUMBER] <= 0]
+        invalid_list_idx = [
+            i for i, v in enumerate(stock_list) if v[self.config.AUTO_IPO_NUMBER] <= 0
+        ]
 
         if len(stock_list) == len(invalid_list_idx):
             return {"message": "没有发现可以申购的新股"}
@@ -488,8 +489,7 @@ def _cancel_entrust_by_double_click(self, row):
         ).double_click(coords=(x, y))
 
     def refresh(self):
-        #  self._switch_left_menus(["买入[F1]"], sleep=0.05)
-        self._switch_left_menus_by_shortcut("{F5}",sleep=0.1)
+        self._switch_left_menus_by_shortcut("{F5}", sleep=0.1)
 
     @perf_clock
     def _handle_pop_dialogs(self, handler_class=pop_dialog_handler.PopDialogHandler):

easytrader/pop_dialog_handler.py

@@ -41,18 +41,15 @@ def _extract_content(self):
         return self._app.top_window().Static.window_text()
 
     def _extract_entrust_id(self, content):
-        #  return re.search(r"\d+", content).group()
-        rule = '编号：(.*?)。'
-        ids=re.findall(rule,content)
-        return ids[0]
+        return re.search(r"[\da-zA-Z]+", content).group()
 
     def _submit_by_click(self):
         try:
             self._app.top_window()["确定"].click()
         except Exception as ex:
-            self._app.Window_(
-                best_match="Dialog", top_level_only=True
-            ).ChildWindow(best_match="确定").click()
+            self._app.Window_(best_match="Dialog", top_level_only=True).ChildWindow(
+                best_match="确定"
+            ).click()
 
     def _submit_by_shortcut(self):
         self._set_foreground(self._app.top_window())