tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-05 07:26:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

[修复] 节点类型字段名不匹配：前端 type 改为 node_type 对齐后端 JSON tag

Browse Source
This commit is contained in:
ryan
2026-06-01 11:26:01 +08:00
parent 7372ac230b
commit fce2e014e5
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openflare_server/web/features/nodes/components/node-detail-page.tsx
+2 -2
View File
@@ -559,13 +559,13 @@ export function NodeDetailPage({ nodeId }: { nodeId: string }) {
const normalizedServerUrl = getServerUrl(serverUrl); const normalizedServerUrl = getServerUrl(serverUrl);
const nodeInstallCommand = const nodeInstallCommand =
normalizedServerUrl && node.agent_token normalizedServerUrl && node.agent_token
? node.type === 'tunnel_relay' ? node.node_type === 'tunnel_relay'
? buildRelayInstallCommand(normalizedServerUrl, node.agent_token) ? buildRelayInstallCommand(normalizedServerUrl, node.agent_token)
: buildNodeInstallCommand(normalizedServerUrl, node.agent_token) : buildNodeInstallCommand(normalizedServerUrl, node.agent_token)
: ''; : '';
const nodeDockerInstallCommand = const nodeDockerInstallCommand =
normalizedServerUrl && node.agent_token normalizedServerUrl && node.agent_token
? node.type === 'tunnel_relay' ? node.node_type === 'tunnel_relay'
? buildRelayDockerInstallCommand(normalizedServerUrl, node.agent_token) ? buildRelayDockerInstallCommand(normalizedServerUrl, node.agent_token)
: buildNodeDockerInstallCommand(normalizedServerUrl, node.agent_token) : buildNodeDockerInstallCommand(normalizedServerUrl, node.agent_token)
: ''; : '';
openflare_server/web/features/nodes/components/node-editor-modal.tsx
+2 -2
View File
@@ -211,7 +211,7 @@ function buildFormValues(node?: Partial<NodeItem> | null): NodeEditorValues {
} }
return { return {
type: node.type ?? 'edge_node', type: node.node_type ?? 'edge_node',
name: node.name ?? '', name: node.name ?? '',
ip: node.ip ?? '', ip: node.ip ?? '',
ip_manual_override: node.ip_manual_override ?? false, ip_manual_override: node.ip_manual_override ?? false,
@@ -235,7 +235,7 @@ function buildFormValues(node?: Partial<NodeItem> | null): NodeEditorValues {
function toPayload(values: NodeEditorValues): NodeMutationPayload { function toPayload(values: NodeEditorValues): NodeMutationPayload {
const basePayload = { const basePayload = {
type: values.type, node_type: values.type,
name: values.name.trim(), name: values.name.trim(),
ip: values.ip.trim(), ip: values.ip.trim(),
ip_manual_override: values.ip_manual_override, ip_manual_override: values.ip_manual_override,
openflare_server/web/features/nodes/components/nodes-page.tsx
+2 -2
View File
@@ -314,7 +314,7 @@ export function NodesPage() {
<p className="font-medium text-[var(--foreground-primary)]"> <p className="font-medium text-[var(--foreground-primary)]">
{node.name} {node.name}
</p> </p>
{node.type === 'tunnel_relay' ? ( {node.node_type === 'tunnel_relay' ? (
<span className="rounded-full border border-blue-500/20 bg-blue-50 px-2 py-0.5 text-xs text-blue-700 dark:bg-blue-900/30 dark:text-blue-300"> <span className="rounded-full border border-blue-500/20 bg-blue-50 px-2 py-0.5 text-xs text-blue-700 dark:bg-blue-900/30 dark:text-blue-300">
Relay Relay
</span> </span>
@@ -345,7 +345,7 @@ export function NodesPage() {
</td> </td>
<td className="px-3 py-4"> <td className="px-3 py-4">
<div className="space-y-2"> <div className="space-y-2">
{node.type === 'tunnel_relay' ? ( {node.node_type === 'tunnel_relay' ? (
<StatusBadge <StatusBadge
label={getRelayStatusLabel(node.relay_status)} label={getRelayStatusLabel(node.relay_status)}
variant={getRelayStatusVariant(node.relay_status)} variant={getRelayStatusVariant(node.relay_status)}
openflare_server/web/features/nodes/types.ts
+2 -2
View File
@@ -3,7 +3,7 @@ import type { ReleaseChannel } from '@/features/update/types';
export interface NodeItem { export interface NodeItem {
id: number; id: number;
node_id: string; node_id: string;
type: 'edge_node' | 'tunnel_relay'; node_type: 'edge_node' | 'tunnel_relay';
name: string; name: string;
ip: string; ip: string;
ip_manual_override: boolean; ip_manual_override: boolean;
@@ -46,7 +46,7 @@ export interface NodeBootstrapToken {
} }
export interface NodeMutationPayload { export interface NodeMutationPayload {
type: 'edge_node' | 'tunnel_relay'; node_type: 'edge_node' | 'tunnel_relay';
name: string; name: string;
ip: string; ip: string;
ip_manual_override: boolean; ip_manual_override: boolean;