From 92322ba6bab2172f13035fb403a934176f893631 Mon Sep 17 00:00:00 2001
From: Zexi Li <zexi.li@icloud.com>
Date: Fri, 6 Mar 2026 19:13:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(monitor):=20=E4=BB=85=E5=9C=A8=20From/To/In?=
 =?UTF-8?q?terval=20=E4=B8=BA=E7=A9=BA=E6=97=B6=E8=AE=BE=E7=BD=AE=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=20(#24396)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

setDefaultValue 中 From、To、Interval 改为仅在当前值为空时
才用 inputQuery 覆盖，避免覆盖用户已指定的查询时间范围与间隔
---
 pkg/monitor/models/unifiedmonitor.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkg/monitor/models/unifiedmonitor.go b/pkg/monitor/models/unifiedmonitor.go
index 49b2fe4d51..2b140bb667 100644
--- a/pkg/monitor/models/unifiedmonitor.go
+++ b/pkg/monitor/models/unifiedmonitor.go
@@ -409,9 +409,15 @@ func setDefaultValue(
 	inputQuery *monitor.MetricQueryInput,
 	scope string, ownerId mcclient.IIdentityProvider,
 	isAlert bool) {
-	query.From = inputQuery.From
-	query.To = inputQuery.To
-	query.Model.Interval = inputQuery.Interval
+	if query.From == "" {
+		query.From = inputQuery.From
+	}
+	if query.To == "" {
+		query.To = inputQuery.To
+	}
+	if query.Model.Interval == "" {
+		query.Model.Interval = inputQuery.Interval
+	}
 
 	metricMeasurement, _ := MetricMeasurementManager.GetCache().Get(query.Model.Measurement)