diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue index 098f42f62c..e551be3428 100644 --- a/core/core-frontend/src/custom-component/v-query/Component.vue +++ b/core/core-frontend/src/custom-component/v-query/Component.vue @@ -374,7 +374,11 @@ const opacityStyle = computed(() => { {{ customStyle.title }}

@@ -447,7 +451,6 @@ const opacityStyle = computed(() => { .v-query-container { width: 100%; height: 100%; - padding: 16px; overflow: auto; position: relative; @@ -580,8 +583,11 @@ const opacityStyle = computed(() => { z-index: 0; } - &.vertical { + &.title-show { height: calc(100% - 22px); + } + + &.vertical { .query-fields-container { .query-field { padding-top: 30px; diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts index 66776aded3..88148d13b7 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -314,6 +314,8 @@ export const dvMainStore = defineStore('dataVisualization', { this.canvasViewInfo[component.id] = newView } if (component.component === 'VQuery') { + const { color, titleColor, labelColor, borderColor, bgColor, text, titleLayout, layout } = + this.canvasStyleData.component.filterStyle || {} const newView = { ...JSON.parse(JSON.stringify(BASE_VIEW_CONFIG)), id: component.id, @@ -322,21 +324,21 @@ export const dvMainStore = defineStore('dataVisualization', { customStyle: { component: { show: true, - color: '#1f2329', + color, titleShow: false, borderShow: false, - text: '#1f2329', + text, textColorShow: false, labelColorShow: false, - labelColor: '', - borderColor: '', + labelColor, + borderColor, title: '', borderWidth: 1, bgColorShow: false, - bgColor: '', - titleColor: '', - titleLayout: 'left', - layout: 'horizontal', + bgColor, + titleColor, + titleLayout, + layout, btnList: ['sure'] } } diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts index 7c2deda5bb..1b7c06e9b4 100644 --- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts +++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts @@ -148,11 +148,11 @@ export const FILTER_COMMON_STYLE_BASE = { export const FILTER_COMMON_STYLE_LIGHT = { ...FILTER_COMMON_STYLE_BASE, - labelColor: '#000000', - titleColor: '#000000', - color: '#000000', - borderColor: '#F3E7E7', - text: '#484747', + labelColor: '#1f2329', + titleColor: '#1f2329', + color: '#1f2329', + borderColor: '#bbbfc4', + text: '#1f2329', bgColor: '#FFFFFF' }