";
pos.forEach((p) => {
- const optType = (p.opt_type || "").toUpperCase() === "C" ? "Call" : (p.opt_type || "").toUpperCase() === "P" ? "Put" : (p.opt_type || "—");
+ const optType =
+ (p.opt_type || "").toUpperCase() === "C"
+ ? "Call"
+ : (p.opt_type || "").toUpperCase() === "P"
+ ? "Put"
+ : p.opt_type || "—";
const preview = p.close_preview || {};
let net = preview.estimated_pnl;
if (net == null && preview.total_received != null && p.premium_paid != null) {
@@ -3738,14 +3749,13 @@
if (roi == null && net != null && Number(p.premium_paid) > 0) {
roi = (Number(net) / Number(p.premium_paid)) * 100;
}
+ const target = findOptionsTargetForInst(targets, p.inst_id);
html += `
${esc(shortOptionsInst(p.inst_id))} |
${esc(optType)} |
${esc(p.pos)} |
${optionsExpiryCdHtml(p.exp_time_ms != null ? p.exp_time_ms : p.exp_time)} |
- ${p.idx_px != null ? fmt(p.idx_px, 0) : "—"} |
- ${p.expiry_be_px != null ? fmt(p.expiry_be_px, 0) : "—"} |
- ${p.close_be_px != null ? fmt(p.close_be_px, 0) : "—"} |
+ ${renderOptionsTargetCell(target)}
${net == null ? "—" : fmt(net, 2)} |
${roi == null ? "—" : esc(Number(roi).toFixed(2)) + "%"} |
`;
@@ -3801,20 +3811,11 @@
const targets = Array.isArray(opt.target_monitors) ? opt.target_monitors : [];
const bal = optionsBalanceFields(opt);
html += renderStatRow(bal.funding, bal.trading, bal.upl);
- if (targets.length) {
- html += `目标监控 · ${targets.length}
`;
- html += '';
- targets.forEach((t) => {
- const side = String(t.opt_type || "").toUpperCase() === "P" ? "Put ≤" : "Call ≥";
- html += `
${esc(shortOptionsInst(t.inst_id))} ${side} ${esc(fmt(t.target_index, 1))}
`;
- });
- html += "
期权持仓 · ${pos.length} 仓
`;
- html += layout === "cards" ? renderOptionsPositionsCards(pos) : renderOptionsPositionsTable(pos);
- if (row.flask_url_browser || row.flask_url) {
- html += ``;
- }
+ html +=
+ layout === "cards"
+ ? renderOptionsPositionsCards(pos)
+ : renderOptionsPositionsTable(pos, targets);
}
return html;
}
@@ -3838,9 +3839,11 @@
}
function renderPerpetualPositionsSection(row, ag, pos, orders, trends, tickMap, intraday) {
+ const n = Array.isArray(pos) ? pos.length : 0;
let html = "";
- html += `交易所持仓 · ${pos.length} 仓
`;
- if (pos.length) {
+ html += `交易所持仓 · ${n} 仓
`;
+ html += ``;
+ if (n) {
html += renderGridPositionsTable(
row.id,
row.key || row.id,
@@ -3853,29 +3856,66 @@
} else {
html += '
无持仓
';
}
+ html += "
监控位 · ${list.length}
`;
+ html += ``;
+ if (list.length) {
+ const first = list.slice(0, 1);
+ html += renderKeySection(first, kmap || {});
+ if (list.length > 1) {
+ html += `
另有 ${list.length - 1} 个监控位 · 点标题全屏查看
`;
+ }
+ } else {
+ html += '
无监控位
';
+ }
+ html += "
${esc(HUB_EXPAND_HINT)}
`;
let inner = "";
- if (layout.okxPart === "perp") {
- inner += renderAccountStatRow(row, ag);
- inner += renderPerpetualPositionsSection(row, ag, pos, orders, trends, tickMap, intraday);
- inner += renderCardStrategyStats(row, hm, flaskOk);
- inner += `点击标题栏进入全屏
`;
- return inner;
+ if (layout.okxPart === "perp" || layout.splitSide) {
+ /* 桌面分栏永续/分所卡:预留仓位行+监控位行+全屏提示;不显示期权 N仓 */
+ if (layout.okxPart === "options") {
+ inner += renderOptionsSectionBody(row);
+ inner += expandHint;
+ return inner;
+ }
+ if (layout.okxPart === "perp" || !rowHasOptionsLayout(row)) {
+ inner += renderAccountStatRow(row, ag);
+ inner += renderPerpetualPositionsSection(row, ag, pos, orders, trends, tickMap, intraday);
+ inner += renderPerpetualKeyMonitorSlot(flaskOk ? keys : [], kmap || {});
+ inner += renderCardStrategyStats(row, hm, flaskOk, {
+ hideOptions: true,
+ hideKeyChips: true,
+ });
+ if (intraday) {
+ inner += `日内纪律:禁手动平仓/改委托 · 整点强制清仓${row.force_close && row.force_close.enabled ? " · " + esc(row.force_close.label || "强制清仓") : ""}
`;
+ } else {
+ inner += expandHint;
+ }
+ return inner;
+ }
}
if (layout.okxPart === "options") {
inner += renderOptionsSectionBody(row);
- inner += `点击标题栏进入全屏 · 期权专页可下单
`;
+ inner += expandHint;
return inner;
}
if (rowHasOptionsLayout(row)) {
if (monitorGridOptionsSplit) {
- /* 兼容旧单卡内嵌;正常分栏已走 okxPart 双卡 */
inner += '';
inner += renderPerpetualInnerCard(row, ag, pos, orders, trends, tickMap, intraday);
inner += renderOptionsInnerCard(row);
@@ -3895,7 +3935,7 @@
inner += renderCardStrategyStats(row, hm, flaskOk);
inner += intraday
? `
日内纪律:禁手动平仓/改委托 · 整点强制清仓${row.force_close && row.force_close.enabled ? " · " + esc(row.force_close.label || "强制清仓") : ""}
`
- : `
点击标题栏进入全屏 · 委托 / 关键位 / 下单监控 / 趋势回调 / 顺势加仓
`;
+ : expandHint;
return inner;
}
diff --git a/manual_trading_hub/static/index.html b/manual_trading_hub/static/index.html
index 65791b1..d49ea0e 100644
--- a/manual_trading_hub/static/index.html
+++ b/manual_trading_hub/static/index.html
@@ -15,7 +15,7 @@
-
+
@@ -1327,6 +1327,6 @@
-
+