diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue index a33d08eae0..081e402d0d 100644 --- a/frontend/src/components/dataease/DeOutWidget.vue +++ b/frontend/src/components/dataease/DeOutWidget.vue @@ -10,10 +10,18 @@ -
+
-
+
+
+
@@ -71,6 +80,7 @@ export default { sizeInfo() { let size if (this.h > this.inputMaxSize) { + return size } else if (this.h > this.inputLargeSize) { size = 'medium' } else if (this.h > this.inputSmallSize) { @@ -99,14 +109,12 @@ export default { const titleWidth = this.$refs.deTitle.offsetWidth const deContentContainer = this.$refs.deContentContainer this.$nextTick(() => { - let min = 75 + let min = this.element.style.fontSize * 2 + 50 if (this.element.component === 'de-number-range') { - min = 105 + min = this.element.style.fontSize * 2 + 80 } if (height < min) { - // console.log(titleWidth) this.mainClass = 'condition-main-line' - /* deContentContainer && (deContentContainer.style.inset = '0 0 0 ' + (titleWidth + 15) + 'px') */ if (deContentContainer) { deContentContainer.style.top = '0px' @@ -114,9 +122,8 @@ export default { } } else { this.mainClass = '' - /* deContentContainer && (deContentContainer.style.inset = '33px 0px 0px') */ if (deContentContainer) { - deContentContainer.style.top = '33px' + deContentContainer.style.top = '2em' deContentContainer.style.marginLeft = '0px' } } @@ -125,37 +132,38 @@ export default { } } } + diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue index 4f331b26c2..fc8adad0d5 100644 --- a/frontend/src/components/widget/DeWidget/DeDate.vue +++ b/frontend/src/components/widget/DeWidget/DeDate.vue @@ -19,9 +19,13 @@