From 261f94cb0aefeeac1ebcc87a8b11e76de6b0e8a3 Mon Sep 17 00:00:00 2001 From: Stefan Zhu Date: Wed, 28 Jun 2023 16:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=86=85=E5=AE=B9=E6=94=B9?= =?UTF-8?q?=E4=B8=BAtextArea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/tools/configure/texts/widget-text.js | 2 +- .../bigscreenDesigner/designer/widget/texts/widgetText.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js index 3541314f..505dcc4f 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js @@ -24,7 +24,7 @@ export const widgetText = { value: '文本框', }, { - type: 'el-input-text', + type: 'el-input-textarea', label: '文本内容', name: 'text', required: false, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue index 6575872c..fa60696f 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue @@ -41,7 +41,7 @@ export default { left: this.transStyle.left + "px", top: this.transStyle.top + "px", right: this.transStyle.right + "px", - whiteSpace: this.transStyle.whiteSpace ? "pre-line": null + whiteSpace: this.transStyle.whiteSpace ? "pre-line": "normal" }; } },