Explorar o código

!117 增加widgetText对多行文本的支持
Merge pull request !117 from StefanZhu/dev

Foming %!s(int64=2) %!d(string=hai) anos
pai
achega
c02137718d

+ 9 - 1
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: [

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