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 51009820..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, @@ -90,6 +90,14 @@ export const widgetText = { ], value: 'center' }, + { + type: 'el-switch', + label: '识别换行符', + name: 'whiteSpace', + required: false, + placeholder: '', + value: true, + } ], // 数据 data: [ 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 95b59718..fa60696f 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue @@ -40,7 +40,8 @@ export default { height: this.transStyle.height + "px", left: this.transStyle.left + "px", top: this.transStyle.top + "px", - right: this.transStyle.right + "px" + right: this.transStyle.right + "px", + whiteSpace: this.transStyle.whiteSpace ? "pre-line": "normal" }; } },