From 30aa4ef4bad289b25f0c0224bfdb18edf8562c61 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 11 Sep 2025 17:54:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E4=B8=AD=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=9C=E8=B6=85=E5=87=BA=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=8C=83=E5=9B=B4=E2=80=9D=20#16914?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/QueryConditionConfiguration.vue    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 40fcc0648e..4f35c03fa1 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -2228,6 +2228,8 @@ const timeGranularityMultipleChange = (val: string) => {
     curComponent.value.relativeToCurrentRange = relativeToCurrentListRange.value[0]?.value
   }
 
+  if (curComponent.value.timeRange) return
+
   curComponent.value.timeRange = {
     intervalType: 'none',
     dynamicWindow: false,

From ece44793852785324e76cab3bc2d726d8dfb93f9 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 11 Sep 2025 17:53:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20sqlbot=E8=AE=BE=E7=BD=AE=E7=82=B9=E5=87=BB=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BC=9A=E5=85=B3=E9=97=AD=E6=8A=BD=E5=B1=89=E5=B9=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E4=BD=86=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=A0=A1=E9=AA=8C=E7=9A=84=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/parameter/third-party/ThirdEdit.vue     | 14 +++++++++++---
 .../views/system/parameter/third-party/index.vue   | 10 +++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/system/parameter/third-party/ThirdEdit.vue b/core/core-frontend/src/views/system/parameter/third-party/ThirdEdit.vue
index 2d2d695b79..00aa5b6f26 100644
--- a/core/core-frontend/src/views/system/parameter/third-party/ThirdEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/third-party/ThirdEdit.vue
@@ -110,19 +110,27 @@ const closeLoading = () => {
   loadingInstance.value?.close()
 }
 
-const validateHandler = () => {
+const validateHandlerOnly = () => {
   let url = `${
     state.form.domain.endsWith('/') ? state.form.domain : state.form.domain + '/'
   }api/v1/system/assistant/info/${state.form.id}`
   fetch(url)
-    .then(response => response.json())
+    .then(response => {
+      if (!response.ok) {
+        throw new Error('Network response was not ok')
+      }
+      return response.json()
+    })
     .then(() => {
       state.form.valid = true
       ElMessage.success(t('datasource.validate_success'))
     })
     .catch(() => {
+      ElMessage.error(t('data_source.verification_failed'))
       state.form.enabled = false
       state.form.valid = false
+    })
+    .finally(() => {
       save()
     })
 }
@@ -158,7 +166,7 @@ defineExpose({
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="resetForm(dingtalkForm)">{{ t('common.cancel') }}</el-button>
-        <el-button :disabled="!state.form.id || !state.form.domain" @click="validateHandler">
+        <el-button :disabled="!state.form.id || !state.form.domain" @click="validateHandlerOnly">
           {{ t('commons.validate') }}
         </el-button>
         <el-button type="primary" @click="submitForm(dingtalkForm)">
diff --git a/core/core-frontend/src/views/system/parameter/third-party/index.vue b/core/core-frontend/src/views/system/parameter/third-party/index.vue
index 04f0c524c6..90214e0fa1 100644
--- a/core/core-frontend/src/views/system/parameter/third-party/index.vue
+++ b/core/core-frontend/src/views/system/parameter/third-party/index.vue
@@ -67,14 +67,22 @@ const validateHandler = () => {
     info.value.domain.endsWith('/') ? info.value.domain : info.value.domain + '/'
   }api/v1/system/assistant/info/${info.value.id}`
   fetch(url)
-    .then(response => response.json())
+    .then(response => {
+      if (!response.ok) {
+        throw new Error('Network response was not ok')
+      }
+      return response.json()
+    })
     .then(() => {
       info.value.valid = true
       ElMessage.success(t('datasource.validate_success'))
     })
     .catch(() => {
+      ElMessage.error(t('data_source.verification_failed'))
       info.value.enabled = false
       info.value.valid = false
+    })
+    .finally(() => {
       save()
     })
 }