From bc5c98c98c2435d4f53c02bdcf5c0debb2d7b56f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 23 Nov 2021 10:49:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E6=9D=BF=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/list/PanelViewShow.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue index 89a5fb8719..181525e93f 100644 --- a/frontend/src/views/panel/list/PanelViewShow.vue +++ b/frontend/src/views/panel/list/PanelViewShow.vue @@ -23,7 +23,7 @@ ({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }}) - + {{ $t('commons.edit') }} From 47e3fc0b085fcd5002a9e19997e891d8828d958f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 23 Nov 2021 10:57:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=E6=96=87=E6=A1=88=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/custom-component/component-list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js index 86f5ddac51..0eac6b0498 100644 --- a/frontend/src/components/canvas/custom-component/component-list.js +++ b/frontend/src/components/canvas/custom-component/component-list.js @@ -90,7 +90,7 @@ export const pictureList = [ id: '20001', component: 'picture-add', type: 'picture-add', - label: '拖拽上传', + label: '图片', icon: 'iconfont icon-picture', defaultClass: 'text-filter' }, @@ -304,7 +304,7 @@ const list = [ id: '20001', component: 'picture-add', type: 'picture-add', - label: '拖拽上传', + label: '图片', icon: 'iconfont icon-picture', defaultClass: 'text-filter', style: { From cde5fb9ee67631ee4426ed366752db5925db1a56 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 23 Nov 2021 11:35:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E7=94=BB?= =?UTF-8?q?=E5=B8=83=E8=AE=BE=E8=AE=A1=E6=97=B6=E6=BB=9A=E5=8A=A8=E6=9D=A1?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AE=BE=E8=AE=A1=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/edit/index.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 1df913ca2a..4fc7b10657 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -820,7 +820,6 @@ export default { } }, canvasScroll(event) { - // console.log('testTop' + event.target.scrollTop) this.scrollLeft = event.target.scrollLeft this.scrollTop = event.target.scrollTop }, @@ -968,7 +967,6 @@ export default { height: 400px!important; .el-dialog__header{ - // background-color: #f4f4f5; padding: 10px 20px !important; .el-dialog__headerbtn { @@ -979,11 +977,16 @@ export default { padding: 1px 15px !important; } } - .style-hidden{ - overflow-x: hidden; - } +.style-hidden{ + overflow-x: hidden; +} .button-text { color: var(--TextActive); } +::-webkit-scrollbar { + width: 0px; + height: 0px; +} + From 9f879a88b43800fe3e3cc351b7b5ad2bef1247c0 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 23 Nov 2021 12:51:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E5=B1=95=E7=A4=BA=E8=BE=B9=E7=95=8C=E9=97=B4?= =?UTF-8?q?=E9=9A=99=EF=BC=8C=E4=BF=9D=E6=8C=81=E5=B8=B8=E6=9C=89=E9=97=B4?= =?UTF-8?q?=E9=9A=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Editor/ComponentWrapper.vue | 41 +++-- .../canvas/components/Editor/Preview.vue | 160 +++++++++--------- .../src/components/dataease/DeOutWidget.vue | 52 +++--- 3 files changed, 124 insertions(+), 129 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 84acd7331f..6e87cbab95 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -5,7 +5,7 @@ @click="handleClick" @mousedown="elementMouseDown" > - + - diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index cf2b0eb7c1..cea20daf31 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -1,33 +1,41 @@ @@ -94,9 +102,7 @@ export default { }, computed: { customStyle() { - let style = { - padding: this.componentGap + 'px' - } + let style = {} if (this.canvasStyleData.openCommonStyle) { if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) { style = { @@ -110,16 +116,6 @@ export default { } } } - // if (this.canvasStyleData.selfAdaption) { - // style = { - // overflow: 'hidden', - // ...style - // } - // } - // style = { - // overflow-x :'hidden', - // ...style - // } return style }, // 此处单独计算componentData的值 不放入全局mapState中 @@ -152,17 +148,17 @@ export default { const _this = this const erd = elementResizeDetectorMaker() // 监听div变动事件 - const tempDom = document.getElementById('canvasInfoMain') - erd.listenTo(tempDom, element => { + const mainDom = document.getElementById('canvasInfoMain') + erd.listenTo(mainDom, element => { _this.$nextTick(() => { _this.restore() // 将mainHeight 修改为px 临时解决html2canvas 截图不全的问题 - _this.mainHeight = tempDom.scrollHeight + 'px!important' + _this.mainHeight = mainDom.scrollHeight + 'px!important' }) }) eventBus.$on('openChartDetailsDialog', this.openChartDetailsDialog) - this.$store.commit('clearLinkageSettingInfo', false) - this.canvasStyleDataInit() + _this.$store.commit('clearLinkageSettingInfo', false) + _this.canvasStyleDataInit() }, beforeDestroy() { clearInterval(this.timer) @@ -235,8 +231,6 @@ export default { } }, handleMouseDown() { - // console.log('handleMouseDown123') - this.$store.commit('setClickComponentStatus', false) } } @@ -244,47 +238,45 @@ export default { diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue index 47316d13da..b8e1a03681 100644 --- a/frontend/src/components/dataease/DeOutWidget.vue +++ b/frontend/src/components/dataease/DeOutWidget.vue @@ -1,29 +1,31 @@