diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index a72e2ef3c4..5f2bc8d82a 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -468,7 +468,7 @@ public class PanelGroupService { details.add(0,request.getHeader()); HSSFWorkbook wb = new HSSFWorkbook(); //明细sheet - HSSFSheet detailsSheet = wb.createSheet("视图明细"); + HSSFSheet detailsSheet = wb.createSheet("数据"); //给单元格设置样式 CellStyle cellStyle = wb.createCellStyle(); @@ -503,7 +503,7 @@ public class PanelGroupService { } if(StringUtils.isNotEmpty(snapshot)){ //截图sheet 1px ≈ 2.33dx ≈ 0.48 dy 8*24 个单元格 - HSSFSheet snapshotSheet = wb.createSheet("截图"); + HSSFSheet snapshotSheet = wb.createSheet("图表"); short reDefaultRowHeight = (short)Math.round(request.getSnapshotHeight()*3.5/8); int reDefaultColumnWidth = (int)Math.round(request.getSnapshotWidth()*0.25/24); snapshotSheet.setDefaultColumnWidth(reDefaultColumnWidth); diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 60e8493aa2..5da0a077a3 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -37,7 +37,7 @@ {{ $t('chart.export_details') }} - + diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 9315458ad8..c51fc1c7cc 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -156,7 +156,7 @@ {{ $t('chart.export_details') }} - + -
- - - - - - +
+
+ + + + + + +
@@ -37,6 +39,9 @@ import ChartComponentS2 from '@/views/chart/components/ChartComponentS2' import LabelNormalText from '@/views/chart/components/normal/LabelNormalText' import { exportDetails } from '@/api/panel/panel' import html2canvas from 'html2canvasde' +import { hexColorToRGBA } from '@/views/chart/chart/util' +import { deepCopy } from '@/components/canvas/utils/utils' +import { get } from '@/api/system/dynamic' export default { name: 'UserView', components: { LabelNormalText, ChartComponentS2, ChartComponentG2, DeMainContainer, DeContainer, DeAsideContainer, ChartComponent, TableNormal, LabelNormal, PluginCom }, @@ -52,7 +57,8 @@ export default { }, data() { return { - refId: null + refId: null, + element: {} } }, computed: { @@ -61,7 +67,6 @@ export default { }, customStyle() { let style = { - height: '100%' } if (this.canvasStyleData.openCommonStyle) { if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) { @@ -81,6 +86,25 @@ export default { } return style }, + commonStyle() { + const style = {} + if (this.element && this.element.commonBackground) { + style['padding'] = (this.element.commonBackground.innerPadding || 0) + 'px' + style['border-radius'] = (this.element.commonBackground.borderRadius || 0) + 'px' + if (this.element.commonBackground.enable) { + if (this.element.commonBackground.backgroundType === 'innerImage') { + const innerImage = this.element.commonBackground.innerImage.replace('svg', 'png') + style['background'] = `url(${innerImage}) no-repeat` + } else if (this.element.commonBackground.backgroundType === 'outerImage') { + style['background'] = `url(${this.element.commonBackground.outerImage}) no-repeat` + } else if (this.element.commonBackground.backgroundType === 'color') { + style['background-color'] = hexColorToRGBA(this.element.commonBackground.color, this.element.commonBackground.alpha) + } + } + style['overflow'] = 'hidden' + } + return style + }, ...mapState([ 'isClickComponent', 'curComponent', @@ -88,6 +112,9 @@ export default { 'canvasStyleData' ]) }, + mounted() { + this.element = deepCopy(this.curComponent) + }, methods: { exportExcel() { const _this = this @@ -118,7 +145,7 @@ export default { const link = document.createElement('a') link.style.display = 'none' link.href = URL.createObjectURL(blob) - link.download = excelName // 下载的文件名 + link.download = excelName + '.xlsx' // 下载的文件名 document.body.appendChild(link) link.click() document.body.removeChild(link) @@ -150,4 +177,9 @@ export default { .table-class{ height: 100%; } + .canvas-class{ + width: 100%; + height: 100%; + background-size: 100% 100% !important; + }