diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 21380ad271..4c7e6b0f7c 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -1881,6 +1881,7 @@ const deleteChartFieldItem = id => { {{ t('chart.area') }} +
{
{{ chartViewInstance.axisConfig.xAxis.name }} + {
{{ chartViewInstance.axisConfig.xAxisExt.name }} + {
{{ chartViewInstance.axisConfig.flowMapStartName.name }} + {
{{ chartViewInstance.axisConfig.flowMapEndName.name }} + {
{{ chartViewInstance.axisConfig.extStack.name }} + {
{{ chartViewInstance.axisConfig.extColor.name }} + { {{ chartViewInstance.axisConfig.yAxis.name }} + {
{{ chartViewInstance.axisConfig.extBubble.name }} + {
{{ chartViewInstance.axisConfig.yAxisExt.name }} + {
{{ chartViewInstance.axisConfig.yAxis.name }} + {
{{ chartViewInstance.axisConfig.yAxisExt.name }} + { {{ chartViewInstance.axisConfig.extBubble.name }} + { axis: AxisType[] = [...BAR_AXIS_TYPE] axisConfig = { ...this['axisConfig'], + xAxis: { + name: `${t('chart.drag_block_type_axis')} / ${t('chart.dimension')}`, + type: 'd' + }, yAxis: { name: `${t('chart.drag_block_value_axis')} / ${t('chart.quota')}`, type: 'q' diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts index d2ea51b2c6..5320ff300c 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts @@ -310,7 +310,8 @@ export class HorizontalStackBar extends HorizontalBar { extStack: { name: `${t('chart.stack_item')} / ${t('chart.dimension')}`, type: 'd', - limit: 1 + limit: 1, + allowEmpty: true } } propertyInner = { diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts index 9abe42d2bc..0fee10c2ec 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts @@ -23,6 +23,10 @@ const DEFAULT_DATA = [] */ export class RangeBar extends G2PlotChartView { axisConfig = { + xAxis: { + name: `${t('chart.drag_block_type_axis')} / ${t('chart.dimension')}`, + type: 'd' + }, yAxis: { name: `${t('chart.drag_block_value_start')} / ${t('chart.time_dimension_or_quota')}`, limit: 1, diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts index d3d9c4689e..f44cf36fed 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts @@ -298,7 +298,8 @@ export class StackArea extends Area { extStack: { name: `${t('chart.stack_item')} / ${t('chart.dimension')}`, type: 'd', - limit: 1 + limit: 1, + allowEmpty: true } } protected configLabel(chart: Chart, options: AreaOptions): AreaOptions { diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/line/line.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/line/line.ts index 8ea273032d..b5bfb30743 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/line/line.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/line/line.ts @@ -49,7 +49,8 @@ export class Line extends G2PlotChartView { xAxisExt: { name: `${t('chart.chart_group')} / ${t('chart.dimension')}`, type: 'd', - limit: 1 + limit: 1, + allowEmpty: true }, yAxis: { name: `${t('chart.drag_block_value_axis')} / ${t('chart.quota')}`, diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts index 1b215ff71e..d38dbfc300 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts @@ -20,9 +20,9 @@ const { t } = useI18n() const DEFAULT_DATA = [] /** - * 区间条形图 + * 桑基图 */ -export class RangeBar extends G2PlotChartView { +export class SankeyBar extends G2PlotChartView { axisConfig = { xAxis: { name: `${t('chart.drag_block_type_axis_start')} / ${t('chart.dimension')}`, @@ -32,7 +32,8 @@ export class RangeBar extends G2PlotChartView { xAxisExt: { name: `${t('chart.drag_block_type_axis_end')} / ${t('chart.dimension')}`, limit: 1, - type: 'd' + type: 'd', + allowEmpty: true }, yAxis: { name: `${t('chart.chart_data')} / ${t('chart.quota')}`, diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter.ts index d0d9e2cef6..8c39c1110a 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter.ts @@ -81,7 +81,8 @@ export class Scatter extends G2PlotChartView { }, yAxis: { ...this['axisConfig'].yAxis, - limit: undefined + limit: undefined, + allowEmpty: false }, extBubble: { name: `${t('chart.bubble_size')} / ${t('chart.quota')}`,