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

Merge pull request #3699 from dataease/pr@dev@refactor_filter_check

Browse Source 
feat(视图): 视图中过滤增加数值校验
This commit is contained in:
fit2cloud-chenyw 2022-11-09 17:08:07 +08:00 committed by GitHub
commit e2a80b7ac1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/src/views/chart/components/dragItem/utils.js
View File

@ -10,18 +10,32 @@ export function getItemType(dimensionData, quotaData, item) {
if (status === 'd') { if (status === 'd') {
for (let i = 0; i < dimensionData.length; i++) { for (let i = 0; i < dimensionData.length; i++) {
const ele = dimensionData[i] const ele = dimensionData[i]
if (((item.chartId && item.extField === 2 && item.tableId === ele.tableId) || ele.id === item.id) && ele.deType === item.deType && ele.groupType === item.groupType) { if (item.chartId) {
checked = true if (ele.dataeaseName === item.dataeaseName && ele.deType === item.deType && ele.groupType === item.groupType) {
break checked = true
break
}
} else {
if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) {
checked = true
break
}
} }
} }
} }
if (status === 'q') { if (status === 'q') {
for (let i = 0; i < quotaData.length; i++) { for (let i = 0; i < quotaData.length; i++) {
const ele = quotaData[i] const ele = quotaData[i]
if (((item.chartId && item.extField === 2 && item.tableId === ele.tableId) || ele.id === item.id) && ele.deType === item.deType && ele.groupType === item.groupType) { if (item.chartId) {
checked = true if (ele.dataeaseName === item.dataeaseName && ele.deType === item.deType && ele.groupType === item.groupType) {
break checked = true
break
}
} else {
if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) {
checked = true
break
}
} }
} }
} }