From 26176a7afa682535ef1fa4510038976605a8c68f Mon Sep 17 00:00:00 2001 From: web Date: Mon, 18 Aug 2025 03:04:17 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(page):=20Refine=20version=20?= =?UTF-8?q?checking=20logic=20and=20remove=20unnecessary=20comments=20for?= =?UTF-8?q?=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/app/dashboard/tool/page.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/admin/app/dashboard/tool/page.tsx b/apps/admin/app/dashboard/tool/page.tsx index 04dd83f..96372b7 100644 --- a/apps/admin/app/dashboard/tool/page.tsx +++ b/apps/admin/app/dashboard/tool/page.tsx @@ -98,7 +98,6 @@ export default function Page() { retryDelay: 10000, }); - // 检查是否有新版本 const hasNewVersion = latestReleases?.web && packageJson.version !== latestReleases.web.version.replace(/^v/, ''); @@ -108,21 +107,25 @@ export default function Page() { const { data } = await getVersion(); const versionString = data.data?.version || ''; - const releaseVersionRegex = /^[Vv]?\d+\.\d+\.\d+$/; + const releaseVersionRegex = /^[Vv]?\d+\.\d+\.\d+(-[a-zA-Z]+(\.\d+)?)?$/; const timeMatch = versionString.match(/\(([^)]+)\)/); const timeInBrackets = timeMatch ? timeMatch[1] : ''; const versionWithoutTime = versionString.replace(/\([^)]*\)/, '').trim(); - const isDevelopment = !releaseVersionRegex.test(versionWithoutTime); + + const isDevelopment = + versionWithoutTime.includes('-dev') || + versionWithoutTime.includes('-debug') || + versionWithoutTime.includes('-nightly') || + versionWithoutTime.includes('dev') || + !releaseVersionRegex.test(versionWithoutTime); let baseVersion = versionWithoutTime; - let versionSuffix = ''; let lastUpdated = ''; if (isDevelopment && versionWithoutTime.includes('-')) { const parts = versionWithoutTime.split('-'); baseVersion = parts[0] || versionWithoutTime; - versionSuffix = parts.slice(1).join('-'); } lastUpdated = formatDate(new Date(timeInBrackets || Date.now())) || ''; @@ -199,9 +202,7 @@ export default function Page() {
- {/* 版本信息紧凑显示 */}
- {/* 用户端/管理端版本 */}
@@ -236,7 +237,6 @@ export default function Page() { )}
- {/* 服务端版本 */}