From fb50315aa871157b9ee0ebaa4c9222da1f4632fb Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 12 Apr 2024 18:07:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=BD=93=E5=89=8D=E8=BF=87=E6=BB=A4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/modules/data-visualization/dvMain.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 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 e7379baa27..490bcd851e 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -828,6 +828,7 @@ export const dvMainStore = defineStore('dataVisualization', { // 获取外部参数的值 sourceInfo 是外部参数名称 支持数组传入 let paramValue = params[sourceInfo] let paramValueStr = params[sourceInfo] + const parmaValueSource = params[sourceInfo] let operator = 'in' if (paramValue && !Array.isArray(paramValue)) { paramValue = [paramValue] @@ -872,8 +873,19 @@ export const dvMainStore = defineStore('dataVisualization', { if (element.component === 'VQuery') { element.propValue.forEach(filterItem => { if (filterItem.id === targetViewId) { - filterItem.selectValue = paramValueStr - filterItem.defaultValue = paramValueStr + filterItem.defaultValueCheck = true + if (filterItem.displayType === '0' && filterItem.multiple) { + filterItem.selectValue = paramValue + filterItem.defaultValue = paramValue + } else if (filterItem.displayType === '0' && !filterItem.multiple) { + filterItem.selectValue = paramValue[0] + filterItem.defaultValue = paramValue[0] + } else if (filterItem.displayType === '8') { + filterItem.conditionValueF = parmaValueSource + } else { + filterItem.selectValue = paramValue[0] + filterItem.defaultValue = paramValue[0] + } } }) }