From e38f4829331a68a6383c1790ac86ca228389c3c3 Mon Sep 17 00:00:00 2001 From: lana-k Date: Sat, 28 Aug 2021 19:07:10 +0200 Subject: [PATCH] saveAsPng refactoring --- src/lib/utils/clipboardIo.js | 1 - .../Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/lib/utils/clipboardIo.js b/src/lib/utils/clipboardIo.js index f6620b7..aabdff4 100644 --- a/src/lib/utils/clipboardIo.js +++ b/src/lib/utils/clipboardIo.js @@ -30,7 +30,6 @@ export default { async copyImage (source) { if (source instanceof HTMLCanvasElement) { - console.log('canvas') return _copyCanvas(source) } else { return _copyFromDataUrl(source) diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue index 1a5a9a4..19de9fe 100644 --- a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue +++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue @@ -164,14 +164,13 @@ export default { async saveAsPng () { if (this.viewCustomChart) { this.pivotOptions.rendererOptions.customChartComponent.saveAsPng() - } else if (this.viewStandartChart) { - const url = await chartHelper.getImageDataUrl(this.$refs.pivotOutput, 'png') - this.$emit('loadingImageCompleted') - fIo.downloadFromUrl(url, 'pivot') } else { - const canvas = await getPivotCanvas(this.$refs.pivotOutput) + const source = this.viewStandartChart ? + await chartHelper.getImageDataUrl(this.$refs.pivotOutput, 'png') : + (await getPivotCanvas(this.$refs.pivotOutput)).toDataURL('image/png') + this.$emit('loadingImageCompleted') - fIo.downloadFromUrl(canvas.toDataURL('image/png'), 'pivot', 'image/png') + fIo.downloadFromUrl(source, 'pivot') } },