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

fix(查询组件): 把checkbox勾选框去掉，没有意义

Browse Source
This commit is contained in:
dataeaseShu
2025-02-06 10:01:13 +08:00
committed by xuwei-fit2cloud
parent 05e6e9221b
commit 0976825070
3 changed files with 40 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/custom-component/v-query/Component.vue
View File

@@ -76,8 +76,6 @@ const defaultStyle = {
titleShow: false,
titleColor: '',
textColorShow: false,
bgColorShow: false,
borderShow: false,
labelShow: true,
title: '',
labelColor: '#1f2329',
@@ -145,9 +143,7 @@ const { datasetFieldList } = comInfo()
const setCustomStyle = val => {
const {
borderShow,
borderColor,
bgColorShow,
btnList,
titleLayout,
labelColor,
@@ -172,8 +168,8 @@ const setCustomStyle = val => {
placeholderShow,
labelShow
} = val
customStyle.background = bgColorShow ? bgColor || '' : ''
customStyle.border = borderShow ? borderColor || '' : ''
customStyle.background = bgColor || ''
customStyle.border = borderColor || ''
customStyle.btnList = [...btnList]
customStyle.layout = layout
customStyle.placeholderShow = placeholderShow ?? true

2
core/core-frontend/src/store/modules/data-visualization/dvMain.ts
View File

@@ -486,14 +486,12 @@ export const dvMainStore = defineStore('dataVisualization', {
show: true,
color,
titleShow: false,
borderShow: false,
text,
textColorShow: false,
labelColor,
borderColor,
title: '',
borderWidth: 1,
bgColorShow: false,
bgColor,
titleColor,
titleLayout,

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

@@ -298,27 +298,49 @@ const onTitleChange = () => {
</el-collapse-item>
<el-collapse-item :effect="themes" name="addition" :title="t('v_query.query_condition')">
<el-form @keydown.stop.prevent.enter label-position="top">
<el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
<el-checkbox
:effect="themes"
size="small"
v-model="chart.customStyle.component.borderShow"
>
{{ t('visualization.board') }}
</el-checkbox>
</el-form-item>
<el-row :gutter="8">
<el-col :span="12">
<el-form-item
:label="t('visualization.board')"
class="form-item w100"
:class="'form-item-' + themes"
>
<el-color-picker
:effect="themes"
:trigger-width="106"
is-custom
v-model="chart.customStyle.component.borderColor"
:predefine="predefineColors"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
:label="t('chart.background')"
class="form-item w100"
:class="'form-item-' + themes"
>
<el-color-picker
:effect="themes"
:trigger-width="106"
is-custom
v-model="chart.customStyle.component.bgColor"
:predefine="predefineColors"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item
:effect="themes"
class="form-item"
style="padding-left: 20px"
:label="t('visualization.query_condition_space')"
:class="'form-item-' + themes"
>
<el-color-picker
<el-input-number
v-model="chart.customStyle.component.queryConditionSpacing"
:min="0"
:effect="themes"
:trigger-width="108"
is-custom
v-model="chart.customStyle.component.borderColor"
:disabled="!chart.customStyle.component.borderShow"
:predefine="predefineColors"
controls-position="right"
/>
</el-form-item>
<el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
@@ -403,42 +425,6 @@ const onTitleChange = () => {
v-model.lazy="currentSearch.queryConditionWidth"
/>
</el-form-item>
<el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
<el-checkbox
:effect="themes"
size="small"
v-model="chart.customStyle.component.bgColorShow"
>
{{ t('visualization.custom_query_bg_color') }}
</el-checkbox>
</el-form-item>
<el-form-item
class="form-item"
style="padding-left: 20px"
:class="'form-item-' + themes"
>
<el-color-picker
:effect="themes"
:trigger-width="108"
is-custom
v-model="chart.customStyle.component.bgColor"
:disabled="!chart.customStyle.component.bgColorShow"
:predefine="predefineColors"
/>
</el-form-item>
<el-form-item
:effect="themes"
class="form-item"
:label="t('visualization.query_condition_space')"
:class="'form-item-' + themes"
>
<el-input-number
v-model="chart.customStyle.component.queryConditionSpacing"
:min="0"
:effect="themes"
controls-position="right"
/>
</el-form-item>
</el-form>
</el-collapse-item>
<collapse-switch-item