From 265e47a1f45cbda09300a905c16953d359d364c2 Mon Sep 17 00:00:00 2001 From: butubb <1422726308@qq.com> Date: Wed, 19 Aug 2026 15:00:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E6=AD=A4=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E5=BC=B9=E7=AA=97=E5=85=A8=E9=93=BE=E8=B7=AF=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E2=80=94=E2=80=94closeTestModal=20=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=EF=BC=88=E9=98=B6=E6=AE=B53=E8=AF=AF=E5=88=A0=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=85=B3=E4=B8=8D=E6=8E=89=EF=BC=89=E3=80=81test-over?= =?UTF-8?q?lay=20=E5=B1=82=E7=BA=A7=201200=EF=BC=88=E9=AB=98=E4=BA=8E?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8/=E5=85=83=E7=B4=A0=E6=8A=93?= =?UTF-8?q?=E5=8F=96=E5=BC=B9=E7=AA=97=EF=BC=89=E3=80=81tasks=5Fapi=20?= =?UTF-8?q?=E8=A1=A5=20=5Flog=EF=BC=88=E5=90=8E=E7=AB=AF500=EF=BC=89?= =?UTF-8?q?=E3=80=81GenericStepsWorker=20=E6=97=A7=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E4=BF=AE=E5=A4=8D=EF=BC=88=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/admin/base.js | 6 ++++++ tasks/generic/task.py | 2 +- templates/admin/monitor.html | 2 +- web/tasks_api.py | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/static/admin/base.js b/static/admin/base.js index 841db89..44bd0b1 100644 --- a/static/admin/base.js +++ b/static/admin/base.js @@ -132,6 +132,12 @@ function closeModal(){ }catch(e){console.warn('closeModal cleanup error:',e);} } +// 测试此步骤弹窗关闭(editor.js 的测试按钮用;曾随 STF 清理误删) +function closeTestModal(){ + const ov=document.getElementById('test-overlay'); + if(ov)ov.classList.remove('show'); +} + // 关闭元素抓取弹窗(不影响任务编辑窗口) function closeElPicker(){ var ov=document.getElementById('el-picker-overlay'); diff --git a/tasks/generic/task.py b/tasks/generic/task.py index 246d42a..8a5155d 100644 --- a/tasks/generic/task.py +++ b/tasks/generic/task.py @@ -645,7 +645,7 @@ def test_step(serial, step): if d is None: return False, "u2 连接超时", None try: - w = GenericStepsWorker(None, serial, {}) + w = GenericStepsWorker(serial, {}) result = w._exec_one(d, step) return True, f"步骤已执行({step.get('label') or step.get('type')})", result except Exception as e: diff --git a/templates/admin/monitor.html b/templates/admin/monitor.html index 6aa09d3..606dc3b 100644 --- a/templates/admin/monitor.html +++ b/templates/admin/monitor.html @@ -678,7 +678,7 @@ body{background:var(--bg);font-family:var(--body);color:var(--text);font-size:14 -