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'