From c4883eb7db6d3673a5d1d9d15f74d5110bb3681c Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 29 Nov 2022 10:32:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=98=8E=E7=BB=86=E8=A1=A8=E4=B8=8B=E4=BE=A7=E6=80=BB?=
 =?UTF-8?q?=E8=AE=A1=E5=9C=A8=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/ChartComponentS2.vue  | 10 +++++++++-
 .../src/views/chart/components/table/TableNormal.vue | 12 ++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue
index 39c91a2c90..3b9cfbaa8c 100644
--- a/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -61,7 +61,10 @@
           class="table-page"
           :style="autoStyle"
         >
-          <span class="total-style">
+          <span
+            class="total-style"
+            :style="totalStyle"
+          >
             {{ $t('chart.total') }}
             <span>{{
               chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
@@ -165,6 +168,9 @@ export default {
       remarkCfg: {
         show: false,
         content: ''
+      },
+      totalStyle: {
+        color: '#606266'
       }
     }
   },
@@ -424,6 +430,8 @@ export default {
           this.title_class.fontFamily = customStyle.text.fontFamily ? customStyle.text.fontFamily : DEFAULT_TITLE_STYLE.fontFamily
           this.title_class.letterSpacing = (customStyle.text.letterSpace ? customStyle.text.letterSpace : DEFAULT_TITLE_STYLE.letterSpace) + 'px'
           this.title_class.textShadow = customStyle.text.fontShadow ? '2px 2px 4px' : 'none'
+          // 表格总计与分页颜色，取标题颜色
+          this.totalStyle.color = customStyle.text.color
         }
         if (customStyle.background) {
           this.title_class.background = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha)
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index d99837281f..c0338e4571 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/frontend/src/views/chart/components/table/TableNormal.vue
@@ -49,7 +49,10 @@
             class="table-page-inner"
             :style="autoStyle"
           >
-            <span class="total-style">
+            <span
+              class="total-style"
+              :style="totalStyle"
+            >
               {{ $t('chart.total') }}
               <span>{{
                 chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
@@ -156,7 +159,10 @@ export default {
       showIndex: false,
       indexLabel: '序号',
       scrollBarColor: DEFAULT_COLOR_CASE.tableScrollBarColor,
-      scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor
+      scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor,
+      totalStyle: {
+        color: '#606266'
+      }
     }
   },
   computed: {
@@ -361,6 +367,8 @@ export default {
           this.title_class.textAlign = customStyle.text.hPosition
           this.title_class.fontStyle = customStyle.text.isItalic ? 'italic' : 'normal'
           this.title_class.fontWeight = customStyle.text.isBolder ? 'bold' : 'normal'
+          // 表格总计与分页颜色，取标题颜色
+          this.totalStyle.color = customStyle.text.color
         }
         if (customStyle.background) {
           this.bg_class.background = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha)