public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-21 04:08:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13285 from dataease/pr@dev-v2_dzz

Browse Source 
fix(查询组件): 日期类型校验，日期格式不一致，无法创建查询条件。
This commit is contained in:
xuwei-fit2cloud
2024-11-13 16:26:07 +08:00
committed by GitHub
parent 322eaf2809 7af50e75d1
commit 4ac696de4e
4 changed files with 39 additions and 4 deletions
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`