public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-23 13:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(图表): 堆叠组合图支持根据堆叠项进行排序

Browse Source 
#10957
This commit is contained in:
ulleo
2024-08-15 15:46:07 +08:00
parent 3457b4acf7
commit 40877397f0
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java
View File

@@ -31,7 +31,9 @@ public class StackMixHandler extends MixHandler {
axisMap.put(ChartAxis.yAxisExt, view.getYAxisExt()); axisMap.put(ChartAxis.yAxisExt, view.getYAxisExt());
//去除除了x轴以外的排序 //去除除了x轴以外的排序
axisMap.forEach((k, v) -> { axisMap.forEach((k, v) -> {
v.forEach(x -> x.setSort("none")); if (!ChartAxis.extStack.equals(k)) {
v.forEach(x -> x.setSort("none"));
}
}); });
axisMap.put(ChartAxis.extLabel, view.getExtLabel()); axisMap.put(ChartAxis.extLabel, view.getExtLabel());
axisMap.put(ChartAxis.extTooltip, view.getExtTooltip()); axisMap.put(ChartAxis.extTooltip, view.getExtTooltip());

9
core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue
View File

@@ -235,7 +235,8 @@ onMounted(() => {
@click.prevent @click.prevent
v-if=" v-if="
!chart.type.includes('chart-mix') || !chart.type.includes('chart-mix') ||
(chart.type.includes('chart-mix') && type === 'dimension') (chart.type.includes('chart-mix') &&
(type === 'dimension' || type === 'dimensionStack'))
" "
> >
<el-dropdown <el-dropdown
@@ -321,7 +322,8 @@ onMounted(() => {
v-if="item.deType === 1" v-if="item.deType === 1"
:divided=" :divided="
!chart.type.includes('chart-mix') || !chart.type.includes('chart-mix') ||
(chart.type.includes('chart-mix') && type === 'dimension') (chart.type.includes('chart-mix') &&
(type === 'dimension' || type === 'dimensionStack'))
" "
> >
<el-dropdown <el-dropdown
@@ -519,7 +521,8 @@ onMounted(() => {
class="menu-item-padding" class="menu-item-padding"
:divided=" :divided="
!chart.type.includes('chart-mix') || !chart.type.includes('chart-mix') ||
(chart.type.includes('chart-mix') && type === 'dimension') (chart.type.includes('chart-mix') &&
(type === 'dimension' || type === 'dimensionStack'))
" "
:command="beforeClickItem('rename')" :command="beforeClickItem('rename')"
> >