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

Merge pull request #9255 from dataease/pr@dev-v2@refactor_chart_style

Browse Source 
Pr@dev v2@refactor chart style
This commit is contained in:
wisonic-s 2024-04-22 17:34:44 +08:00 committed by GitHub
commit 5eb6222cd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
View File

@ -198,6 +198,39 @@ onMounted(() => {
</el-checkbox>
</el-form-item>
<div class="alpha-setting" v-if="showProperty('alpha')">
<label class="alpha-label" :class="{ dark: 'dark' === themes }">
{{ t('chart.not_alpha') }}
</label>
<el-row style="flex: 1" :gutter="8">
<el-col :span="13">
<el-form-item class="form-item alpha-slider" :class="'form-item-' + themes">
<el-slider
:effect="themes"
v-model="state.basicStyleForm.alpha"
@change="changeBasicStyle('alpha')"
/>
</el-form-item>
</el-col>
<el-col :span="11" style="padding-top: 2px">
<el-form-item class="form-item" :class="'form-item-' + themes">
<el-input
type="number"
:effect="themes"
v-model="state.basicStyleForm.alpha"
:min="0"
:max="100"
class="basic-input-number"
:controls="false"
@change="changeBasicStyle('alpha')"
>
<template #suffix> % </template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<!--map start-->
<el-row :gutter="8">
<el-col :span="12" v-if="showProperty('areaBorderColor')">
@ -372,39 +405,6 @@ onMounted(() => {
</el-row>
<!--table end-->
<div class="alpha-setting" v-if="showProperty('alpha')">
<label class="alpha-label" :class="{ dark: 'dark' === themes }">
{{ t('chart.not_alpha') }}
</label>
<el-row style="flex: 1" :gutter="8">
<el-col :span="13">
<el-form-item class="form-item alpha-slider" :class="'form-item-' + themes">
<el-slider
:effect="themes"
v-model="state.basicStyleForm.alpha"
@change="changeBasicStyle('alpha')"
/>
</el-form-item>
</el-col>
<el-col :span="11" style="padding-top: 2px">
<el-form-item class="form-item" :class="'form-item-' + themes">
<el-input
type="number"
:effect="themes"
v-model="state.basicStyleForm.alpha"
:min="0"
:max="100"
class="basic-input-number"
:controls="false"
@change="changeBasicStyle('alpha')"
>
<template #suffix> % </template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<!--table2 start-->
<el-form-item
:label="t('chart.table_column_width_config')"

4
core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
View File

@ -29,9 +29,9 @@ import { DOM } from '@antv/l7-utils'
export function getPadding(chart: Chart): number[] {
if (chart.drill) {
return [0, 10, 26, 10]
return [0, 10, 22, 10]
} else {
return [0, 10, 14, 10]
return [0, 10, 10, 10]
}
}
// color,label,tooltip,axis,legend,background

4
core/core-frontend/src/views/chart/components/views/index.vue
View File

@ -587,9 +587,9 @@ const toolTip = computed(() => {
const marginBottom = computed<string | 0>(() => {
if (titleShow.value || trackMenu.value.length > 0 || state.title_remark.show) {
return 8 * scale.value + 'px'
return 12 * scale.value + 'px'
}
return 0
return 12
})
const iconSize = computed<string>(() => {