From 4f1f5b1fab5990d7d67905771af07f582ce2cafd Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <1171051090@qq.com>
Date: Fri, 15 Jan 2021 16:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4chart=E5=85=83=E7=B4=A0?=
 =?UTF-8?q?=E5=92=8C=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 -
 src/components/Chart.vue                      | 130 ------------------
 src/mocks/index.ts                            |  20 ---
 src/types/slides.ts                           |   1 -
 .../ElementStylePanel/ChartStylePanel.vue     |  18 ++-
 src/views/Screen/ScreenElement.vue            |   1 -
 src/views/Screen/ScreenSlide.vue              |   9 +-
 src/views/Screen/index.vue                    |   4 +-
 src/views/components/ThumbnailSlide/index.vue |   3 +-
 .../element/ChartElement/BaseChartElement.vue |  24 +---
 .../components/element/ChartElement/index.vue |  18 +--
 11 files changed, 28 insertions(+), 202 deletions(-)
 delete mode 100644 src/components/Chart.vue

diff --git a/package.json b/package.json
index 3a8e2a50..44dd8356 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
   "dependencies": {
     "animate.css": "^4.1.1",
     "ant-design-vue": "^2.0.0-rc.3",
-    "chart.js": "^2.9.4",
     "clipboard": "^2.0.6",
     "core-js": "^3.6.5",
     "crypto-js": "^4.0.0",
@@ -35,7 +34,6 @@
     "vuex": "^4.0.0-0"
   },
   "devDependencies": {
-    "@types/chart.js": "^2.9.29",
     "@types/clipboard": "^2.0.1",
     "@types/crypto-js": "^4.0.1",
     "@types/jest": "^24.0.19",
diff --git a/src/components/Chart.vue b/src/components/Chart.vue
deleted file mode 100644
index e8046dd1..00000000
--- a/src/components/Chart.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <div 
-    class="chart"
-    :style="{
-      width: width * scale + 'px',
-      height: height * scale + 'px',
-      transform: `scale(${1 / scale})`,
-    }"
-  >
-    <canvas ref="canvasRef"></canvas>
-  </div>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, onMounted, onUnmounted, PropType, ref, watch } from 'vue'
-import Chart from 'chart.js'
-import { ChartData, ChartType } from '@/types/slides'
-
-const commonConfigs = {
-  backgroundColor: 'rgba(209, 68, 36, 0.3)',
-  borderColor: 'rgba(209, 68, 36)',
-  borderWidth: 2,
-}
-
-const defaultOptions: Chart.ChartOptions = {
-  maintainAspectRatio: false,
-  animation: {
-    duration: 0,
-  },
-  hover: {
-    animationDuration: 0,
-  },
-  responsiveAnimationDuration: 0,
-  layout: {
-    padding: {
-      left: 5,
-      right: 5,
-      top: 5,
-      bottom: 5,
-    },
-  },
-  legend: {
-    display: false,
-  },
-  elements: {
-    line: {
-      tension: 0,
-      fill: false,
-      ...commonConfigs,
-    },
-    rectangle: {
-      ...commonConfigs,
-    },
-    arc: {
-      ...commonConfigs,
-    },
-  },
-}
-
-export default defineComponent({
-  name: 'chart',
-  props: {
-    type: {
-      type: String as PropType<ChartType>,
-      required: true,
-    },
-    width: {
-      type: Number,
-      required: true,
-    },
-    height: {
-      type: Number,
-      required: true,
-    },
-    data: {
-      type: Object as PropType<ChartData>,
-      required: true,
-    },
-    options: {
-      type: Object as PropType<Chart.ChartOptions>,
-    },
-    scale: {
-      type: Number,
-      default: 1,
-    },
-  },
-  setup(props) {
-    const canvasRef = ref<HTMLCanvasElement | null>(null)
-    let chart: Chart
-
-    const data = computed(() => ({
-      labels: props.data.labels,
-      datasets: props.data.series.map(item => ({ data: item })),
-    }))
-
-    const options = computed(() => {
-      const options = props.options || {}
-      return { ...defaultOptions, ...options }
-    })
-
-    watch(data, () => {
-      if(!chart) return
-      chart.data = data.value
-      chart.update()
-    })
-
-    onMounted(() => {
-      if(!canvasRef.value) return
-      const ctx = canvasRef.value.getContext('2d') as CanvasRenderingContext2D
-      chart = new Chart(ctx, {
-        type: props.type,
-        data: data.value,
-        options: options.value,
-      })
-    })
-
-    onUnmounted(() => chart.destroy())
-
-    return {
-      canvasRef,
-    }
-  },
-})
-</script>
-
-<style lang="scss" scoped>
-.chart {
-  transform-origin: 0 0;
-}
-</style>
\ No newline at end of file
diff --git a/src/mocks/index.ts b/src/mocks/index.ts
index c1c2fb2e..62741730 100644
--- a/src/mocks/index.ts
+++ b/src/mocks/index.ts
@@ -73,26 +73,6 @@ export const slides: Slide[] = [
       },
     ],
   },
