From 239b649bcaf8c6488f466d11b23b998f163c99fb Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 31 Dec 2021 11:27:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=96=87?= =?UTF-8?q?=E5=AD=97=E7=BB=84=E4=BB=B6FontSize=E5=80=BC=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/TextAttr.vue | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 30d6284ad0..68b3822a67 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -51,7 +51,7 @@
- +
@@ -169,6 +169,9 @@ export default { showMain: true, innerOpacity: 0, mainWidthOffset: 600, + initFontSize: 12, + miniFontSize: 12, + maxFontSize: 128, textAlignOptions: [ { icon: 'iconfont icon-juzuo', @@ -285,7 +288,6 @@ export default { ] } }, - computed: { boardDivColor() { const style = { @@ -335,6 +337,17 @@ export default { this.styleInfo['opacity'] = this.innerOpacity / 100 } }, + initFontSize: { + handler(newVal) { + if (newVal < this.miniFontSize) { + this.styleInfo.fontSize = this.miniFontSize + } else if (newVal > this.maxFontSize) { + this.styleInfo.fontSize = this.maxFontSize + } else { + this.styleInfo.fontSize = newVal + } + } + }, curComponent: { handler(oldVal, newVal) { this.$nextTick(() => { @@ -346,6 +359,9 @@ export default { }, mounted() { this.init() + if (this.attrShow('fontSize')) { + this.initFontSize = this.styleInfo.fontSize + } }, methods: { @@ -389,7 +405,12 @@ export default { getPositionY(y) { return y * this.curCanvasScale.scalePointHeight }, + fontSizeChange(val) { + this.styleInfo.fontSize = val + this.styleChange() + }, styleChange() { + console.log('styleChange') this.$store.commit('recordStyleChange') } } From 765ab7587fa5dfd07cb16edb705cf97305c17c0f Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 31 Dec 2021 11:46:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/auth/service/impl/ShiroServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index b7ba1436f4..2bf63170af 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java @@ -51,6 +51,7 @@ public class ShiroServiceImpl implements ShiroService { filterChainDefinitionMap.put("/api/map/areaEntitys/**", ANON); filterChainDefinitionMap.put("/dataset/field/fieldValues/**", ANON); filterChainDefinitionMap.put("/linkJump/queryPanelJumpInfo/**", ANON); + filterChainDefinitionMap.put("/linkJump/queryTargetPanelJumpInfo", ANON); filterChainDefinitionMap.put("/tempMobileLink/**", ANON); filterChainDefinitionMap.put("/de-app/**", ANON); From 69d53f0bb6c4acbffe6704a06a257c364fcaa49b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 31 Dec 2021 15:34:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=B8=8D=E5=90=8C=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E6=97=B6=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Editor/ComponentWrapper.vue | 1 + .../src/components/dataease/DeOutWidget.vue | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 1b4d51095d..86b7d657fe 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -12,6 +12,7 @@ :id="'component' + config.id" class="component-custom" :style="getComponentStyleDefault(config.style)" + style="overflow: hidden" :out-style="config.style" :element="config" :in-screen="inScreen" diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue index c08686c29e..42ef2809cd 100644 --- a/frontend/src/components/dataease/DeOutWidget.vue +++ b/frontend/src/components/dataease/DeOutWidget.vue @@ -87,8 +87,7 @@ export default { computed: { sizeInfo() { let size - if (this.duHeight > this.inputMaxSize) { - } else if (this.duHeight > this.inputLargeSize) { + if (this.duHeight > this.inputLargeSize) { size = 'medium' } else if (this.duHeight > this.inputSmallSize) { size = 'small' @@ -101,6 +100,14 @@ export default { 'curCanvasScale' ]) }, + watch: { + element: { + handler() { + this.watchSize() + }, + deep: true + } + }, mounted() { this.watchSize() }, @@ -121,13 +128,15 @@ export default { return } const titleWidth = this.$refs.deTitle.offsetWidth - this.duHeight = height - titleWidth this.$nextTick(() => { - let min = this.element.style.fontSize * 2 + 50 + let numRange = 0 + let min = this.element.style.fontSize * 2 + 30 if (this.element.component === 'de-number-range') { - min = this.element.style.fontSize * 2 + 80 + min = this.element.style.fontSize * 2 + 55 + numRange = 25 } if (height < min) { + this.duHeight = height - numRange this.mainClass = 'condition-main-line' if (deContentContainer) { @@ -135,6 +144,7 @@ export default { deContentContainer.style.marginLeft = (titleWidth + 15) + 'px' } } else { + this.duHeight = height - titleWidth + numRange this.mainClass = '' if (deContentContainer) { deContentContainer.style.top = '2em' From abf8d04569f22687ba69e1913b47ea4c37864fc1 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 31 Dec 2021 16:16:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?style:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/TextAttr.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 68b3822a67..511ee8c81d 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -150,6 +150,7 @@ import Hyperlinks from '@/components/canvas/components/Editor/Hyperlinks' import VideoLinks from '@/components/canvas/components/Editor/VideoLinks' import DateFormat from '@/components/canvas/components/Editor/DateFormat' import { COLOR_PANEL } from '@/views/chart/chart/chart' +import { chartTransStr2Object } from '@/views/panel/panel' export default { components: { Hyperlinks, DateFormat, VideoLinks }, @@ -332,6 +333,14 @@ export default { }, watch: { + styleInfo: { + handler(newVal, oldVla) { + if (newVal.fontSize) { + this.initFontSize = newVal.fontSize + } + }, + deep: true + }, innerOpacity: { handler(oldVal, newVal) { this.styleInfo['opacity'] = this.innerOpacity / 100 @@ -405,12 +414,7 @@ export default { getPositionY(y) { return y * this.curCanvasScale.scalePointHeight }, - fontSizeChange(val) { - this.styleInfo.fontSize = val - this.styleChange() - }, styleChange() { - console.log('styleChange') this.$store.commit('recordStyleChange') } }