From 67f0e5ff865ddb159e6c20223641392e239e6d7b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 6 Nov 2024 13:21:04 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E5=B5=8C=E5=85=A5?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=82=E6=95=B0=E4=BC=A0=E5=8F=82=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5=E6=B8=85=E7=A9=BA=E6=A0=87=E5=BF=97=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E9=A2=84=E8=AE=BE=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/data-visualization/dvMain.ts      | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 02470986ff..453e295127 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -1107,7 +1107,12 @@ export const dvMainStore = defineStore('dataVisualization', {
         targetInfoList.forEach(targetInfo => {
           const targetInfoArray = targetInfo.split('#')
           const targetViewId = targetInfoArray[0] // 目标图表
-          if (element.component === 'UserView' && element.id === targetViewId) {
+          // DE_EMPTY 为清空条件标志
+          if (
+            element.component === 'UserView' &&
+            element.id === targetViewId &&
+            'DE_EMPTY' !== paramValueStr
+          ) {
             // 如果目标图表 和 当前循环组件id相等 则进行条件增减
             const targetFieldId = targetInfoArray[1] // 目标图表列ID
             const condition = {
@@ -1152,6 +1157,8 @@ export const dvMainStore = defineStore('dataVisualization', {
                     filterItem['selectValue'] = queryParams[0]
                     filterItem['defaultValue'] = queryParams[0]
                   }
+                  filterItem['defaultMapValue'] = queryParams
+                  filterItem['mapValue'] = queryParams
                 } else if (filterItem.displayType === '1') {
                   // 1 时间类型
                   filterItem['selectValue'] = queryParams[0]
@@ -1162,8 +1169,14 @@ export const dvMainStore = defineStore('dataVisualization', {
                   filterItem['defaultValue'] = queryParams
                 } else if (filterItem.displayType === '8') {
                   // 8 文本搜索
-                  filterItem.conditionValueF = parmaValueSource + ''
-                  filterItem.defaultConditionValueF = parmaValueSource + ''
+                  filterItem['conditionValueF'] = parmaValueSource + ''
+                  filterItem['defaultConditionValueF'] = parmaValueSource + ''
+                }
+                if ('DE_EMPTY' === paramValueStr) {
+                  filterItem['selectValue'] = null
+                  filterItem['defaultValue'] = null
+                  filterItem['conditionValueF'] = null
+                  filterItem['defaultConditionValueF'] = null
                 }
               }
             })
@@ -1268,8 +1281,8 @@ export const dvMainStore = defineStore('dataVisualization', {
                   }
                 } else if (filterItem.displayType === '8') {
                   // 8 文本搜索
-                  filterItem.conditionValueF = queryParams[0]
-                  filterItem.defaultConditionValueF = queryParams[0]
+                  filterItem['conditionValueF'] = queryParams[0]
+                  filterItem['defaultConditionValueF'] = queryParams[0]
                 }
               }
             })