Merge branch 'dev'

This commit is contained in:
奔跑的面条 2025-07-28 10:38:16 +08:00
commit 63bf279826

View File

@ -23,9 +23,9 @@ import config, { includes, seriesItem } from './config'
import { mergeTheme } from '@/packages/public/chart' import { mergeTheme } from '@/packages/public/chart'
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
import { useChartDataFetch } from '@/hooks' import { useChartDataFetch } from '@/hooks'
import { isPreview } from '@/utils'
import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components' import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
import isObject from 'lodash/isObject' import isObject from 'lodash/isObject'
import { cloneDeep } from 'lodash'
const props = defineProps({ const props = defineProps({
themeSetting: { themeSetting: {
@ -61,7 +61,7 @@ watch(
if (Array.isArray(newData?.dimensions)) { if (Array.isArray(newData?.dimensions)) {
const seriesArr = [] const seriesArr = []
for (let i = 0; i < newData.dimensions.length - 1; i++) { for (let i = 0; i < newData.dimensions.length - 1; i++) {
seriesArr.push(seriesItem) seriesArr.push(cloneDeep(seriesItem))
} }
replaceMergeArr.value = ['series'] replaceMergeArr.value = ['series']
props.chartConfig.option.series = seriesArr props.chartConfig.option.series = seriesArr