From f1300c77495e1dd1f6a6fc17420bc078969ec458 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Mon, 1 Nov 2021 15:06:17 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=9B=BE=E8=A1=A8=E7=BC=A9=E7=95=A5?=
 =?UTF-8?q?=E5=9B=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/icon.ts                           |  4 --
 src/views/Editor/Thumbnails/index.vue         |  6 +-
 .../element/ChartElement/BaseChartElement.vue | 62 +++++++------------
 .../ChartElement/ScreenChartElement.vue       | 54 +++-------------
 4 files changed, 36 insertions(+), 90 deletions(-)

diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts
index b599ec62..c97a7ef4 100644
--- a/src/plugins/icon.ts
+++ b/src/plugins/icon.ts
@@ -179,12 +179,8 @@ export default {
     
     // 图表
     app.component('IconChartHistogram', ChartHistogram)
-    app.component('IconChartHistogramOne', ChartHistogramOne)
     app.component('IconChartLine', ChartLine)
-    app.component('IconChartLineArea', ChartLineArea)
-    app.component('IconChartScatter', ChartScatter)
     app.component('IconChartPie', ChartPie)
-    app.component('IconChartRing', ChartRing)
 
     // 其他
     app.component('IconPlayOne', PlayOne)
diff --git a/src/views/Editor/Thumbnails/index.vue b/src/views/Editor/Thumbnails/index.vue
index b6940fba..aa27a1bb 100644
--- a/src/views/Editor/Thumbnails/index.vue
+++ b/src/views/Editor/Thumbnails/index.vue
@@ -44,10 +44,11 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue'
+import { computed, defineComponent, provide, ref } from 'vue'
 import { MutationTypes, useStore } from '@/store'
 import { fillDigit } from '@/utils/common'
 import { ContextmenuItem } from '@/components/Contextmenu/types'
+import { VIEWPORT_SIZE } from '@/configs/canvas'
 import useSlideHandler from '@/hooks/useSlideHandler'
 import useScreening from '@/hooks/useScreening'
 
@@ -72,6 +73,9 @@ export default defineComponent({
 
     const presetLayoutPopoverVisible = ref(false)
 
+    const scale = computed(() => 120 / VIEWPORT_SIZE)
+    provide('slideScale', scale)
+
     const {
       copySlide,
       pasteSlide,
diff --git a/src/views/components/element/ChartElement/BaseChartElement.vue b/src/views/components/element/ChartElement/BaseChartElement.vue
index b47c9063..880d2a01 100644
--- a/src/views/components/element/ChartElement/BaseChartElement.vue
+++ b/src/views/components/element/ChartElement/BaseChartElement.vue
@@ -18,13 +18,18 @@
         :height="elementInfo.height"
         :outline="elementInfo.outline"
       />
-      <IconChartHistogram :fill="elementInfo.themeColor" strokeWidth="2" :size="size" v-if="chartType === 'bar'" />
-      <IconChartHistogramOne :fill="elementInfo.themeColor" strokeWidth="2" :size="size" v-else-if="chartType === 'horizontalBar'" />
-      <IconChartLine :fill="elementInfo.themeColor" strokeWidth="2" :size="size" v-else-if="chartType === 'line'" />
-      <IconChartLineArea :fill="elementInfo.themeColor" strokeWidth="2" :size="size" v-else-if="chartType === 'area'" />
-      <IconChartScatter :fill="elementInfo.themeColor" strokeWidth="2" :size="size" v-else-if="chartType === 'scatter'" />
-      <IconChartPie :fill="elementInfo.themeColor" strokeWidth="2" :size="size" v-else-if="chartType === 'pie'" />
-      <IconChartRing :fill="elementInfo.themeColor" strokeWidth="2" :size="size" v-else-if="chartType === 'ring'" />
+      <Chart
+        :class="{ 'need-scale': needScaleSize }"
+        :width="chartWidth"
+        :height="chartHeight"
+        :type="elementInfo.chartType"
+        :data="elementInfo.data"
+        :options="elementInfo.options"
+        :themeColor="elementInfo.themeColor"
+        :gridColor="elementInfo.gridColor"
+        :legends="elementInfo.data.legends"
+        :legend="elementInfo.legend || ''"
+      />
     </div>
   </div>
 </template>
@@ -34,45 +39,28 @@ import { computed, defineComponent, PropType } from 'vue'
 import { PPTChartElement } from '@/types/slides'
 
 import ElementOutline from '@/views/components/element/ElementOutline.vue'
+import Chart from './Chart.vue'
 
 export default defineComponent({
   name: 'base-element-chart',
   components: {
     ElementOutline,
+    Chart,
   },
   props: {
     elementInfo: {
       type: Object as PropType<PPTChartElement>,
       required: true,
     },
+    needScaleSize: {
+      type: Boolean,
+      default: true,
+    },
   },
   setup(props) {
-    const size = computed(() => Math.min(props.elementInfo.width, props.elementInfo.height))
-
-    const chartType = computed(() => {
-      const _chartType = props.elementInfo.chartType
-      const _options = props.elementInfo.options
-
-      if (_chartType === 'bar') {
-        if (_options?.horizontalBars) return 'horizontalBar'
-        return 'bar'
-      }
-      else if (_chartType === 'line') {
-        if (_options?.showArea) return 'area'
-        else if (_options && _options.showLine === false) return 'scatter'
-        return 'line'
-      }
-      else if (_chartType === 'pie') {
-        if (_options?.donut) return 'ring'
-        return 'pie'
-      }
-
-      return ''
-    })
-
     return {
-      size,
-      chartType,
+      chartWidth: computed(() => props.needScaleSize ? props.elementInfo.width * 10 : props.elementInfo.width),
+      chartHeight: computed(() => props.needScaleSize ? props.elementInfo.height * 10 : props.elementInfo.height),
     }
   },
 })
@@ -82,13 +70,11 @@ export default defineComponent({
 .base-element-chart {
   position: absolute;
 }
-
 .element-content {
   width: 100%;
   height: 100%;
-  opacity: .5;
-  display: flex;
-  justify-content: center;
-  align-items: center;
 }
-</style>
+.need-scale {
+  zoom: .1;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/components/element/ChartElement/ScreenChartElement.vue b/src/views/components/element/ChartElement/ScreenChartElement.vue
index b6479d3f..4eb6d358 100644
--- a/src/views/components/element/ChartElement/ScreenChartElement.vue
+++ b/src/views/components/element/ChartElement/ScreenChartElement.vue
@@ -1,50 +1,21 @@
 <template>
-  <div class="screen-element-chart"
-    :style="{
-      top: elementInfo.top + 'px',
-      left: elementInfo.left + 'px',
-      width: elementInfo.width + 'px',
-      height: elementInfo.height + 'px',
-    }"
-  >
-    <div 
-      class="element-content"
-      :style="{
-        backgroundColor: elementInfo.fill,
-      }"
-    >
-      <ElementOutline
-        :width="elementInfo.width"
-        :height="elementInfo.height"
-        :outline="elementInfo.outline"
-      />
-      <Chart
-        :width="elementInfo.width"
-        :height="elementInfo.height"
-        :type="elementInfo.chartType"
-        :data="elementInfo.data"
-        :options="elementInfo.options"
-        :themeColor="elementInfo.themeColor"
-        :gridColor="elementInfo.gridColor"
-        :legends="elementInfo.data.legends"
-        :legend="elementInfo.legend || ''"
-      />
-    </div>
-  </div>
+  <BaseChartElement
+    class="screen-element-chart"
+    :elementInfo="elementInfo"
+    :needScaleSize="false"
+  />
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue'
 import { PPTChartElement } from '@/types/slides'
 
-import ElementOutline from '@/views/components/element/ElementOutline.vue'
-import Chart from './Chart.vue'
+import BaseChartElement from './BaseChartElement.vue'
 
 export default defineComponent({
   name: 'screen-element-chart',
   components: {
-    ElementOutline,
-    Chart,
+    BaseChartElement,
   },
   props: {
     elementInfo: {
@@ -54,14 +25,3 @@ export default defineComponent({
   },
 })
 </script>
-
-<style lang="scss" scoped>
-.screen-element-chart {
-  position: absolute;
-}
-
-.element-content {
-  width: 100%;
-  height: 100%;
-}
-</style>