From 2a3f36d34ff814a9d994fca676df1aabd367d093 Mon Sep 17 00:00:00 2001 From: dekun Date: Tue, 7 Jul 2026 10:18:41 +0800 Subject: [PATCH] feat: split options settings into compact swap and transfer cards with aligned columns Co-authored-by: Cursor --- lib/common/static/instance_theme.css | 105 +++++++++++++++--- lib/instance/templates/embed_shell.html | 2 +- lib/instance/templates/index.html | 2 +- lib/instance/templates/settings_panel.html | 21 ++-- .../templates/options_settings_panel.html | 70 +----------- .../templates/options_settings_swap.html | 12 ++ .../templates/options_settings_transfer.html | 47 ++++++++ 7 files changed, 169 insertions(+), 90 deletions(-) create mode 100644 lib/options/templates/options_settings_swap.html create mode 100644 lib/options/templates/options_settings_transfer.html diff --git a/lib/common/static/instance_theme.css b/lib/common/static/instance_theme.css index 2a2ea12..be0ebf6 100644 --- a/lib/common/static/instance_theme.css +++ b/lib/common/static/instance_theme.css @@ -2185,18 +2185,59 @@ html[data-theme="light"] .journal-detail-img-thumb { .settings-cards-grid { display: grid; grid-template-columns: minmax(0, 1.45fr) minmax(280px, 1fr); - gap: 16px; - align-items: start; + gap: 12px; + align-items: stretch; } .settings-side-col { display: flex; flex-direction: column; - gap: 16px; + gap: 10px; + min-height: 100%; } .settings-card--risk { min-width: 0; + height: 100%; + display: flex; + flex-direction: column; +} + +.settings-side-col .settings-card--export { + margin-top: auto; +} + +.settings-card--compact { + padding: 10px 12px; +} + +.settings-card--compact h2 { + margin: 0 0 6px; + font-size: 0.88rem; + font-weight: 600; +} + +.settings-card--compact .settings-card-desc { + font-size: 0.72rem; + margin: 0 0 8px; + line-height: 1.45; +} + +.settings-card--compact .settings-transfer-auto, +.settings-card--compact .settings-transfer-form { + font-size: 0.72rem; +} + +.settings-card--compact .settings-transfer-form input, +.settings-card--compact .settings-transfer-form select, +.settings-card--compact .settings-transfer-form button { + font-size: 0.75rem; + padding: 4px 8px; +} + +.settings-card--compact .settings-export-link { + font-size: 0.75rem; + padding: 5px 10px; } @media (max-width: 900px) { @@ -2237,27 +2278,28 @@ html[data-theme="light"] .journal-detail-img-thumb { .settings-risk-sections { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); - gap: 12px; - margin-top: 14px; + gap: 10px; + margin-top: 10px; + flex: 1; } .settings-subcard { - padding: 12px 14px; + padding: 10px 12px; min-width: 0; margin: 0; } .settings-subcard-title { - margin: 0 0 10px; - font-size: 0.9rem; + margin: 0 0 8px; + font-size: 0.82rem; font-weight: 600; color: #cfd3ef; } .settings-kv--compact .settings-kv-row { - grid-template-columns: 8.5em 1fr; - padding: 5px 0; - font-size: 0.8rem; + grid-template-columns: 8em 1fr; + padding: 4px 0; + font-size: 0.75rem; } @media (max-width: 720px) { @@ -2604,13 +2646,48 @@ html[data-theme="light"] .settings-export-link { .options-settings-block { margin-bottom: 14px; } +.options-settings-section { + margin-bottom: 10px; +} +.options-settings-section:last-child { + margin-bottom: 0; +} +.options-settings-subtitle { + font-size: 0.72rem; + font-weight: 600; + color: #a8b0cc; + margin: 0 0 6px; +} +.options-settings-arrow { + font-size: 0.75rem; + color: #8892b0; + align-self: center; +} .options-settings-row { flex-wrap: wrap; - gap: 8px; + gap: 6px; + align-items: center; +} +.options-settings-row select, +.options-settings-row input[type="number"] { + font-size: 0.75rem; + padding: 4px 7px; + min-height: 28px; +} +.options-settings-row .btn-sm { + font-size: 0.72rem; + padding: 4px 10px; + min-height: 28px; } .options-settings-hint { - font-size: 0.82rem; - margin: 0 0 8px; + font-size: 0.72rem; + margin: 0 0 6px; + line-height: 1.45; +} +.options-settings-msg { + font-size: 0.7rem; + margin-top: 4px; + min-height: 1em; } .pos-pnl-profit { color: #7ee787; diff --git a/lib/instance/templates/embed_shell.html b/lib/instance/templates/embed_shell.html index 3d890ec..ec1c4ae 100644 --- a/lib/instance/templates/embed_shell.html +++ b/lib/instance/templates/embed_shell.html @@ -7,7 +7,7 @@ - + {{ exchange_display }} · 加密货币 | 交易监控复盘系统 diff --git a/lib/instance/templates/index.html b/lib/instance/templates/index.html index 5253039..e8c2743 100644 --- a/lib/instance/templates/index.html +++ b/lib/instance/templates/index.html @@ -17,7 +17,7 @@ {{ exchange_display }} · 加密货币 | 交易监控复盘系统 - + {% if instance_settings.options_settings_enabled %} -
-

期权设置

-

主账户期权资金：现货市价兑换 USDT/USDC；主账户与子账户（永续）之间划转。

- {% include 'options_settings_panel.html' %} +
+

币种兑换

+ {% include 'options_settings_swap.html' %}
+
+

资金划转

+

主账户期权资金：账户内划转、主账户与子账户之间划转。

+ {% include 'options_settings_transfer.html' %} +
+ {% include 'options_settings_panel.html' %} {% endif %} {% if instance_settings.show_transfer %} -
-

资金划转

-

手动在资金账户与交易账户之间划转 USDT；自动划转规则见下方说明。

+
+

永续资金划转

+

子账户永续：资金账户与交易账户之间划转 USDT。

{% include 'instance_transfer_panel.html' %}
{% endif %} -
+

数据导出

CSV · UTF-8 · v{{ instance_settings.data_export_version }}。 diff --git a/lib/options/templates/options_settings_panel.html b/lib/options/templates/options_settings_panel.html index a355952..fe1cad9 100644 --- a/lib/options/templates/options_settings_panel.html +++ b/lib/options/templates/options_settings_panel.html @@ -1,66 +1,4 @@ -

-
-

币种兑换（现货市价）

-

主账户资金账户：USDT ↔ USDC，走 USDC-USDT 现货市价单。

-
- - - -
-
-
- -
-

主账户内划转

-
- - - → - - - -
-
-
- -
-

主账户 ↔ 子账户划转

-

子账户：{{ instance_settings.options_sub_account or '未配置 OKX_SUB_ACCOUNT_NAME' }}

-
- - - → - - - - -
-
-
-
- +{# 期权设置脚本挂载点（卡片在 settings_panel 中拆分） #} + + diff --git a/lib/options/templates/options_settings_swap.html b/lib/options/templates/options_settings_swap.html new file mode 100644 index 0000000..3e659fa --- /dev/null +++ b/lib/options/templates/options_settings_swap.html @@ -0,0 +1,12 @@ +
+

主账户资金账户：USDT ↔ USDC，走 USDC-USDT 现货市价单。

+
+ + + +
+
+
diff --git a/lib/options/templates/options_settings_transfer.html b/lib/options/templates/options_settings_transfer.html new file mode 100644 index 0000000..bd13b60 --- /dev/null +++ b/lib/options/templates/options_settings_transfer.html @@ -0,0 +1,47 @@ +
+
主账户内
+
+ + + → + + + +
+
+
+ +
+
主账户 ↔ 子账户 （{{ instance_settings.options_sub_account or '未配置' }}）
+
+ + + → + + + + +
+
+