center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #10613 from ulleo/dev-v2

Browse Source 
feat(图表): 柱线组合图标签位置设置增加提示：仅针对柱状图设置有效
This commit is contained in:
ulleo 2024-06-28 19:21:08 +08:00 committed by GitHub
commit 6319e9738a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/core-frontend/src/locales/zh-CN.ts
View File

@ -588,6 +588,7 @@ export default {
shape_attr: '图形属性', shape_attr: '图形属性',
module_style: '组件样式', module_style: '组件样式',
result_filter: '过滤器', result_filter: '过滤器',
chart_mix_label_only_left: '仅针对柱状图设置有效',
x_axis: '横轴', x_axis: '横轴',
y_axis: '纵轴', y_axis: '纵轴',
chart: '图表', chart: '图表',

26
core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
View File

@ -1,5 +1,5 @@
<script lang="ts" setup> <script lang="ts" setup>
import { computed, inject, onMounted, PropType, reactive, ref, watch } from 'vue' import { computed, onMounted, PropType, reactive, ref, watch } from 'vue'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import { COLOR_PANEL, DEFAULT_LABEL } from '@/views/chart/components/editor/util/chart' import { COLOR_PANEL, DEFAULT_LABEL } from '@/views/chart/components/editor/util/chart'
import { ElIcon, ElSpace } from 'element-plus-secondary' import { ElIcon, ElSpace } from 'element-plus-secondary'
@ -10,7 +10,6 @@ import { fieldType } from '@/utils/attr'
import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
import Icon from '../../../../../../components/icon-custom/src/Icon.vue' import Icon from '../../../../../../components/icon-custom/src/Icon.vue'
import { deepCopy } from '@/utils/utils'
const { t } = useI18n() const { t } = useI18n()
@ -439,12 +438,25 @@ onMounted(() => {
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item v-if="showPositionV" class="form-item" :class="'form-item-' + themes">
v-if="showPositionV" <template #label>
:label="t('chart.label_position')" {{ t('chart.label_position') }}
class="form-item" <el-tooltip
:class="'form-item-' + themes" class="item"
:effect="toolTip"
placement="top"
v-if="chart.type.includes('chart-mix')"
> >
<template #content>
<span v-html="t('chart.chart_mix_label_only_left')"></span>
</template>
<span style="vertical-align: middle">
<el-icon style="cursor: pointer">
<Icon name="icon_info_outlined" />
</el-icon>
</span>
</el-tooltip>
</template>
<el-select <el-select
size="small" size="small"
:effect="themes" :effect="themes"