Polish dashboard tables: hub-style orders, options source/expiry, hedge status.

Show 进行中 in green for active hedges; options columns include source/target/expiry; merge live mark/contracts/pnl from price snapshot. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 12:23:25 +08:00
parent cd2dfac2ba
commit 35117ba84e
7 changed files with 365 additions and 85 deletions
@@ -37,6 +37,52 @@
    return '<span class="' + cls + '">' + sign + n.toFixed(2) + "U</span>";
  }

+  function fmtPnlPlain(v) {
+    if (v == null || v === "") return "—";
+    const n = Number(v);
+    if (!Number.isFinite(n)) return "—";
+    const cls = n > 0 ? "pos-pnl-profit" : n < 0 ? "pos-pnl-loss" : "";
+    return '<span class="' + cls + '">' + n.toFixed(2) + "</span>";
+  }
+
+  function dirCell(it) {
+    const d = String(it.direction || "").toLowerCase();
+    const label = it.direction_label || (d === "short" ? "做空" : d === "long" ? "做多" : "-");
+    const cls = d === "short" ? "inst-dash-dir-short" : d === "long" ? "inst-dash-dir-long" : "";
+    return '<td class="' + cls + '">' + escapeHtml(label) + "</td>";
+  }
+
+  function fmtExpiry(ms) {
+    const n = Number(ms);
+    if (!Number.isFinite(n) || n <= 0) return "—";
+    let fallback = "—";
+    try {
+      const d = new Date(n);
+      if (!Number.isNaN(d.getTime())) {
+        const pad = function (x) {
+          return String(x).padStart(2, "0");
+        };
+        fallback =
+          d.getFullYear() +
+          "-" +
+          pad(d.getMonth() + 1) +
+          "-" +
+          pad(d.getDate()) +
+          " " +
+          pad(d.getHours()) +
+          ":" +
+          pad(d.getMinutes());
+      }
+    } catch (_) {}
+    return (
+      '<span class="opt-expiry-cd" data-opt-exp-ms="' +
+      escapeHtml(String(Math.floor(n))) +
+      '">' +
+      escapeHtml(fallback) +
+      "</span>"
+    );
+  }
+
  function goTab(tab) {
    if (!tab) return;
    if (global.InstanceEmbed && typeof global.InstanceEmbed.loadTab === "function") {
@@ -59,9 +105,11 @@
      '<div class="inst-dash-table-wrap">' +
      '<table class="inst-dash-table">' +
      "<thead><tr>" +
-      headers.map(function (h) {
-        return "<th>" + escapeHtml(h) + "</th>";
-      }).join("") +
+      headers
+        .map(function (h) {
+          return "<th>" + escapeHtml(h) + "</th>";
+        })
+        .join("") +
      "</tr></thead>" +
      "<tbody>" +
      rowsHtml +
@@ -73,36 +121,84 @@
    return ' class="inst-dash-row" data-dash-tab="' + escapeHtml(tab || "") + '" role="link" tabindex="0"';
  }

+  function mergeOrderLive(items, orderPrices) {
+    const map = {};
+    (orderPrices || []).forEach(function (p) {
+      if (p && p.id != null) map[String(p.id)] = p;
+    });
+    return (items || []).map(function (it) {
+      const live = map[String(it.id)] || {};
+      const mark =
+        live.exchange_mark_price != null
+          ? live.exchange_mark_price
+          : live.price != null
+            ? live.price
+            : it.mark_price;
+      const contracts =
+        live.contracts != null
+          ? live.contracts
+          : live.order_amount != null
+            ? live.order_amount
+            : it.contracts;
+      const entry =
+        live.avg_entry_price != null
+          ? live.avg_entry_price
+          : it.entry;
+      return Object.assign({}, it, {
+        entry: entry,
+        mark_price: mark,
+        mark_display: live.price_display || null,
+        contracts: contracts,
+        tp_profit: live.reward_at_tp_usdt != null ? live.reward_at_tp_usdt : it.tp_profit,
+        float_pnl: live.float_pnl != null ? live.float_pnl : it.float_pnl,
+      });
+    });
+  }
+
  function renderOrdersTable(items) {
    const rows = items
      .map(function (it) {
+        const sym = it.symbol || "-";
+        const mark =
+          it.mark_display != null && it.mark_display !== ""
+            ? escapeHtml(it.mark_display)
+            : fmtNum(it.mark_price);
+        const tpProfit =
+          it.tp_profit != null && Number.isFinite(Number(it.tp_profit))
+            ? '<span class="pos-tp-profit">' + Number(it.tp_profit).toFixed(2) + "U</span>"
+            : "—";
        return (
          "<tr" +
          rowClickAttrs(it.tab || "trade") +
          ">" +
-          "<td>" +
-          escapeHtml(it.symbol || "-") +
-          "</td>" +
-          "<td>" +
-          escapeHtml(it.direction_label || it.direction || "-") +
-          "</td>" +
-          "<td>" +
-          escapeHtml(it.subtitle || "—") +
-          "</td>" +
+          '<td class="td-symbol"><span class="inst-dash-sym-link">' +
+          escapeHtml(sym) +
+          "</span></td>" +
+          dirCell(it) +
          "<td>" +
          fmtNum(it.entry) +
          "</td>" +
          "<td>" +
-          fmtNum(it.stop_loss) +
+          mark +
          "</td>" +
          "<td>" +
-          fmtNum(it.take_profit) +
+          fmtNum(it.contracts) +
          "</td>" +
+          "<td>" +
+          tpProfit +
+          "</td>" +
+          "<td>" +
+          fmtPnlPlain(it.float_pnl) +
+          "</td>" +
+          "<td>—</td>" +
          "</tr>"
        );
      })
      .join("");
-    return tableWrap(["合约", "方向", "类型", "入场", "止损", "止盈"], rows);
+    return tableWrap(
+      ["合约", "方向", "开仓价", "标记价", "张数", "盈利金额", "浮盈", "操作"],
+      rows
+    );
  }

  function renderKeysTable(items) {
@@ -115,9 +211,7 @@
          "<td>" +
          escapeHtml(it.symbol || "-") +
          "</td>" +
-          "<td>" +
-          escapeHtml(it.direction_label || it.direction || "-") +
-          "</td>" +
+          dirCell(it) +
          "<td>" +
          escapeHtml(it.subtitle || "—") +
          "</td>" +
@@ -148,9 +242,7 @@
          "<td>" +
          escapeHtml(it.symbol || "-") +
          "</td>" +
-          "<td>" +
-          escapeHtml(it.direction_label || it.direction || "-") +
-          "</td>" +
+          dirCell(it) +
          "<td>" +
          escapeHtml(it.status || "—") +
          "</td>" +
@@ -167,12 +259,12 @@
  function renderOptionsTable(items) {
    const rows = items
      .map(function (it) {
-        const opt =
-          String(it.opt_type || "").toUpperCase() === "C"
+        const opt = it.opt_type_label ||
+          (String(it.opt_type || "").toUpperCase() === "C"
            ? "Call"
            : String(it.opt_type || "").toUpperCase() === "P"
              ? "Put"
-              : it.opt_type || "—";
+              : it.opt_type || "—");
        return (
          "<tr" +
          rowClickAttrs(it.tab || "options") +
@@ -181,24 +273,35 @@
          escapeHtml(it.inst_id || it.title || "-") +
          "</td>" +
          "<td>" +
+          escapeHtml(it.source_label || "纯期权") +
+          "</td>" +
+          "<td>" +
          escapeHtml(opt) +
          "</td>" +
          "<td>" +
          fmtNum(it.pos) +
          "</td>" +
          "<td>" +
+          fmtExpiry(it.exp_time_ms) +
+          "</td>" +
+          "<td>" +
+          escapeHtml(it.target_monitor || "—") +
+          "</td>" +
+          "<td>" +
          fmtPnl(it.pnl) +
          "</td>" +
          "</tr>"
        );
      })
      .join("");
-    return tableWrap(["合约", "类型", "张数", "盈亏"], rows);
+    return tableWrap(["合约", "来源", "类型", "张数", "到期时间", "目标监控", "盈亏"], rows);
  }

  function renderHedgeTable(items) {
    const rows = items
      .map(function (it) {
+        const stCls = it.status_active ? "inst-dash-status-active" : "";
+        const stText = it.status_label || (it.status_active ? "进行中" : it.status || "—");
        return (
          "<tr" +
          rowClickAttrs(it.tab || "hedge_plan") +
@@ -210,13 +313,15 @@
          escapeHtml(it.underlying || "-") +
          "</td>" +
          "<td>" +
-          escapeHtml(it.plan_type || "—") +
+          escapeHtml(it.plan_type_label || it.plan_type || "—") +
+          "</td>" +
+          '<td class="' +
+          stCls +
+          '">' +
+          escapeHtml(stText) +
          "</td>" +
          "<td>" +
-          escapeHtml(it.status || "—") +
-          "</td>" +
-          "<td>" +
-          escapeHtml(it.subtitle || "—") +
+          escapeHtml(it.contracts_summary || it.subtitle || "—") +
          "</td>" +
          "</tr>"
        );
@@ -290,12 +395,28 @@
    loading = true;
    if (status && !(opts && opts.silent)) status.textContent = "加载中…";
    try {
-      const res = await fetch("/api/instance/dashboard", { credentials: "same-origin" });
-      const data = await res.json().catch(function () {
+      const [dashRes, priceRes] = await Promise.all([
+        fetch("/api/instance/dashboard", { credentials: "same-origin" }),
+        fetch("/api/price_snapshot", { credentials: "same-origin" }).catch(function () {
+          return null;
+        }),
+      ]);
+      const data = await dashRes.json().catch(function () {
        return {};
      });
-      if (!res.ok || !data.ok) {
-        throw new Error(data.msg || res.statusText || "加载失败");
+      if (!dashRes.ok || !data.ok) {
+        throw new Error(data.msg || dashRes.statusText || "加载失败");
+      }
+      let orderPrices = [];
+      if (priceRes && priceRes.ok) {
+        try {
+          const snap = await priceRes.json();
+          orderPrices = snap.order_prices || [];
+        } catch (_) {}
+      }
+      if (data.orders && Array.isArray(data.orders.items)) {
+        data.orders.items = mergeOrderLive(data.orders.items, orderPrices);
+        data.orders.count = data.orders.items.length;
      }
      if (updated) updated.textContent = "更新 " + (data.updated_at || "—");
      if (sections) {
@@ -305,6 +426,14 @@
        sections.innerHTML =
          html || '<p class="inst-dash-empty muted">当前无活跃监控与持仓</p>';
        bindClicks(sections);
+        if (global.OptionsExpiryCountdown) {
+          if (typeof global.OptionsExpiryCountdown.tick === "function") {
+            global.OptionsExpiryCountdown.tick(sections);
+          }
+          if (typeof global.OptionsExpiryCountdown.ensureTimer === "function") {
+            global.OptionsExpiryCountdown.ensureTimer();
+          }
+        }
      }
      if (status) status.textContent = "";
    } catch (e) {