diff --git a/manual_trading_hub/hub.py b/manual_trading_hub/hub.py
index 752c816..6a21cc1 100644
--- a/manual_trading_hub/hub.py
+++ b/manual_trading_hub/hub.py
@@ -737,6 +737,8 @@ def api_get_settings():
class SettingsDisplayBody(BaseModel):
show_account_pnl: bool = True
+ show_nav_funds: bool = True
+ show_nav_dashboard: bool = True
class SettingsBody(BaseModel):
diff --git a/manual_trading_hub/settings_store.py b/manual_trading_hub/settings_store.py
index a4a4e26..142852e 100644
--- a/manual_trading_hub/settings_store.py
+++ b/manual_trading_hub/settings_store.py
@@ -11,6 +11,8 @@ SETTINGS_PATH = DIR / "hub_settings.json"
DEFAULT_DISPLAY = {
"show_account_pnl": True,
+ "show_nav_funds": True,
+ "show_nav_dashboard": True,
}
DEFAULT_EXCHANGES = [
@@ -72,8 +74,9 @@ def env_force_disabled_ids() -> set[str]:
def normalize_display_prefs(raw: dict | None) -> dict:
out = dict(DEFAULT_DISPLAY)
if isinstance(raw, dict):
- if "show_account_pnl" in raw:
- out["show_account_pnl"] = bool(raw.get("show_account_pnl"))
+ for key in DEFAULT_DISPLAY:
+ if key in raw:
+ out[key] = bool(raw.get(key))
return out
diff --git a/manual_trading_hub/static/app.css b/manual_trading_hub/static/app.css
index 2d170be..ba7bb98 100644
--- a/manual_trading_hub/static/app.css
+++ b/manual_trading_hub/static/app.css
@@ -326,6 +326,10 @@ a:hover {
transition: background 0.15s, color 0.15s, box-shadow 0.15s;
}
+.top-nav a.nav-hidden {
+ display: none !important;
+}
+
.top-nav a:hover {
color: var(--text);
background: var(--panel-hover);
@@ -2176,9 +2180,16 @@ button.btn-sm {
}
.settings-display-chk {
+ display: flex;
+ align-items: center;
+ gap: 8px;
font-size: 0.88rem;
}
+.settings-display-chk + .settings-display-chk {
+ margin-top: 8px;
+}
+
.settings-display-hint {
margin: 8px 0 0;
font-size: 0.78rem;
diff --git a/manual_trading_hub/static/app.js b/manual_trading_hub/static/app.js
index 7c05dbb..54a6479 100644
--- a/manual_trading_hub/static/app.js
+++ b/manual_trading_hub/static/app.js
@@ -3,17 +3,47 @@
let settingsCache = null;
let authState = { required: false, logged_in: true };
- function showAccountPnlPref() {
+ function displayPref(key, defaultOn) {
const d = settingsCache && settingsCache.display;
- if (!d || d.show_account_pnl === undefined) return true;
- return !!d.show_account_pnl;
+ if (!d || d[key] === undefined) return defaultOn !== false;
+ return !!d[key];
+ }
+
+ function showAccountPnlPref() {
+ return displayPref("show_account_pnl", true);
+ }
+
+ function showNavFundsPref() {
+ return displayPref("show_nav_funds", true);
+ }
+
+ function showNavDashboardPref() {
+ return displayPref("show_nav_dashboard", true);
+ }
+
+ function syncNavVisibility(data) {
+ const d = (data && data.display) || {};
+ const navFunds = document.getElementById("nav-funds");
+ const navDash = document.getElementById("nav-dashboard");
+ if (navFunds) navFunds.classList.toggle("nav-hidden", d.show_nav_funds === false);
+ if (navDash) navDash.classList.toggle("nav-hidden", d.show_nav_dashboard === false);
+ }
+
+ function pageNavAllowed(page) {
+ if (page === "funds") return showNavFundsPref();
+ if (page === "dashboard") return showNavDashboardPref();
+ return true;
}
function syncDisplayPrefsUI(data) {
- const cb = document.getElementById("pref-show-account-pnl");
- if (!cb) return;
- const show = data && data.display ? data.display.show_account_pnl : true;
- cb.checked = show !== false;
+ const d = (data && data.display) || {};
+ const pnlCb = document.getElementById("pref-show-account-pnl");
+ const fundsCb = document.getElementById("pref-show-nav-funds");
+ const dashCb = document.getElementById("pref-show-nav-dashboard");
+ if (pnlCb) pnlCb.checked = d.show_account_pnl !== false;
+ if (fundsCb) fundsCb.checked = d.show_nav_funds !== false;
+ if (dashCb) dashCb.checked = d.show_nav_dashboard !== false;
+ syncNavVisibility(data);
}
function positionTableHeadHtml(compact) {
@@ -662,7 +692,11 @@
}
function setActiveNav() {
- const page = currentPage();
+ let page = currentPage();
+ if (!pageNavAllowed(page)) {
+ history.replaceState({}, "", "/monitor");
+ page = "monitor";
+ }
const pageId = pageElementId(page);
document.querySelectorAll(".top-nav a").forEach((a) => {
const href = (a.getAttribute("href") || "").split("?")[0];
@@ -857,6 +891,7 @@
async function loadSettings() {
const r = await apiFetch("/api/settings");
settingsCache = await r.json();
+ syncNavVisibility(settingsCache);
return settingsCache;
}
@@ -3055,10 +3090,14 @@
function collectSettingsFromUI() {
const rows = [...document.querySelectorAll("#settings-list .settings-card")];
const pnlCb = document.getElementById("pref-show-account-pnl");
+ const fundsCb = document.getElementById("pref-show-nav-funds");
+ const dashCb = document.getElementById("pref-show-nav-dashboard");
return {
version: 1,
display: {
show_account_pnl: pnlCb ? !!pnlCb.checked : true,
+ show_nav_funds: fundsCb ? !!fundsCb.checked : true,
+ show_nav_dashboard: dashCb ? !!dashCb.checked : true,
},
exchanges: rows.map((card) => {
const caps = [];
@@ -3100,6 +3139,10 @@
await loadSettingsUI();
}
if (lastMonitorRows.length) renderMonitorGrid(lastMonitorRows);
+ if (!pageNavAllowed(currentPage())) {
+ history.replaceState({}, "", "/monitor");
+ setActiveNav();
+ }
} else showToast("保存失败", true);
} catch (e) {
showToast(String(e), true);
diff --git a/manual_trading_hub/static/index.html b/manual_trading_hub/static/index.html
index 88af80c..e4a9100 100644
--- a/manual_trading_hub/static/index.html
+++ b/manual_trading_hub/static/index.html
@@ -502,12 +502,20 @@
@@ -547,6 +555,6 @@
-
+