diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 639bb5f740..289774c142 100644
--- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -274,7 +274,7 @@ export default {
} else {
return {
...
- getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
+ getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
position: 'relative'
}
}
diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue
index 9c27ac73e7..029227716e 100644
--- a/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/frontend/src/components/canvas/components/editor/Preview.vue
@@ -95,6 +95,49 @@
@closePreExport="closePreExport"
/>
+
+
+
+
+
+ {{ $t('chart.export_img') }}
+
+
+ {{ $t('chart.export') }}Excel
+
+
+
+
@@ -117,10 +160,11 @@ import html2canvas from 'html2canvasde'
import { queryAll } from '@/api/panel/pdfTemplate'
import PDFPreExport from '@/views/panel/export/PDFPreExport'
import { listenGlobalKeyDownPreview } from '@/components/canvas/utils/shortcutKey'
+import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
const erd = elementResizeDetectorMaker()
export default {
- components: { ComponentWrapper, CanvasOptBar, PDFPreExport },
+ components: { UserViewDialog, ComponentWrapper, CanvasOptBar, PDFPreExport },
model: {
prop: 'show',
event: 'change'
@@ -189,6 +233,10 @@ export default {
},
data() {
return {
+ chartDetailsVisible: false,
+ showChartInfo: {},
+ showChartTableInfo: {},
+ showChartInfoType: 'details',
mainHeightCount: null,
userInfo: null,
previewMainDomId: 'preview-main-' + this.canvasId,
@@ -381,6 +429,7 @@ export default {
if (this.terminal === 'mobile') {
this.initMobileCanvas()
}
+ this.canvasId === 'canvas-main' && bus.$on('pcChartDetailsDialog', this.openChartDetailsDialog)
bus.$on('trigger-search-button', this.triggerSearchButton)
bus.$on('trigger-reset-button', this.triggerResetButton)
this.initPdfTemplate()
@@ -389,10 +438,19 @@ export default {
erd.uninstall(this.$refs[this.previewTempRefId])
erd.uninstall(this.$refs[this.previewRefId])
clearInterval(this.timer)
+ this.canvasId === 'canvas-main' && bus.$off('pcChartDetailsDialog', this.openChartDetailsDialog)
bus.$off('trigger-search-button', this.triggerSearchButton)
bus.$off('trigger-reset-button', this.triggerResetButton)
},
methods: {
+ openChartDetailsDialog(paramInfo) {
+ if (this.canvasId === 'canvas-main') {
+ this.showChartInfo = paramInfo.showChartInfo
+ this.showChartTableInfo = paramInfo.showChartTableInfo
+ this.showChartInfoType = paramInfo.showChartInfoType
+ this.chartDetailsVisible = true
+ }
+ },
initWatermark(waterDomId = 'preview-main-canvas-main') {
if (this.panelInfo.watermarkInfo && this.canvasId === 'canvas-main') {
if (this.userInfo) {
@@ -585,10 +643,10 @@ export default {
}
},
exportExcel() {
- this.$refs['userViewDialog'].exportExcel()
+ this.$refs['userViewDialog-canvas-main'].exportExcel()
},
exportViewImg() {
- this.$refs['userViewDialog'].exportViewImg()
+ this.$refs['userViewDialog-canvas-main'].exportViewImg()
},
deselectCurComponent(e) {
if (!this.isClickComponent) {
diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index a6cd3f3a8c..00f4b230f0 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -232,6 +232,11 @@ export default {
ChartComponentG2
},
props: {
+ inScreen: {
+ type: Boolean,
+ required: false,
+ default: true
+ },
canvasId: {
type: String,
required: true
@@ -871,7 +876,13 @@ export default {
this.showChartInfo = this.chart
this.showChartTableInfo = tableChart
this.showChartInfoType = params.openType
- if (this.terminal === 'pc') {
+ if (!this.inScreen) {
+ bus.$emit('pcChartDetailsDialog', {
+ showChartInfo: this.showChartInfo,
+ showChartTableInfo: this.showChartTableInfo,
+ showChartInfoType: this.showChartInfoType
+ })
+ } else if (this.terminal === 'pc') {
this.chartDetailsVisible = true
} else {
this.mobileChartDetailsVisible = true
diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index f12aae39d9..2a87d53365 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -2,7 +2,7 @@