fix: 版本号显示 — 始终设 current_version + 顶栏按钮显示版本
This commit is contained in:
@@ -111,17 +111,17 @@ class UpdateService:
|
|||||||
data = await loop.run_in_executor(None, self._sync_fetch_json, self.version_url)
|
data = await loop.run_in_executor(None, self._sync_fetch_json, self.version_url)
|
||||||
self.status["last_check"] = time.time()
|
self.status["last_check"] = time.time()
|
||||||
self.status["checked"] = True
|
self.status["checked"] = True
|
||||||
|
current = self._current_version()
|
||||||
|
self.status["current_version"] = current
|
||||||
if not data:
|
if not data:
|
||||||
return
|
return
|
||||||
remote_fw = data.get("framework", {})
|
remote_fw = data.get("framework", {})
|
||||||
remote_ver = remote_fw.get("version", "")
|
remote_ver = remote_fw.get("version", "")
|
||||||
if not remote_ver:
|
if not remote_ver:
|
||||||
return
|
return
|
||||||
current = self._current_version()
|
|
||||||
if _parse_ver(remote_ver) > _parse_ver(current):
|
if _parse_ver(remote_ver) > _parse_ver(current):
|
||||||
self.status["update_available"] = True
|
self.status["update_available"] = True
|
||||||
self.status["latest_version"] = remote_ver
|
self.status["latest_version"] = remote_ver
|
||||||
self.status["current_version"] = current
|
|
||||||
self.status["download_url"] = self.download_url
|
self.status["download_url"] = self.download_url
|
||||||
logger.info(f"🔄 新版本可用: {remote_ver} (当前: {current})")
|
logger.info(f"🔄 新版本可用: {remote_ver} (当前: {current})")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@@ -17,14 +17,15 @@ async function checkTopUpdate() {
|
|||||||
var btn = document.getElementById("top-ver-btn");
|
var btn = document.getElementById("top-ver-btn");
|
||||||
try {
|
try {
|
||||||
var r = await fetch("./api/updates"), d = await r.json();
|
var r = await fetch("./api/updates"), d = await r.json();
|
||||||
btn.textContent = d.current_version || d.latest_version || "v?";
|
var ver = d.current_version || d.latest_version || "";
|
||||||
|
btn.textContent = ver ? ver : "v?";
|
||||||
if (d.update_available) {
|
if (d.update_available) {
|
||||||
btn.textContent = "🔄 " + d.latest_version;
|
btn.textContent = "↻ " + d.latest_version + " 可用";
|
||||||
btn.style.color = "var(--success)";
|
btn.style.color = "var(--success)";
|
||||||
btn.title = "新版本可用! " + d.latest_version;
|
btn.title = "新版本可用! " + d.latest_version;
|
||||||
} else {
|
} else if (ver) {
|
||||||
btn.style.color = "";
|
btn.style.color = "";
|
||||||
btn.title = "已是最新";
|
btn.title = "已是最新 " + ver;
|
||||||
}
|
}
|
||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user