diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue index fc507c3b55..19dcfebf07 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue @@ -193,7 +193,8 @@ watch( const state = reactive({ tooltipForm: { - tooltipFormatter: DEFAULT_TOOLTIP.tooltipFormatter + tooltipFormatter: DEFAULT_TOOLTIP.tooltipFormatter, + carousel: DEFAULT_TOOLTIP.carousel } as DeepPartial }) diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts index c35cb138dc..c4758a46a3 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/flow-map.ts @@ -6,7 +6,7 @@ import { L7Wrapper } from '@/views/chart/components/js/panel/types/impl/l7' import { MAP_EDITOR_PROPERTY_INNER } from '@/views/chart/components/js/panel/charts/map/common' -import { flow, hexColorToRGBA, parseJson } from '@/views/chart/components/js/util' +import { hexColorToRGBA, parseJson } from '@/views/chart/components/js/util' import { deepCopy } from '@/utils/utils' import { GaodeMap } from '@antv/l7-maps' import { Scene } from '@antv/l7-scene' @@ -310,8 +310,4 @@ export class FlowMap extends L7ChartView { chart.customAttr.misc.flowMapConfig.lineConfig.mapLineAnimate = true return chart } - - protected setupOptions(chart: Chart, config: L7Config): L7Config { - return flow(this.configEmptyDataStrategy)(chart, config) - } } diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/symbolic-map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/symbolic-map.ts index d02a0c8798..f24309b64b 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/symbolic-map.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/symbolic-map.ts @@ -6,7 +6,7 @@ import { L7Wrapper } from '@/views/chart/components/js/panel/types/impl/l7' import { MAP_EDITOR_PROPERTY_INNER } from '@/views/chart/components/js/panel/charts/map/common' -import { flow, hexColorToRGBA, parseJson } from '@/views/chart/components/js/util' +import { hexColorToRGBA, parseJson } from '@/views/chart/components/js/util' import { deepCopy } from '@/utils/utils' import { GaodeMap } from '@antv/l7-maps' import { Scene } from '@antv/l7-scene' @@ -307,7 +307,7 @@ export class SymbolicMap extends L7ChartView { * @returns {string} */ buildTooltipContent = (tooltip, fieldData, showFields) => { - let content = '' + let content = `` if (tooltip.customContent) { content = tooltip.customContent showFields.forEach(field => { @@ -320,7 +320,7 @@ export class SymbolicMap extends L7ChartView { }
` }) } - return content + return content.replace(/\n/g, '
') } /** @@ -394,8 +394,4 @@ export class SymbolicMap extends L7ChartView { } return chart } - - protected setupOptions(chart: Chart, config: L7Config): L7Config { - return flow(this.configEmptyDataStrategy, this.configLabel)(chart, config) - } } diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/tooltip-carousel.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/tooltip-carousel.ts index 874135a490..598d34f090 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/tooltip-carousel.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/tooltip-carousel.ts @@ -553,7 +553,7 @@ export class CarouselManager { }
` }) } - return content + return content.replace(/\n/g, '
') } /** * 合并详情到 map