center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9083 from dataease/pr@dev-v2@feat_outer-params2

Browse Source 
refactor(仪表板): 优化外部参数，兼容当前过滤组件
This commit is contained in:
王嘉豪 2024-04-12 18:08:00 +08:00 committed by GitHub
commit a28aefe164
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/core-frontend/src/store/modules/data-visualization/dvMain.ts
View File

@ -828,6 +828,7 @@ export const dvMainStore = defineStore('dataVisualization', {
// 获取外部参数的值 sourceInfo 是外部参数名称 支持数组传入 // 获取外部参数的值 sourceInfo 是外部参数名称 支持数组传入
let paramValue = params[sourceInfo] let paramValue = params[sourceInfo]
let paramValueStr = params[sourceInfo] let paramValueStr = params[sourceInfo]
const parmaValueSource = params[sourceInfo]
let operator = 'in' let operator = 'in'
if (paramValue && !Array.isArray(paramValue)) { if (paramValue && !Array.isArray(paramValue)) {
paramValue = [paramValue] paramValue = [paramValue]
@ -872,8 +873,19 @@ export const dvMainStore = defineStore('dataVisualization', {
if (element.component === 'VQuery') { if (element.component === 'VQuery') {
element.propValue.forEach(filterItem => { element.propValue.forEach(filterItem => {
if (filterItem.id === targetViewId) { if (filterItem.id === targetViewId) {
filterItem.selectValue = paramValueStr filterItem.defaultValueCheck = true
filterItem.defaultValue = paramValueStr 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]
}
} }
}) })
} }