From 16aaea3310aafa65a0eacf660793e216f9e3709b Mon Sep 17 00:00:00 2001
From: zxc <1171051090@qq.com>
Date: Sun, 15 Sep 2024 12:09:16 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=9B=BE=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChartStylePanel/ChartDataEditor.vue       | 27 ++++++++++++++++---
 .../ChartStylePanel/index.vue                 |  1 +
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/ChartDataEditor.vue b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/ChartDataEditor.vue
index 894ffc19..ffff49af 100644
--- a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/ChartDataEditor.vue
+++ b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/ChartDataEditor.vue
@@ -80,12 +80,13 @@
 
 <script lang="ts" setup>
 import { computed, onMounted, onUnmounted, ref } from 'vue'
-import type { ChartData } from '@/types/slides'
+import type { ChartData, ChartType } from '@/types/slides'
 import { KEYS } from '@/configs/hotkey'
 import { pasteCustomClipboardString, pasteExcelClipboardString } from '@/utils/clipboard'
 import Button from '@/components/Button.vue'
 
 const props = defineProps<{
+  type: ChartType
   data: ChartData
 }>()
 
@@ -177,8 +178,8 @@ const getTableData = () => {
   const [col, row] = selectedRange.value
 
   const labels: string[] = []
-  const legends: string[] = []
-  const series: number[][] = []
+  let legends: string[] = []
+  let series: number[][] = []
 
   // 第一行为系列名，第一列为项目名，实际数据从第二行第二列开始
   for (let rowIndex = 1; rowIndex < row; rowIndex++) {
@@ -207,6 +208,26 @@ const getTableData = () => {
     series.push(seriesItem)
   }
 
+  // 一些特殊图表类型，数据需要单独处理
+  // 散点图有且只有两列数据
+  if (props.type === 'scatter') {
+    if (legends.length > 2) {
+      legends = legends.slice(0, 2)
+      series = series.slice(0, 2)
+    }
+    if (legends.length < 2) {
+      legends.push('Y')
+      series.push(series[0])
+    }
+  }
+  // 饼图和环形图只有一列数据
+  if (props.type === 'ring' || props.type === 'pie') {
+    if (legends.length > 1) {
+      legends = legends.slice(0, 1)
+      series = series.slice(0, 1)
+    }
+  }
+
   emit('save', { labels, legends, series })
 }
 
diff --git a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/index.vue b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/index.vue
index 8cb0e121..89b5e01d 100644
--- a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/index.vue
+++ b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/index.vue
@@ -105,6 +105,7 @@
       :width="640"
     >
       <ChartDataEditor 
+        :type="handleChartElement.chartType"
         :data="handleChartElement.data"
         @close="chartDataEditorVisible = false"
         @save="value => updateData(value)"