From bacb5fdde4d330bcb0fe27523c2a5b125bfbc756 Mon Sep 17 00:00:00 2001 From: dekun Date: Wed, 12 Aug 2026 20:45:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC/=E7=99=BE=E5=88=86=E6=AF=94?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=BC=80=E4=BB=93=E6=8C=89=E9=92=AE=E9=9D=A0?= =?UTF-8?q?=E5=8F=B3=EF=BC=9B=E6=8C=81=E4=BB=93=E4=B8=8A=E9=99=90=E7=BA=A2?= =?UTF-8?q?=E5=AD=97=E7=A7=BB=E5=88=B0=E9=A2=84=E4=BC=B0=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E4=B8=8B=E6=96=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- lib/common/static/instance_page.css | 36 +++++++++++++++---- .../templates/embed_boot_scripts.html | 2 ++ lib/instance/templates/embed_shell.html | 2 +- lib/instance/templates/index.html | 4 ++- .../templates/order_monitor_open_form.html | 5 ++- .../templates/order_plan_preview_bar.html | 11 +++--- 6 files changed, 44 insertions(+), 16 deletions(-) diff --git a/lib/common/static/instance_page.css b/lib/common/static/instance_page.css index 476d4da..3cafbf6 100644 --- a/lib/common/static/instance_page.css +++ b/lib/common/static/instance_page.css @@ -31,9 +31,22 @@ .order-monitor-form .om-field{display:flex;flex-direction:column;gap:4px;min-width:7.5rem} .order-monitor-form .om-field-lab{font-size:.72rem;color:#9aa3c7;line-height:1;letter-spacing:.02em} .order-monitor-form .om-field input{width:9.5rem;max-width:160px;box-sizing:border-box} - .order-monitor-form .om-live-meta{display:flex;flex-wrap:wrap;align-items:center;gap:8px;padding-bottom:2px;margin-left:auto} + .order-monitor-form .om-live-meta{display:flex;flex-wrap:wrap;align-items:center;gap:8px;padding-bottom:2px} .order-monitor-form .om-row-levels .om-submit{align-self:flex-end;min-width:11rem;padding:10px 18px;font-weight:600;flex:0 0 auto} - .order-monitor-form .om-row-levels .om-open-block-note{align-self:center;padding-bottom:2px} + /* 固定盈亏比:开仓紧跟盈亏比;价格/百分比:开仓靠右 */ + .order-monitor-form .om-row-levels[data-sltp-mode="fixed_rr"] #om-field-sl{order:1} + .order-monitor-form .om-row-levels[data-sltp-mode="fixed_rr"] #om-field-rr{order:2} + .order-monitor-form .om-row-levels[data-sltp-mode="fixed_rr"] .om-submit{order:3} + .order-monitor-form .om-row-levels[data-sltp-mode="fixed_rr"] .om-live-meta{order:10;margin-left:auto} + .order-monitor-form .om-row-levels[data-sltp-mode="price"] #om-field-sl, + .order-monitor-form .om-row-levels[data-sltp-mode="pct"] #om-field-sl{order:1} + .order-monitor-form .om-row-levels[data-sltp-mode="price"] #om-field-tp, + .order-monitor-form .om-row-levels[data-sltp-mode="pct"] #om-field-sl-pct{order:2} + .order-monitor-form .om-row-levels[data-sltp-mode="pct"] #om-field-tp-pct{order:3} + .order-monitor-form .om-row-levels[data-sltp-mode="price"] .om-live-meta, + .order-monitor-form .om-row-levels[data-sltp-mode="pct"] .om-live-meta{order:40;margin-left:auto} + .order-monitor-form .om-row-levels[data-sltp-mode="price"] .om-submit, + .order-monitor-form .om-row-levels[data-sltp-mode="pct"] .om-submit{order:50} .order-monitor-form .om-row-opts{align-items:center;gap:12px;padding-top:2px} .order-monitor-form .om-check{display:inline-flex;align-items:center;gap:5px;font-size:.82rem;color:#cfd3ef;cursor:pointer;user-select:none} .order-monitor-form .om-time-close{display:inline-flex;align-items:center;gap:6px;font-size:.82rem;color:#cfd3ef} @@ -53,13 +66,22 @@ filter:grayscale(.35); pointer-events:none; } - .order-monitor-form .om-open-block-note{ - color:var(--danger,#ff7b7b); + .order-plan-preview-wrap{margin:4px 0 10px} + .order-plan-preview{display:flex;gap:18px;flex-wrap:wrap;align-items:center;margin:0;padding:10px 12px;background:#151a28;border:1px solid #2a3150;border-radius:8px;font-size:.85rem} + .om-open-block-note, + .om-open-block-note--below{ + color:#ff6b6b; font-size:13px; - line-height:1.4; - max-width:min(28rem,100%); + line-height:1.45; + font-weight:600; + max-width:100%; } - .order-plan-preview{display:flex;gap:18px;flex-wrap:wrap;align-items:center;margin:4px 0 10px;padding:10px 12px;background:#151a28;border:1px solid #2a3150;border-radius:8px;font-size:.85rem} + .om-open-block-note--below{ + margin-top:8px; + padding:0 2px; + } + .om-open-block-note[hidden], + .om-open-block-note--below[hidden]{display:none !important} #add-order-form #sltp-mode{min-width:12.5rem;max-width:16rem;width:auto} .order-preview-risk{color:#ff6b6b} .order-preview-risk strong{color:#ff8f8f;font-weight:600} diff --git a/lib/instance/templates/embed_boot_scripts.html b/lib/instance/templates/embed_boot_scripts.html index 96cb39f..8241233 100644 --- a/lib/instance/templates/embed_boot_scripts.html +++ b/lib/instance/templates/embed_boot_scripts.html @@ -1306,6 +1306,8 @@ function setOmFieldVisible(inputEl, show){ } function toggleSltpMode(){ const mode = sltpModeEl ? sltpModeEl.value : "fixed_rr"; + const levelsRow = document.querySelector("#add-order-form .om-row-levels"); + if(levelsRow) levelsRow.setAttribute("data-sltp-mode", mode); const slEl = document.getElementById("order-sl"); const tpEl = document.getElementById("order-tp"); const fixedRrEl = document.getElementById("order-fixed-rr"); diff --git a/lib/instance/templates/embed_shell.html b/lib/instance/templates/embed_shell.html index 9c6ff2b..f26fc7a 100644 --- a/lib/instance/templates/embed_shell.html +++ b/lib/instance/templates/embed_shell.html @@ -7,7 +7,7 @@ - + diff --git a/lib/instance/templates/index.html b/lib/instance/templates/index.html index 88d3d94..d8a10bb 100644 --- a/lib/instance/templates/index.html +++ b/lib/instance/templates/index.html @@ -18,7 +18,7 @@ {{ pwa_app_name }} - + @@ -1812,6 +1812,8 @@ function setOmFieldVisible(inputEl, show){ } function toggleSltpMode(){ const mode = sltpModeEl ? sltpModeEl.value : "fixed_rr"; + const levelsRow = document.querySelector("#add-order-form .om-row-levels"); + if(levelsRow) levelsRow.setAttribute("data-sltp-mode", mode); const slEl = document.getElementById("order-sl"); const tpEl = document.getElementById("order-tp"); const fixedRrEl = document.getElementById("order-fixed-rr"); diff --git a/lib/instance/templates/order_monitor_open_form.html b/lib/instance/templates/order_monitor_open_form.html index 42894c9..e834625 100644 --- a/lib/instance/templates/order_monitor_open_form.html +++ b/lib/instance/templates/order_monitor_open_form.html @@ -15,7 +15,7 @@ {{ order_leverage_fields() }} -
+
- - {% if not can_trade and (open_block_note|default('')) %}{{ open_block_note }}{% endif %}
+
{% if not intraday_discipline %} diff --git a/lib/strategy/templates/order_plan_preview_bar.html b/lib/strategy/templates/order_plan_preview_bar.html index 7fa3ffc..cd2d567 100644 --- a/lib/strategy/templates/order_plan_preview_bar.html +++ b/lib/strategy/templates/order_plan_preview_bar.html @@ -1,5 +1,8 @@ -
- 预估风险:— - 预估盈利:— - 预估盈亏比:— +
+
+ 预估风险:— + 预估盈利:— + 预估盈亏比:— +
+
{% if not can_trade and (open_block_note|default('')) %}{{ open_block_note }}{% endif %}