From 3ce6aaebfb9481a048598bf456de183defb67ba0 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 1 Dec 2021 14:47:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E5=AF=BC=E5=87=BApdf=E4=BC=98=E5=8C=96=EF=BC=8C=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E5=AF=BC=E5=87=BA=E7=94=BB=E9=9D=A2=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/panel/view.js | 3 +++ .../src/components/canvas/components/Editor/Preview.vue | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/src/api/panel/view.js b/frontend/src/api/panel/view.js index 1c3f9c12c6..5cc64150b1 100644 --- a/frontend/src/api/panel/view.js +++ b/frontend/src/api/panel/view.js @@ -4,6 +4,7 @@ export function tree(data) { return request({ url: '/api/panelView/tree', method: 'post', + timeout: 30000, data }) } @@ -12,6 +13,7 @@ export function viewsWithIds(data) { return request({ url: '/api/panelView/viewsWithIds', method: 'post', + timeout: 30000, loading: true, data }) @@ -21,6 +23,7 @@ export function findOne(id) { return request({ url: '/api/panelView/findOne/' + id, method: 'get', + timeout: 30000, loading: true }) } diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 27cf09c80b..83496631e7 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -4,6 +4,7 @@
{ _this.$nextTick(() => { _this.restore() + }) + }) + // 监听div变动事件 + const tempCanvas = document.getElementById('canvasInfoTemp') + erd.listenTo(tempCanvas, element => { + _this.$nextTick(() => { // 将mainHeight 修改为px 临时解决html2canvas 截图不全的问题 - _this.mainHeight = mainDom.scrollHeight + 'px!important' + _this.mainHeight = tempCanvas.scrollHeight + 'px!important' }) }) eventBus.$on('openChartDetailsDialog', this.openChartDetailsDialog) From f75d00eda622b2d3b946739b16a12a1c10d7611d Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 1 Dec 2021 15:14:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E7=94=BB=E5=B8=83=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=97=B6=EF=BC=8C=E6=8B=96=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6=E4=BC=9A=E9=9D=A0=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/components/Editor/index.vue | 7 +++++-- frontend/src/views/panel/edit/index.vue | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 43417422d3..a56ec4bd6c 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -813,6 +813,10 @@ export default { y: 18 } } + }, + scrollTop: { + type: Number, + default: 0 } }, data() { @@ -1251,9 +1255,8 @@ export default { } }, handleDragOver(e) { - // console.log('handleDragOver-Editor') this.dragComponentInfo.shadowStyle.x = e.pageX - 220 - this.dragComponentInfo.shadowStyle.y = e.pageY - 90 + this.dragComponentInfo.shadowStyle.y = e.pageY - 90 + this.scrollTop this.dragComponentInfo.style.left = this.dragComponentInfo.shadowStyle.x / this.scalePointWidth this.dragComponentInfo.style.top = this.dragComponentInfo.shadowStyle.y / this.scalePointHeight if (this.dragComponentInfo.auxiliaryMatrix) { diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index dfd7316478..c25f8668e7 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -106,7 +106,7 @@ @mouseup="deselectCurComponent" @scroll="canvasScroll" > - +
@@ -126,7 +126,7 @@ id="canvasInfoMobile" class="this_mobile_canvas_main" > - + From 9247bb61882fa9ee21c8b656adc226552ee37358 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 1 Dec 2021 16:42:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DPDF=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=B2=A1=E6=9C=89=E8=83=8C=E6=99=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/Editor/Preview.vue | 9 ++++++++- .../SubjectSetting/PanelStyle/BackgroundSelector.vue | 1 + frontend/src/views/panel/export/PDFPreExport.vue | 2 +- frontend/src/views/panel/list/PanelViewShow.vue | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 83496631e7..07db29246d 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -4,7 +4,7 @@
- +
From 901d7a852d11c3e83014efe03818c95c73e275c3 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 1 Dec 2021 16:47:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E5=8E=BB=E9=99=A4=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8E=A7=E4=BB=B6=E5=A4=96=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/components/TextAttr.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 1bca4d1795..0e8ce60e93 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -78,14 +78,6 @@
- - - - -
- -
- From 784d5f335de6f548912c84b938153827c7136ebe Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 1 Dec 2021 17:06:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E6=96=87=E6=9C=AC=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=88=87=E6=8D=A2=E5=8D=95=E9=80=89=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/edit/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index c25f8668e7..5a08771880 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -661,8 +661,6 @@ export default { }, sureFilter() { this.currentFilterCom.options.value = [] - const component = deepCopy(this.currentFilterCom) - this.$store.commit('setComponentWithId', component) this.$store.commit('recordSnapshot', 'sureFilter') this.closeFilter() },