diff --git a/src/packages/components/Charts/Lines/LineCommon/index.vue b/src/packages/components/Charts/Lines/LineCommon/index.vue index d45e8dd8..4a977edd 100644 --- a/src/packages/components/Charts/Lines/LineCommon/index.vue +++ b/src/packages/components/Charts/Lines/LineCommon/index.vue @@ -11,6 +11,7 @@ import { LineChart } from 'echarts/charts' import config, { includes } from './config' import { mergeTheme } from '@/packages/public/chart' import { GridComponent, TooltipComponent, LegendComponent } from 'echarts/components' +import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' const props = defineProps({ themeSetting: { @@ -35,7 +36,10 @@ use([ LegendComponent ]) +const chartEditStore = useChartEditStore() + const option = computed(() => { + console.log(chartEditStore.getEditCanvasConfig.chartThemeColor) return mergeTheme(props.chartConfig.option, props.themeSetting, includes) }) diff --git a/src/store/modules/chartEditStore/chartEditStore.ts b/src/store/modules/chartEditStore/chartEditStore.ts index 55c49771..c819f229 100644 --- a/src/store/modules/chartEditStore/chartEditStore.ts +++ b/src/store/modules/chartEditStore/chartEditStore.ts @@ -541,7 +541,6 @@ export const useChartEditStore = defineStore({ if (!this.getEditCanvas.lockScale) { this.setPageSizeClass() this.setPageSize(scale) - this.setPageStyle('transform', `scale(${scale})`) this.getEditCanvas.userScale = scale if (sys) { this.getEditCanvas.scale = scale diff --git a/src/views/chart/ContentEdit/components/EditRange/index.vue b/src/views/chart/ContentEdit/components/EditRange/index.vue index 2813119f..911079e8 100644 --- a/src/views/chart/ContentEdit/components/EditRange/index.vue +++ b/src/views/chart/ContentEdit/components/EditRange/index.vue @@ -1,6 +1,6 @@