From 0b352f2d45d48f7b750443c67a2edaa5ca955b56 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 17 Jun 2024 10:54: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=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=20#10291?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue   | 20 +++++++++++++++++--
 de-xpack                                      |  2 +-
 2 files changed, 19 insertions(+), 3 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 b5f4372e8d..edf5679ada 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -656,11 +656,27 @@ const cancelValueSource = () => {
 }
 
 const confirmValueSource = () => {
-  if (valueSource.value.some(ele => !ele.trim())) {
+  if (
+    valueSource.value.some(ele => {
+      if (typeof ele === 'string') {
+        return !ele.trim()
+      }
+      return false
+    })
+  ) {
     ElMessage.error('手工输入-选项值不能为空')
     return
   }
-  curComponent.value.valueSource = cloneDeep(valueSource.value.filter(ele => ele.trim()))
+  console.log(cloneDeep(valueSource.value), 'valueSource')
+
+  curComponent.value.valueSource = cloneDeep(
+    valueSource.value.filter(ele => {
+      if (typeof ele === 'string') {
+        return ele.trim()
+      }
+      return true
+    })
+  )
   handleValueSourceChange()
   cancelValueSource()
 }
diff --git a/de-xpack b/de-xpack
index 4bbe092537..6dee3e0526 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 4bbe092537c4e9e793a5941b9fdee3bdaecbf42d
+Subproject commit 6dee3e0526a186626dfc42e6a4d11120e17c1eaa