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 #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
commit 4ac696de4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 39 additions and 4 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`

10
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@ -266,11 +266,14 @@ const showTypeError = computed(() => {
ele => checkId === ele.id
)
if (!field) return false
if (displayTypeField === null) {
if (displayTypeField === null && Array.isArray(field.type)) {
displayTypeField = field
return false
}
if (displayTypeField?.deType === field?.deType && displayTypeField?.deType === 1) {
if (!Array.isArray(field.type)) {
return false
}
if (!displayTypeField.type?.length && !field.type?.length) {
return false
}
@ -1243,11 +1246,14 @@ const validate = () => {
itx => checkId === itx.id
)
if (!field) return false
if (displayTypeField === null) {
if (displayTypeField === null && Array.isArray(field.type)) {
displayTypeField = field
return false
}
if (displayTypeField?.deType === field?.deType && displayTypeField?.deType === 1) {
if (!Array.isArray(field.type)) {
return false
}
if (!displayTypeField.type?.length && !field.type?.length) {
return false
}

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"