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 @@ - - - - - \ 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 @@ \ No newline at end of file + + + \ 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 @@ 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 @@ 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