Skip to content

Commit 8ea6159

Browse files
authored
Merge pull request #95 from QuantStrategyLab/fix/console-cash-ratio-run-button
Adjust cash ratio column and run button styling
2 parents 77a435a + 0f9a5c9 commit 8ea6159

3 files changed

Lines changed: 25 additions & 20 deletions

File tree

tests/strategy_switch_worker_validation.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ assert.ok(indexHtml.includes('qmt: { label: "QMT"'));
4545
assert.ok(indexHtml.includes('cn_industry_etf_rotation'));
4646
assert.ok(indexHtml.includes('id="income-layer-section"'));
4747
assert.ok(indexHtml.includes('id="option-overlay-section"'));
48+
assert.ok(indexHtml.includes('id="margin-policy-stack"'));
49+
assert.ok(indexHtml.includes('class="margin-policy-stack"'));
4850
assert.ok(indexHtml.includes('id="reserve-policy-stack"'));
4951
assert.ok(indexHtml.includes('class="reserve-policy-stack"'));
5052
assert.equal(indexHtml.match(/class="form-section dca-section"/g)?.length, 1);

web/strategy-switch-console/index.html

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,12 @@
352352
min-width: 0;
353353
}
354354

355+
.margin-policy-stack {
356+
display: grid;
357+
gap: 14px;
358+
min-width: 0;
359+
}
360+
355361
.reserve-policy-stack.policy-stack-muted {
356362
opacity: 0.58;
357363
}
@@ -1068,17 +1074,12 @@
10681074
}
10691075

10701076
.run-area {
1071-
grid-template-columns: minmax(0, 1fr) minmax(220px, 260px);
1072-
align-items: center;
1073-
gap: 12px 16px;
1074-
padding: 16px;
1075-
border: 1px solid rgba(215, 225, 235, 0.9);
1076-
border-radius: var(--radius-md);
1077-
background:
1078-
linear-gradient(90deg, rgba(255, 255, 255, 0.96), rgba(244, 248, 251, 0.9));
1077+
gap: 10px;
1078+
padding-top: 2px;
10791079
}
10801080

10811081
.run-button {
1082+
width: 100%;
10821083
min-height: 58px;
10831084
border-radius: 12px;
10841085
background:
@@ -1408,11 +1409,19 @@ <h3 class="execution-cash-policy-heading" data-i18n="executionCashPolicyTitle">
14081409
<p class="execution-cash-policy-note" id="execution-cash-policy-note" data-i18n="executionCashPolicyNote">允许融资与预留现金覆盖不能同时生效。</p>
14091410
<p class="execution-cash-policy-note qmt-platform-cash-note" id="qmt-platform-cash-note" hidden data-i18n="qmtPlatformCashNote">A 股 QMT 不使用 margin / 平台预留现金;现金约束在策略参数 execution_cash_reserve_ratio 内配置。</p>
14101411
<div class="execution-cash-policy-grid" id="execution-cash-policy-grid">
1411-
<label class="control-block cash-only-mode-block policy-block" id="cash-only-policy-block">
1412-
<span data-i18n="cashOnlyExecutionMode">允许融资</span>
1413-
<select id="cash-only-execution-mode-select"></select>
1414-
<span class="selection-meta" id="cash-only-execution-mode-meta"></span>
1415-
</label>
1412+
<div class="margin-policy-stack" id="margin-policy-stack">
1413+
<label class="control-block cash-only-mode-block policy-block" id="cash-only-policy-block">
1414+
<span data-i18n="cashOnlyExecutionMode">允许融资</span>
1415+
<select id="cash-only-execution-mode-select"></select>
1416+
<span class="selection-meta" id="cash-only-execution-mode-meta"></span>
1417+
</label>
1418+
1419+
<label class="control-block reserve-ratio-block policy-block" id="reserve-ratio-block">
1420+
<span data-i18n="reservedCashRatio">预留现金比例</span>
1421+
<input id="reserved-cash-ratio-input" type="number" inputmode="decimal" min="0" max="1" step="0.01">
1422+
<span class="selection-meta" data-i18n="reservedCashRatioMeta">例如 0.03 表示 3%。</span>
1423+
</label>
1424+
</div>
14161425

14171426
<div class="reserve-policy-stack" id="reserve-policy-stack">
14181427
<label class="control-block reserve-policy-block policy-block" id="reserve-policy-block">
@@ -1426,12 +1435,6 @@ <h3 class="execution-cash-policy-heading" data-i18n="executionCashPolicyTitle">
14261435
<input id="min-reserved-cash-input" type="number" inputmode="decimal" min="0" step="1">
14271436
<span class="selection-meta" data-i18n="reservedCashMeta">固定金额下限,可单独设置或与比例取较大值。</span>
14281437
</label>
1429-
1430-
<label class="control-block reserve-ratio-block policy-block" id="reserve-ratio-block">
1431-
<span data-i18n="reservedCashRatio">预留现金比例</span>
1432-
<input id="reserved-cash-ratio-input" type="number" inputmode="decimal" min="0" max="1" step="0.01">
1433-
<span class="selection-meta" data-i18n="reservedCashRatioMeta">例如 0.03 表示 3%。</span>
1434-
</label>
14351438
</div>
14361439
</div>
14371440
</div>

web/strategy-switch-console/page_asset.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)