Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/strategy_switch_worker_validation.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ assert.ok(indexHtml.includes('id="income-layer-section"'));
assert.ok(indexHtml.includes('id="option-overlay-section"'));
assert.ok(indexHtml.includes('id="reserve-policy-stack"'));
assert.ok(indexHtml.includes('class="reserve-policy-stack"'));
assert.ok(indexHtml.includes('id="reserve-amounts-row"'));
assert.ok(indexHtml.includes('class="reserve-amounts-row"'));
assert.equal(indexHtml.includes('id="margin-policy-stack"'), false);
assert.ok(indexHtml.includes("cash_only_execution_mode: item.cash_only_execution_mode"));
assert.ok(indexHtml.includes("function incomeLayerFieldsConfigured("));
Expand Down
35 changes: 24 additions & 11 deletions web/strategy-switch-console/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,13 @@
min-width: 0;
}

.reserve-amounts-row {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 14px;
min-width: 0;
}

.reserve-policy-stack.policy-stack-muted {
opacity: 0.58;
}
Expand All @@ -364,6 +371,10 @@
.execution-cash-policy-grid {
grid-template-columns: 1fr;
}

.reserve-amounts-row {
grid-template-columns: 1fr;
}
}

.mark {
Expand Down Expand Up @@ -1439,17 +1450,19 @@ <h3 class="execution-cash-policy-heading" data-i18n="executionCashPolicyTitle">
<span class="selection-meta" id="reserve-policy-mode-meta" data-i18n="reservedCashModeMeta">选择是否沿用、清空或覆盖平台预留现金。</span>
</label>

<label class="control-block min-reserve-block policy-block" id="min-reserve-block">
<span id="min-reserved-cash-label">最小预留现金</span>
<input id="min-reserved-cash-input" type="number" inputmode="decimal" min="0" step="1">
<span class="selection-meta" data-i18n="reservedCashMeta">固定金额下限,可单独设置或与比例取较大值。</span>
</label>

<label class="control-block reserve-ratio-block policy-block" id="reserve-ratio-block">
<span data-i18n="reservedCashRatio">预留现金比例</span>
<input id="reserved-cash-ratio-input" type="number" inputmode="decimal" min="0" max="1" step="0.01">
<span class="selection-meta" data-i18n="reservedCashRatioMeta">例如 0.03 表示 3%。</span>
</label>
<div class="reserve-amounts-row" id="reserve-amounts-row">
<label class="control-block min-reserve-block policy-block" id="min-reserve-block">
<span id="min-reserved-cash-label">最小预留现金</span>
<input id="min-reserved-cash-input" type="number" inputmode="decimal" min="0" step="1">
<span class="selection-meta" data-i18n="reservedCashMeta">固定金额下限,可单独设置或与比例取较大值。</span>
</label>

<label class="control-block reserve-ratio-block policy-block" id="reserve-ratio-block">
<span data-i18n="reservedCashRatio">预留现金比例</span>
<input id="reserved-cash-ratio-input" type="number" inputmode="decimal" min="0" max="1" step="0.01">
<span class="selection-meta" data-i18n="reservedCashRatioMeta">例如 0.03 表示 3%。</span>
</label>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web/strategy-switch-console/page_asset.js

Large diffs are not rendered by default.

Loading