github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5812 from dataease/pr@dev@refactor_field

Browse Source 
refactor: 计算字段表达式与视图中使用的不匹配则标记红色
This commit is contained in:
Junjun 2023-08-01 13:50:29 +08:00 committed by GitHub
commit 422e33fc98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,12 +11,12 @@ export function getItemType(dimensionData, quotaData, item) {
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) { if (item.chartId) {
if (ele.dataeaseName === item.dataeaseName && ele.deType === item.deType && ele.groupType === item.groupType) { if (ele.dataeaseName === item.dataeaseName && ele.deType === item.deType && ele.groupType === item.groupType && ele.originName === item.originName) {
checked = true checked = true
break break
} }
} else { } else {
if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) { if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType && ele.originName === item.originName) {
checked = true checked = true
break break
} }
@ -27,12 +27,12 @@ export function getItemType(dimensionData, quotaData, item) {
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) { if (item.chartId) {
if (ele.dataeaseName === item.dataeaseName && ele.deType === item.deType && ele.groupType === item.groupType) { if (ele.dataeaseName === item.dataeaseName && ele.deType === item.deType && ele.groupType === item.groupType && ele.originName === item.originName) {
checked = true checked = true
break break
} }
} else { } else {
if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) { if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType && ele.originName === item.originName) {
checked = true checked = true
break break
} }