diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts index 6bcfc3af77..6da095a553 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -696,6 +696,10 @@ declare interface ChartLabelAttr { * 显隐 */ show: boolean + /** + * 收缩下的显示标签 + */ + childrenShow?: boolean /** * 位置 */ @@ -772,6 +776,11 @@ declare interface ChartLabelAttr { customContent?: string showGap?: boolean + + /** + * 显示极值 + */ + showExtremum?: boolean } /** * 提示设置 diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue index ed06bc41fd..7ee22442cf 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue @@ -222,7 +222,9 @@ const showSeriesLabelFormatter = computed(() => { }) const showDivider = computed(() => { const DIVIDER_PROPS = ['labelFormatter', 'showDimension', 'showQuota', 'showProportion'] - return includesAny(props.propertyInner, ...DIVIDER_PROPS) && !isBarRangeTime.value + return ( + includesAny(props.propertyInner, ...DIVIDER_PROPS) && !isBarRangeTime.value && !isGroupBar.value + ) }) const isBarRangeTime = computed(() => { @@ -249,7 +251,7 @@ const showPositionH = computed(() => { }) const showPositionV = computed(() => { if (showProperty('vPosition')) { - if (props.chart.type !== 'bidirectional-bar') { + if (props.chart.type !== 'bidirectional-bar' && props.chart.type !== 'bar-group') { return true } return props.chart.customAttr.basicStyle.layout === 'vertical' @@ -303,6 +305,9 @@ const defaultPlaceholder = computed(() => { onMounted(() => { init() }) +const isGroupBar = computed(() => { + return props.chart.type === 'bar-group' +})