dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(查询组件): 可以设置查询组件的内边距 #12960

Browse Source
This commit is contained in:
dataeaseShu 2024-11-13 16:00:52 +08:00
parent 59f72ec85b
commit 7af50e75d1
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ const componentBackgroundStyle = computed(() => {
innerPadding,
borderRadius
} = config.value.commonBackground
const style = {
let style = {
padding: innerPadding * deepScale.value + 'px',
borderRadius: borderRadius + 'px'
}
@ -211,6 +211,19 @@ const componentBackgroundStyle = computed(() => {
if (backgroundColorSelect && backgroundColor) {
colorRGBA = backgroundColor
}
if (config.value.innerType === 'VQuery') {
if (backgroundColorSelect) {
style = {
padding: innerPadding * deepScale.value + 'px',
borderRadius: borderRadius + 'px'
}
} else {
style = {
padding: 12 * deepScale.value + 'px',
borderRadius: '0'
}
}
}
if (config.value.innerType === 'VQuery' && backgroundColorSelect) {
if (backgroundType === 'outerImage' && typeof outerImage === 'string') {
style['background'] = `url(${imgUrlTrans(outerImage)}) no-repeat`

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

@ -886,7 +886,7 @@ const componentBackgroundStyle = computed(() => {
borderRadius
} = element.value.commonBackground
const innerPaddingTarget = ['Group'].includes(element.value.component) ? 0 : innerPadding
const style = {
let style = {
padding: innerPaddingTarget * scale.value + 'px',
borderRadius: borderRadius + 'px'
}
@ -895,6 +895,20 @@ const componentBackgroundStyle = computed(() => {
colorRGBA = backgroundColor
}
if (element.value.innerType === 'VQuery') {
if (backgroundColorSelect) {
style = {
padding: innerPadding * scale.value + 'px',
borderRadius: borderRadius + 'px'
}
} else {
style = {
padding: 12 * scale.value + 'px',
borderRadius: '0'
}
}
}
if (element.value.innerType === 'VQuery' && backgroundColorSelect) {
if (backgroundType === 'outerImage' && typeof outerImage === 'string') {
style['background'] = `url(${imgUrlTrans(outerImage)}) no-repeat`

2
core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
View File

@ -315,6 +315,7 @@ initParams()
>
<el-input-number
style="width: 100%"
:disabled="!commonBackgroundPop.backgroundColorSelect"
:effect="themes"
controls-position="right"
size="middle"
@ -334,6 +335,7 @@ initParams()
<el-input-number
style="width: 100%"
:effect="themes"
:disabled="!commonBackgroundPop.backgroundColorSelect"
controls-position="right"
size="middle"
:min="0"