-  {
-    id: 'sahduyi',
-    elements: [
-      {
-        id: 'sdasdax',
-        type: 'chart',
-        left: 0,
-        top: 0,
-        width: 400,
-        height: 400,
-        chartType: 'line',
-        data: {
-          labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
-          series: [
-            [12, 19, 3, 5, 4, 18],
-          ]
-        },
-      },
-    ],
-  },
   {
     id: 'sajd172',
     elements: [
diff --git a/src/types/slides.ts b/src/types/slides.ts
index 4a726568..40434e59 100644
--- a/src/types/slides.ts
+++ b/src/types/slides.ts
@@ -122,7 +122,6 @@ export interface PPTChartElement {
   chartType: ChartType;
   data: ChartData;
   outline?: PPTElementOutline;
-  theme?: string;
 }
 
 export interface TableElementCell {
diff --git a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel.vue
index 8c37f3ef..56a30267 100644
--- a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel.vue
+++ b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel.vue
@@ -1,13 +1,27 @@
 <template>
   <div class="chart-style-panel">
-    chart-style-panel
+    <ElementOutline />
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue'
 
+import ElementOutline from '../common/ElementOutline.vue'
+
 export default defineComponent({
   name: 'chart-style-panel',
+  components: {
+    ElementOutline,
+  },
 })
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.row {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Screen/ScreenElement.vue b/src/views/Screen/ScreenElement.vue
index 301877b1..f83890dc 100644
--- a/src/views/Screen/ScreenElement.vue
+++ b/src/views/Screen/ScreenElement.vue
@@ -9,7 +9,6 @@
     <component
       :is="currentElementComponent"
       :elementInfo="elementInfo"
-      target="screen"
     ></component>
   </div>
 </template>
diff --git a/src/views/Screen/ScreenSlide.vue b/src/views/Screen/ScreenSlide.vue
index d30102dd..7341e98b 100644
--- a/src/views/Screen/ScreenSlide.vue
+++ b/src/views/Screen/ScreenSlide.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script lang="ts">
-import { computed, PropType, defineComponent, inject } from 'vue'
+import { computed, PropType, defineComponent } from 'vue'
 import { Slide } from '@/types/slides'
 import { VIEWPORT_SIZE, VIEWPORT_ASPECT_RATIO } from '@/configs/canvas'
 import useSlideBackgroundStyle from '@/hooks/useSlideBackgroundStyle'
@@ -37,6 +37,10 @@ export default defineComponent({
       type: Object as PropType<Slide>,
       required: true,
     },
+    scale: {
+      type: Number,
+      required: true,
+    },
     animationIndex: {
       type: Number,
       default: -1,
@@ -46,10 +50,7 @@ export default defineComponent({
     const background = computed(() => props.slide.background)
     const { backgroundStyle } = useSlideBackgroundStyle(background)
 
-    const scale = inject('scale')
-
     return {
-      scale,
       backgroundStyle,
       VIEWPORT_SIZE,
       VIEWPORT_ASPECT_RATIO,
diff --git a/src/views/Screen/index.vue b/src/views/Screen/index.vue
index 85d6c318..0e88550a 100644
--- a/src/views/Screen/index.vue
+++ b/src/views/Screen/index.vue
@@ -27,6 +27,7 @@
         >
           <ScreenSlide 
             :slide="slide" 
+            :scale="scale"
             :animationIndex="animationIndex"
           />
         </div>
@@ -58,7 +59,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onMounted, onUnmounted, provide, Ref, ref } from 'vue'
+import { computed, defineComponent, onMounted, onUnmounted, Ref, ref } from 'vue'
 import { useStore } from 'vuex'
 import throttle from 'lodash/throttle'
 import { MutationTypes, State } from '@/store'
@@ -89,7 +90,6 @@ export default defineComponent({
     const slideHeight = ref(0)
 
     const scale = computed(() => slideWidth.value / VIEWPORT_SIZE)
-    provide('scale', scale)
 
     const slideThumbnailModelVisible = ref(false)
 
diff --git a/src/views/components/ThumbnailSlide/index.vue b/src/views/components/ThumbnailSlide/index.vue
index 4cec8bde..081361be 100644
--- a/src/views/components/ThumbnailSlide/index.vue
+++ b/src/views/components/ThumbnailSlide/index.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="ts">
-import { computed, PropType, defineComponent, provide } from 'vue'
+import { computed, PropType, defineComponent } from 'vue'
 import { Slide } from '@/types/slides'
 import { VIEWPORT_SIZE, VIEWPORT_ASPECT_RATIO } from '@/configs/canvas'
 import useSlideBackgroundStyle from '@/hooks/useSlideBackgroundStyle'
@@ -52,7 +52,6 @@ export default defineComponent({
     const { backgroundStyle } = useSlideBackgroundStyle(background)
 
     const scale = computed(() => props.size / VIEWPORT_SIZE)
-    provide('scale', 1)
 
     return {
       scale,
diff --git a/src/views/components/element/ChartElement/BaseChartElement.vue b/src/views/components/element/ChartElement/BaseChartElement.vue
index 78c462e2..213a5e35 100644
--- a/src/views/components/element/ChartElement/BaseChartElement.vue
+++ b/src/views/components/element/ChartElement/BaseChartElement.vue
@@ -13,47 +13,27 @@
         :height="elementInfo.height"
         :outline="elementInfo.outline"
       />
-      <Chart
-        :type="elementInfo.chartType"
-        :width="elementInfo.width"
-        :height="elementInfo.height"
-        :data="elementInfo.data"
-        :scale="scale"
-        :options="target === 'thumbnail' ? { tooltips: { enabled: false } } : {}"
-      />
+      Chart
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, inject, PropType } from 'vue'
+import { defineComponent, PropType } from 'vue'
 import { PPTChartElement } from '@/types/slides'
 
 import ElementOutline from '@/views/components/element/ElementOutline.vue'
-import Chart from '@/components/Chart.vue'
 
 export default defineComponent({
   name: 'base-element-chart',
   components: {
     ElementOutline,
-    Chart,
   },
   props: {
     elementInfo: {
       type: Object as PropType<PPTChartElement>,
       required: true,
     },
-    target: {
-      type: String as PropType<'thumbnail' | 'screen'>,
-      required: true,
-    },
-  },
-  setup() {
-    const scale = inject('scale') || 1
-
-    return {
-      scale,
-    }
   },
 })
 </script>
diff --git a/src/views/components/element/ChartElement/index.vue b/src/views/components/element/ChartElement/index.vue
index ee690714..85ed52e2 100644
--- a/src/views/components/element/ChartElement/index.vue
+++ b/src/views/components/element/ChartElement/index.vue
@@ -18,32 +18,22 @@
         :height="elementInfo.height"
         :outline="elementInfo.outline"
       />
-      <Chart
-        :type="elementInfo.chartType"
-        :width="elementInfo.width"
-        :height="elementInfo.height"
-        :data="elementInfo.data"
-        :scale="canvasScale"
-      />
+      Chart
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue'
-import { useStore } from 'vuex'
-import { State } from '@/store'
+import { defineComponent, PropType } from 'vue'
 import { PPTChartElement } from '@/types/slides'
 import { ContextmenuItem } from '@/components/Contextmenu/types'
 
 import ElementOutline from '@/views/components/element/ElementOutline.vue'
-import Chart from '@/components/Chart.vue'
 
 export default defineComponent({
   name: 'editable-element-chart',
   components: {
     ElementOutline,
-    Chart,
   },
   props: {
     elementInfo: {
@@ -66,12 +56,8 @@ export default defineComponent({
       props.selectElement(e, props.elementInfo)
     }
 
-    const store = useStore<State>()
-    const canvasScale = computed(() => store.state.canvasScale)
-
     return {
       handleSelectElement,
-      canvasScale,
     }
   },
 })