-
0 && 'ml-3 rounded-xl',
- active
- ? 'border-[var(--border-strong)] bg-[var(--accent-soft)] text-[var(--foreground-primary)]'
- : 'border-transparent text-[var(--foreground-secondary)] hover:border-[var(--border-default)] hover:bg-[var(--surface-muted)] hover:text-[var(--foreground-primary)]',
- )}
- >
-
-
-
- {showLabel ?
{item.label} : null}
-
- {showLabel && hasChildren ? (
+ return (
- {item.children?.map((child) => (
-
- ))}
+
0 && 'ml-3 rounded-xl',
+ active
+ ? 'border-[var(--border-strong)] bg-[var(--accent-soft)] text-[var(--foreground-primary)]'
+ : 'border-transparent text-[var(--foreground-secondary)] hover:border-[var(--border-default)] hover:bg-[var(--surface-muted)] hover:text-[var(--foreground-primary)]',
+ )}
+ >
+
+
+
+ {showLabel ?
{item.label} : null}
+
+ {showLabel && hasChildren ? (
+
+ {item.children?.map((child) => (
+
+ ))}
+
+ ) : null}
- ) : null}
-
-
-
- AF
-
- {showLabel ? (
-
- ) : null}
-
+ return (
+
+
+
+ AF
+
+ {showLabel ? (
+
+ ) : null}
+
-
+
- {showLabel ? (
-
- 总览页现在承接各模块摘要，侧栏只保留稳定导航。
+ {showLabel ? (
+
+ 已连接 ATSFlare Server
+
+ ) : null}
- ) : null}
-
- );
+ );
}
export function DashboardSidebar() {
- const pathname = usePathname();
- const currentPath = pathname ?? '/';
- const isSidebarCollapsed = useAppShellStore((state) => state.isSidebarCollapsed);
- const isMobileSidebarOpen = useAppShellStore((state) => state.isMobileSidebarOpen);
- const setMobileSidebarOpen = useAppShellStore((state) => state.setMobileSidebarOpen);
+ const pathname = usePathname();
+ const currentPath = pathname ?? '/';
+ const isSidebarCollapsed = useAppShellStore((state) => state.isSidebarCollapsed);
+ const isMobileSidebarOpen = useAppShellStore((state) => state.isMobileSidebarOpen);
+ const setMobileSidebarOpen = useAppShellStore((state) => state.setMobileSidebarOpen);
- useEffect(() => {
- setMobileSidebarOpen(false);
- }, [currentPath, setMobileSidebarOpen]);
+ useEffect(() => {
+ setMobileSidebarOpen(false);
+ }, [currentPath, setMobileSidebarOpen]);
- return (
- <>
-
setMobileSidebarOpen(false)}
- aria-hidden='true'
- />
+ return (
+ <>
+
setMobileSidebarOpen(false)}
+ aria-hidden='true'
+ />
-
+
-
-
- );
+
+
+ );
}
diff --git a/atsf_server/web/features/apply-logs/components/apply-logs-page.tsx b/atsf_server/web/features/apply-logs/components/apply-logs-page.tsx
index fa613cb1..cabdd6cc 100644
--- a/atsf_server/web/features/apply-logs/components/apply-logs-page.tsx
+++ b/atsf_server/web/features/apply-logs/components/apply-logs-page.tsx
@@ -1,5 +1,6 @@
'use client';
+import Link from 'next/link';
import { useQuery, useQueryClient } from '@tanstack/react-query';
import { useEffect, useMemo, useState } from 'react';
@@ -88,6 +89,14 @@ export function ApplyLogsPage() {
+ 返回节点页
+
+ }
/>
{feedback ? : null}
diff --git a/atsf_server/web/features/nodes/components/nodes-page.tsx b/atsf_server/web/features/nodes/components/nodes-page.tsx
index 3a282303..7f0f843c 100644
--- a/atsf_server/web/features/nodes/components/nodes-page.tsx
+++ b/atsf_server/web/features/nodes/components/nodes-page.tsx
@@ -15,6 +15,7 @@ import { PageHeader } from '@/components/layout/page-header';
import { AppModal } from '@/components/ui/app-modal';
import { AppCard } from '@/components/ui/app-card';
import { StatusBadge } from '@/components/ui/status-badge';
+import { getPublicStatus } from '@/features/auth/api/public';
import {
createNode,
deleteNode,
@@ -134,6 +135,56 @@ function getUpdateMode(node: NodeItem) {
return { label: '手动更新', variant: 'info' as const };
}
+function parseVersionParts(version: string) {
+ const normalized = version.trim().replace(/^v/i, '');
+ if (!normalized || normalized.toLowerCase() === 'unknown') {
+ return null;
+ }
+
+ return normalized.split('.').map((segment) => {
+ const matched = segment.trim().match(/^\d+/);
+ return matched ? Number.parseInt(matched[0], 10) : 0;
+ });
+}
+
+function isOlderVersion(current: string, target: string) {
+ const currentParts = parseVersionParts(current);
+ const targetParts = parseVersionParts(target);
+ if (!currentParts || !targetParts) {
+ return false;
+ }
+
+ const maxLength = Math.max(currentParts.length, targetParts.length);
+ for (let index = 0; index < maxLength; index += 1) {
+ const currentPart = currentParts[index] ?? 0;
+ const targetPart = targetParts[index] ?? 0;
+ if (currentPart < targetPart) {
+ return true;
+ }
+ if (currentPart > targetPart) {
+ return false;
+ }
+ }
+
+ return false;
+}
+
+function shouldShowManualUpdate(agentVersion: string, serverVersion: string) {
+ const normalizedServerVersion = serverVersion.trim();
+ const normalizedAgentVersion = agentVersion.trim();
+
+ if (
+ !normalizedServerVersion ||
+ normalizedServerVersion.toLowerCase() === 'dev' ||
+ !normalizedAgentVersion ||
+ normalizedAgentVersion.toLowerCase() === 'unknown'
+ ) {
+ return false;
+ }
+
+ return isOlderVersion(normalizedAgentVersion, normalizedServerVersion);
+}
+
function getServerUrl(value: string) {
return value.trim().replace(/\/+$/, '');
}
@@ -175,6 +226,11 @@ export function NodesPage() {
queryFn: getNodes,
});
+ const publicStatusQuery = useQuery({
+ queryKey: ['public-status'],
+ queryFn: getPublicStatus,
+ });
+
useEffect(() => {
if (typeof window !== 'undefined' && !serverUrl) {
setServerUrl(window.location.origin);
@@ -246,6 +302,7 @@ export function NodesPage() {
const nodes = useMemo(() => nodesQuery.data ?? [], [nodesQuery.data]);
const normalizedServerUrl = getServerUrl(serverUrl);
+ const serverVersion = publicStatusQuery.data?.version ?? '';
const selectedNodeFromList = useMemo(() => {
if (!selectedNode) {
@@ -348,7 +405,6 @@ export function NodesPage() {
{nodes.map((node) => {
const updateMode = getUpdateMode(node);
+ const showManualUpdate = shouldShowManualUpdate(
+ node.agent_version || '',
+ serverVersion,
+ );
return (
@@ -465,19 +525,21 @@ export function NodesPage() {
-
- updateAgentMutation.mutate(node.id)
- }
- disabled={
- updateAgentMutation.isPending ||
- node.update_requested
- }
- className="px-3 py-2 text-xs"
- >
- 立即更新
-
+ {showManualUpdate ? (
+
+ updateAgentMutation.mutate(node.id)
+ }
+ disabled={
+ updateAgentMutation.isPending ||
+ node.update_requested
+ }
+ className="px-3 py-2 text-xs"
+ >
+ 升级
+
+ ) : null}
handleOpenDeployModal(node)}
diff --git a/atsf_server/web/lib/utils/navigation.ts b/atsf_server/web/lib/utils/navigation.ts
index 7f2a178b..7d5588ae 100644
--- a/atsf_server/web/lib/utils/navigation.ts
+++ b/atsf_server/web/lib/utils/navigation.ts
@@ -1,12 +1,22 @@
import { dashboardNavigation } from '@/lib/constants/navigation';
import type { NavigationItem } from '@/types/navigation';
+const navigationPathAliases: Record = {
+ '/apply-log': '/node',
+};
+
+function normalizeNavigationPath(pathname: string) {
+ return navigationPathAliases[pathname] ?? pathname;
+}
+
export function isPathActive(pathname: string, href: string) {
- if (href === '/') {
- return pathname === '/';
- }
-
- return pathname === href || pathname.startsWith(`${href}/`);
+ const normalizedPathname = normalizeNavigationPath(pathname);
+
+ if (href === '/') {
+ return normalizedPathname === '/';
+ }
+
+ return normalizedPathname === href || normalizedPathname.startsWith(`${href}/`);
}
export function isNavigationItemActive(pathname: string, item: NavigationItem): boolean {
|