dekun/qihuo
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix turbo nav layout flash and stats page not loading.

Browse Source 
Wait for page CSS before swapping content, hoist inline styles to head, and boot page scripts immediately when DOM markers exist.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
dekun
2026-06-26 20:55:36 +08:00
parent c79bb2ea4b
commit 6d55a54946
10 changed files with 93 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/js/keys.js
+2 -1
View File
@@ -44,7 +44,8 @@
keyTimer = setInterval(pollKeyPrices, 1000);
}
if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(startPolling);
if (window.qihuoPageBoot) window.qihuoPageBoot(startPolling, '#key-monitor-list');
else if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(startPolling);
else document.addEventListener('DOMContentLoaded', startPolling);
if (window.qihuoOnPageLeave) window.qihuoOnPageLeave(stopPolling);
})();
static/js/market.js
+2 -1
View File
@@ -742,7 +742,8 @@
});
}
if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(bootMarketPage);
if (window.qihuoPageBoot) window.qihuoPageBoot(bootMarketPage, '#market-chart-wrap');
else if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(bootMarketPage);
else document.addEventListener('DOMContentLoaded', bootMarketPage);
if (window.qihuoOnPageLeave) window.qihuoOnPageLeave(cleanupMarketPage);
window.addEventListener('pagehide', cleanupMarketPage);
static/js/page.js
+10
View File
@@ -14,4 +14,14 @@
global.qihuoEmitPageLoad = function () {
global.dispatchEvent(new Event('qihuo:page-load'));
};
/** Register page boot + run now if the page marker is already in DOM (turbo nav). */
global.qihuoPageBoot = function (fn, selector) {
function run() {
if (selector && !global.document.querySelector(selector)) return;
fn();
}
global.addEventListener('qihuo:page-load', run);
run();
};
})();
static/js/plans.js
+2 -1
View File
@@ -52,7 +52,8 @@
timer = setInterval(pollPrices, 1000);
}
if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(startPolling);
if (window.qihuoPageBoot) window.qihuoPageBoot(startPolling, '#plan-monitor-list');
else if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(startPolling);
else document.addEventListener('DOMContentLoaded', startPolling);
if (window.qihuoOnPageLeave) window.qihuoOnPageLeave(stopPolling);
})();
static/js/review.js
+2 -1
View File
@@ -169,7 +169,8 @@
recalc();
}
if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(bootReviewPage);
if (window.qihuoPageBoot) window.qihuoPageBoot(bootReviewPage, '#review-form');
else if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(bootReviewPage);
else document.addEventListener('DOMContentLoaded', bootReviewPage);
window.recalc = recalc;
static/js/stats.js
+2 -1
View File
@@ -158,6 +158,7 @@
loadStats();
}
if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(bootStatsPage);
if (window.qihuoPageBoot) window.qihuoPageBoot(bootStatsPage, '#stats-summary');
else if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(bootStatsPage);
else document.addEventListener('DOMContentLoaded', bootStatsPage);
})();
static/js/trade.js
+2 -1
View File
@@ -1648,7 +1648,8 @@
}
});
if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(bootTradePage);
if (window.qihuoPageBoot) window.qihuoPageBoot(bootTradePage, '#position-live-list, #order-live-list');
else if (window.qihuoOnPageLoad) window.qihuoOnPageLoad(bootTradePage);
else bootTradePage();
if (window.qihuoOnPageLeave) window.qihuoOnPageLeave(cleanupTradePage);
window.addEventListener('pagehide', cleanupTradePage);
static/js/turbonav.js
+41 -23
View File
@@ -71,9 +71,19 @@
if (el.tagName === 'LINK' && isPermanentStylesheet(el)) return;
out.push(el);
});
doc.querySelectorAll('.main style').forEach(function (el) {
out.push(el);
});
return out;
}
function prepareMainHtml(doc) {
var fetchedMain = doc.querySelector('.main');
if (!fetchedMain) return '';
fetchedMain.querySelectorAll('style').forEach(function (el) { el.remove(); });
return fetchedMain.innerHTML;
}
function collectPageScripts(doc) {
var out = [];
var pastCore = false;
@@ -83,29 +93,34 @@
return;
}
if (!pastCore) return;
if (isCoreScript(el)) return;
out.push(el);
});
return out;
}
function removePageAssets() {
document.querySelectorAll('head link[rel="stylesheet"]').forEach(function (el) {
if (!isPermanentStylesheet(el)) el.remove();
});
document.querySelectorAll('head style').forEach(function (el) { el.remove(); });
document.querySelectorAll('[data-page-css]').forEach(function (el) { el.remove(); });
document.querySelectorAll('body script[data-page-js]').forEach(function (el) { el.remove(); });
}
function applyPageCss(items) {
items.forEach(function (srcEl) {
var el = srcEl.cloneNode(true);
if (el.tagName === 'LINK') {
el.setAttribute('data-page-css', '');
} else {
el.setAttribute('data-page-css', '');
}
document.head.appendChild(el);
});
return items.reduce(function (chain, srcEl) {
return chain.then(function () {
return new Promise(function (resolve) {
var el = srcEl.cloneNode(true);
el.setAttribute('data-page-css', '');
if (el.tagName === 'LINK') {
el.onload = function () { resolve(); };
el.onerror = function () { resolve(); };
document.head.appendChild(el);
} else {
document.head.appendChild(el);
resolve();
}
});
});
}, Promise.resolve());
}
function runPageScripts(items) {
@@ -132,7 +147,7 @@
}, Promise.resolve());
}
function syncNavActive(doc, url) {
function syncNavActive(doc) {
var nav = document.getElementById('site-nav');
var fetchedNav = doc.getElementById('site-nav');
if (!nav || !fetchedNav) return;
@@ -153,20 +168,23 @@
function applyDocument(doc, url, fromPopstate) {
var main = document.querySelector('.main');
var fetchedMain = doc.querySelector('.main');
if (!main || !fetchedMain) {
if (!main || !doc.querySelector('.main')) {
window.location.href = url;
return Promise.resolve();
}
window.dispatchEvent(new Event('qihuo:page-leave'));
removePageAssets();
applyPageCss(collectPageCss(doc));
main.innerHTML = fetchedMain.innerHTML;
document.title = doc.title || document.title;
syncNavActive(doc, url);
return runPageScripts(collectPageScripts(doc)).then(function () {
var cssItems = collectPageCss(doc);
var mainHtml = prepareMainHtml(doc);
return applyPageCss(cssItems).then(function () {
main.innerHTML = mainHtml;
document.title = doc.title || document.title;
syncNavActive(doc, url);
return runPageScripts(collectPageScripts(doc));
}).then(function () {
currentUrl = normalizeUrl(url);
if (!fromPopstate) {
history.pushState({ turbo: true }, '', currentUrl);
@@ -190,8 +208,8 @@
return fetchPage(target, ctrl.signal).then(function (doc) {
if (ctrl.signal.aborted) return;
inflight = null;
applyDocument(doc, target, !!opts.fromPopstate);
}).catch(function (err) {
return applyDocument(doc, target, !!opts.fromPopstate);
}).catch(function () {
if (ctrl.signal.aborted) return;
inflight = null;
setLoading(false);
static/sw.js
+1 -1
View File
@@ -2,7 +2,7 @@
* 专有软件 — 未经授权禁止复制、传播、转售。
* 详见 LICENSE.zh-CN.txt
*/
var CACHE_VERSION = 'qihuo-v6';
var CACHE_VERSION = 'qihuo-v7';
var STATIC_CACHE = CACHE_VERSION + '-static';
var STATIC_ASSETS = [
'/static/css/base.css',
templates/stats.html
+29 -27
View File
@@ -1,6 +1,35 @@
{# Copyright (c) 2025-2026 马建军. All rights reserved. 专有软件，详见 LICENSE.zh-CN.txt #}
{% extends "base.html" %}
{% block title %}统计分析 - 国内期货 · 交易复盘系统{% endblock %}
{% block extra_css %}
<style>
.stats-summary-card{margin-bottom:1.25rem}
.stats-toolbar{display:flex;align-items:center;justify-content:flex-start;gap:1rem;margin-bottom:.75rem;flex-wrap:wrap}
.stat-grid-summary{
display:flex;flex-wrap:nowrap;align-items:stretch;gap:0;
margin-bottom:0;overflow-x:auto;-webkit-overflow-scrolling:touch;
}
.stat-grid-summary .stat-item{
flex:1 1 0;min-width:4.5rem;background:transparent;border:none;border-radius:0;
padding:.35rem .2rem;text-align:center;position:relative;overflow:visible;
border-right:1px solid var(--table-border);
}
.stat-grid-summary .stat-item:last-child{border-right:none}
.stat-grid-summary .stat-item::before{display:none}
.stat-grid-summary .stat-item:hover{transform:none;box-shadow:none}
.stat-grid-summary .stat-item .label{
font-size:.62rem;line-height:1.25;color:var(--text-muted);white-space:nowrap;
}
.stat-grid-summary .stat-item .value{
font-size:.78rem;font-weight:600;color:var(--text-title);margin-top:.12rem;
font-variant-numeric:tabular-nums;white-space:nowrap;
}
.stats-card-head{display:flex;align-items:flex-end;justify-content:space-between;gap:1rem;flex-wrap:wrap;margin-bottom:1rem}
.stats-card-head h2{margin-bottom:0}
.stats-view-field{width:auto;min-width:200px}
.stats-view-field select{width:100%;min-width:180px}
</style>
{% endblock %}
{% block content %}
<div class="card stats-summary-card">
@@ -43,33 +72,6 @@
</div>
</div>
<style>
.stats-summary-card{margin-bottom:1.25rem}
.stats-toolbar{display:flex;align-items:center;justify-content:flex-start;gap:1rem;margin-bottom:.75rem;flex-wrap:wrap}
.stat-grid-summary{
display:flex;flex-wrap:nowrap;align-items:stretch;gap:0;
margin-bottom:0;overflow-x:auto;-webkit-overflow-scrolling:touch;
}
.stat-grid-summary .stat-item{
flex:1 1 0;min-width:4.5rem;background:transparent;border:none;border-radius:0;
padding:.35rem .2rem;text-align:center;position:relative;overflow:visible;
border-right:1px solid var(--table-border);
}
.stat-grid-summary .stat-item:last-child{border-right:none}
.stat-grid-summary .stat-item::before{display:none}
.stat-grid-summary .stat-item:hover{transform:none;box-shadow:none}
.stat-grid-summary .stat-item .label{
font-size:.62rem;line-height:1.25;color:var(--text-muted);white-space:nowrap;
}
.stat-grid-summary .stat-item .value{
font-size:.78rem;font-weight:600;color:var(--text-title);margin-top:.12rem;
font-variant-numeric:tabular-nums;white-space:nowrap;
}
.stats-card-head{display:flex;align-items:flex-end;justify-content:space-between;gap:1rem;flex-wrap:wrap;margin-bottom:1rem}
.stats-card-head h2{margin-bottom:0}
.stats-view-field{width:auto;min-width:200px}
.stats-view-field select{width:100%;min-width:180px}
</style>
{% endblock %}
{% block extra_js %}