From 8f10b84e94253728f1c334e4b375a4799a38fc5b Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Wed, 16 Aug 2023 16:18:53 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E5=A4=8D=20Chrome=20=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E8=84=9A=E6=9C=AC=E5=A4=B1=E8=B4=A5=EF=BC=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8D=A1=E5=9C=A8=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/applets/chrome/ChangeLog    | 4 ++++
 apps/terminal/applets/chrome/app.py       | 1 -
 apps/terminal/applets/chrome/common.py    | 6 +++++-
 apps/terminal/applets/chrome/manifest.yml | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/terminal/applets/chrome/ChangeLog b/apps/terminal/applets/chrome/ChangeLog
index 81529958b..d59b31125 100644
--- a/apps/terminal/applets/chrome/ChangeLog
+++ b/apps/terminal/applets/chrome/ChangeLog
@@ -1,3 +1,7 @@
+# 2023-08-16 Version 0.8
+## 功能优化
+    - 修复代填失败，造成页面卡住的问题
+
 # 2023-07-28 Version 0.7
 ## 功能优化
     - 增加进度窗口，隐藏代填操作
diff --git a/apps/terminal/applets/chrome/app.py b/apps/terminal/applets/chrome/app.py
index 14654386e..92ddd1e7c 100644
--- a/apps/terminal/applets/chrome/app.py
+++ b/apps/terminal/applets/chrome/app.py
@@ -121,7 +121,6 @@ def execute_action(driver: webdriver.Chrome, step: StepAction) -> bool:
         return step.execute(driver)
     except Exception as e:
         print(e)
-        notify_err_message(str(e))
         return False
 
 
diff --git a/apps/terminal/applets/chrome/common.py b/apps/terminal/applets/chrome/common.py
index 161150a0d..8d2ab3df2 100644
--- a/apps/terminal/applets/chrome/common.py
+++ b/apps/terminal/applets/chrome/common.py
@@ -7,6 +7,7 @@ import subprocess
 import sys
 import time
 from subprocess import CREATE_NO_WINDOW
+from threading import Thread
 
 _blockInput = None
 _messageBox = None
@@ -36,7 +37,10 @@ def unblock_input():
 
 def notify_err_message(msg):
     if _messageBox:
-        _messageBox(msg, 'Error')
+        # _messageBox 是阻塞当前线程的，所以需要开启一个新线程执行
+        t = Thread(target=_messageBox, args=(msg, 'Error'), kwargs={})
+        t.daemon = True
+        t.start()
 
 
 def decode_content(content: bytes) -> str:
diff --git a/apps/terminal/applets/chrome/manifest.yml b/apps/terminal/applets/chrome/manifest.yml
index c740b23a6..89b35a7dc 100644
--- a/apps/terminal/applets/chrome/manifest.yml
+++ b/apps/terminal/applets/chrome/manifest.yml
@@ -1,6 +1,6 @@
 name: chrome
 display_name: "{{ 'Chrome Browser' | trans }}"
-version: 0.7
+version: 0.8
 comment: "{{ 'Chrome Browser Open URL Page Address' | trans }}"
 author: JumpServer Team
 exec_type: python