From 174546d3304eaf05b7bcdf72a6e43cb2943addcc Mon Sep 17 00:00:00 2001
From: qianming <isqianmin@163.com>
Date: Wed, 7 Aug 2024 16:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=AE=BE=E8=AE=A1=E5=99=A8-?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=E8=A1=A8=E5=A4=B4=E8=A1=A8?=
 =?UTF-8?q?=E4=BD=93=E5=A2=9E=E5=8A=A0=E6=96=87=E5=AD=97=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/configure/texts/widget-table.js     | 82 +++++++++++++++++++
 .../designer/widget/texts/widgetTable.vue     |  6 ++
 2 files changed, 88 insertions(+)

diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js
index c506dc67..8d90397c 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js
@@ -79,6 +79,47 @@ export const widgetTable = {
               placeholder: '',
               value: '#fff',
             },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'headTextFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '字体风格',
+              name: 'headTextFontStyle',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '字体系列',
+              name: 'headTextFontFamily',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'sans-serif', name: 'sans-serif'},
+                {code: 'serif', name: 'serif'},
+                {code: 'Arial', name: 'Arial'},
+                {code: 'Courier New', name: 'Courier New'},
+              ],
+              value: 'sans-serif'
+            },
             {
               type: 'vue-color',
               label: '表头背景色',
@@ -121,6 +162,47 @@ export const widgetTable = {
               placeholder: '',
               value: '#fff',
             },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'bodyTextFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '字体风格',
+              name: 'bodyTextFontStyle',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '字体系列',
+              name: 'bodyTextFontFamily',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'sans-serif', name: 'sans-serif'},
+                {code: 'serif', name: 'serif'},
+                {code: 'Arial', name: 'Arial'},
+                {code: 'Courier New', name: 'Courier New'},
+              ],
+              value: 'sans-serif'
+            },
             {
               type: 'vue-color',
               label: '表体背景色',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue
index e5653ee8..a101f951 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue
@@ -82,6 +82,9 @@ export default {
       return {
         "text-align": headStyle.textAlignHeader,
         "font-size": headStyle.fontSizeHeader + "px",
+        "font-weight": headStyle.headTextFontWeight,
+        "font-style": headStyle.headTextFontStyle,
+        "font-family": headStyle.headTextFontFamily,
         "border-style": headStyle.isLine ? "solid" : "none",
         "border-width": headStyle.borderWidth + "px",
         "border-color": headStyle.borderColor,
@@ -96,6 +99,9 @@ export default {
       return {
         "text-align": bodyStyle.textAlignBody,
         "font-size": bodyStyle.fontSizeBody + "px",
+        "font-weight": bodyStyle.bodyTextFontWeight,
+        "font-style": bodyStyle.bodyTextFontStyle,
+        "font-family": bodyStyle.bodyTextFontFamily,
         "border-style": bodyStyle.isLine ? "solid" : "none",
         "border-width": bodyStyle.borderWidth + "px",
         "border-color": bodyStyle.borderColor,