From b4091096310594a900485157897a43f6944cedf6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 11 Aug 2025 15:35:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E4=B8=8B=E6=8B=89=E6=97=A0=E6=B3=95=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue               | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 70d23aeceb..47d0f1cc16 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1445,7 +1445,7 @@ const validate = () => {
       if (!ele.defaultValueCheck) return false
       if (
         (Array.isArray(ele.defaultValue) && !ele.defaultValue.length) ||
-        (!Array.isArray(ele.defaultValue) && isNaN(ele.defaultValue))
+        (!Array.isArray(ele.defaultValue) && ['', undefined, null].includes(ele.defaultValue))
       ) {
         ElMessage.error(t('report.filter.title'))
         return true
@@ -1925,13 +1925,17 @@ const getOptions = (id, component) => {
 const handleSortChange = () => {
   handleFieldChange()
   curComponent.value.sortList = []
-  resetSort()
+  if (sortComputed.value) {
+    curComponent.value.sort = ''
+  }
 }
 
 const resetSort = () => {
   if (sortComputed.value) {
     curComponent.value.sort = ''
   }
+  if (!curComponent.value.defaultValueCheck) return
+  curComponent.value.defaultValue = curComponent.value.multiple ? [] : undefined
 }
 
 const customSortFilterRef = ref()