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

Merge pull request #11271 from dataease/pr@dev-v2@fix_batch

Browse Source 
fix(数据大屏): 修复部分情况依然可以将组合选入批量设置中
This commit is contained in:
王嘉豪 2024-07-30 17:06:42 +08:00 committed by GitHub
commit 642c5cdcc8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
View File

@ -39,7 +39,7 @@ const areaDataPush = component => {
component.isShow && component.isShow &&
component.canvasId === 'canvas-main' && component.canvasId === 'canvas-main' &&
component.category !== 'hidden' && component.category !== 'hidden' &&
component.component !== 'GroupArea' !['Group', 'GroupArea'].includes(component.component)
) { ) {
areaData.value.components.push(component) areaData.value.components.push(component)
} }
@ -75,7 +75,7 @@ const shiftDataPush = curClickIndex => {
!component.isLock && !component.isLock &&
component.isShow && component.isShow &&
component.category !== 'hidden' && component.category !== 'hidden' &&
component.component !== 'GroupArea' !['Group', 'GroupArea'].includes(component.component)
) )
areaData.value.components.push(...shiftAreaComponents) areaData.value.components.push(...shiftAreaComponents)
dvMainStore.setCurComponent({ component: null, index: null }) dvMainStore.setCurComponent({ component: null, index: null })

2
core/core-frontend/src/components/data-visualization/canvas/Shape.vue
View File

@ -413,7 +413,7 @@ const areaDataPush = component => {
!component.isLock && !component.isLock &&
component.isShow && component.isShow &&
component.canvasId === 'canvas-main' && component.canvasId === 'canvas-main' &&
component.component !== 'GroupArea' !['Group', 'GroupArea'].includes(component.component)
) { ) {
areaData.value.components.push(component) areaData.value.components.push(component)
} }