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

Merge pull request #12713 from dataease/pr@dev-v2_st

Browse Source 
fix(查询组件): 过滤组件背景图片和背景颜色同时显示
This commit is contained in:
dataeaseShu 2024-10-15 17:10:39 +08:00 committed by GitHub
commit b8e837a0a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
View File

@ -210,7 +210,13 @@ const componentBackgroundStyle = computed(() => {
if (backgroundColorSelect && backgroundColor) {
colorRGBA = backgroundColor
}
if (backgroundImageEnable || (config.value.innerType === 'VQuery' && backgroundColorSelect)) {
if (config.value.innerType === 'VQuery' && backgroundColorSelect) {
if (backgroundType === 'outerImage' && typeof outerImage === 'string') {
style['background'] = `url(${imgUrlTrans(outerImage)}) no-repeat`
} else {
style['background-color'] = colorRGBA
}
} else if (backgroundImageEnable) {
if (backgroundType === 'outerImage' && typeof outerImage === 'string') {
style['background'] = `url(${imgUrlTrans(outerImage)}) no-repeat ${colorRGBA}`
} else {

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

@ -876,7 +876,14 @@ const componentBackgroundStyle = computed(() => {
if (backgroundColorSelect && backgroundColor) {
colorRGBA = backgroundColor
}
if (backgroundImageEnable || (element.value.innerType === 'VQuery' && backgroundColorSelect)) {
if (element.value.innerType === 'VQuery' && backgroundColorSelect) {
if (backgroundType === 'outerImage' && typeof outerImage === 'string') {
style['background'] = `url(${imgUrlTrans(outerImage)}) no-repeat`
} else {
style['background-color'] = colorRGBA
}
} else if (backgroundImageEnable) {
if (backgroundType === 'outerImage' && typeof outerImage === 'string') {
style['background'] = `url(${imgUrlTrans(outerImage)}) no-repeat ${colorRGBA}`
} else {