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" }; } },