From 4f48876cbd4574a82c84812b9b464960cd11d13a Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 17 Apr 2024 18:25:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=96=87=E6=9C=AC=E6=90=9C=E7=B4=A2=E5=9C=A8=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E7=9A=84=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E5=92=8C=E9=87=8D=E7=BD=AE=E6=97=B6=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/Component.vue            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index 31e899a47f..cdce465881 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -293,6 +293,12 @@ const delQueryConfig = index => {
 
 const resetData = () => {
   ;(list.value || []).reduce((pre, next) => {
+    if (next.defaultConditionValueF?.length) {
+      next.conditionValueF = next.defaultConditionValueF
+    }
+    if (next.defaultConditionValueS?.length) {
+      next.conditionValueS = next.defaultConditionValueS
+    }
     if (!next.defaultValueCheck) {
       next.defaultValue = next.multiple || +next.displayType === 7 ? [] : undefined
     }
@@ -302,8 +308,6 @@ const resetData = () => {
         ? [...next.defaultMapValue]
         : next.defaultMapValue
     }
-    next.conditionValueF = next.defaultConditionValueF
-    next.conditionValueS = next.defaultConditionValueS
     const keyList = Object.entries(next.checkedFieldsMap)
       .filter(ele => next.checkedFields.includes(ele[0]))
       .filter(ele => !!ele[1])