From 78f293ce6fe8275d4ddfdfbd76c58768f4f37955 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 13 Jun 2024 17:25:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=A1=A8=E7=9A=84=E5=88=86=E9=A1=B5=EF=BC=8C=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89=E8=BE=93=E5=85=A5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E5=A4=9A=E5=B0=91=E9=A1=B5=20#9672?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/components/ChartComponentS2.vue      | 18 ++++++++++++++++--
 .../visualized/data/dataset/form/index.vue     |  9 +++++++--
 .../views/visualized/data/dataset/index.vue    |  6 +++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index 36ad010fea..3a8c5930e9 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -464,8 +464,16 @@ const autoHeightStyle = computed(() => {
 })
 
 const tabStyle = computed(() => [
-  { '--de-pager-color': canvasStyleData.value.component.seniorStyleSetting.pagerColor }
+  { '--de-pager-color': canvasStyleData.value.component.seniorStyleSetting?.pagerColor }
 ])
+
+const tablePageClass = computed(() => {
+  return (
+    ['#ffffff', '#A6A6A6FF'].includes(
+      canvasStyleData.value.component.seniorStyleSetting?.pagerColor
+    ) && 'table-page-info_dark'
+  )
+})
 </script>
 
 <template>
@@ -481,7 +489,7 @@ const tabStyle = computed(() => [
       <div style="position: relative; height: 100%" :id="containerId"></div>
     </div>
     <el-row :style="autoStyle" v-if="showPage && !isError">
-      <div class="table-page-info" :style="tabStyle">
+      <div class="table-page-info" :class="tablePageClass" :style="tabStyle">
         <div>共{{ state.pageInfo.total }}条</div>
         <el-pagination
           v-if="state.pageStyle !== 'general'"
@@ -525,7 +533,13 @@ const tabStyle = computed(() => [
     overflow: hidden;
   }
 }
+
+.table-page-info_dark {
+  --ed-fill-color-blank: #00000000;
+}
+
 .table-page-info {
+  --ed-text-color-regular: var(--de-pager-color);
   position: relative;
   padding-left: 4px;
   margin: 4px;
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index c71054a0da..6c488faf6d 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -1462,7 +1462,7 @@ const getDsIconName = data => {
             </div>
             <div class="preview-data">
               <el-table
-                v-loading="dataPreviewLoading"
+                v-loading="datasetPreviewLoading"
                 header-class="header-cell"
                 :data="tableData"
                 border
@@ -1473,7 +1473,7 @@ const getDsIconName = data => {
                   v-for="(column, index) in columns"
                   :prop="column.dataKey"
                   :label="column.title"
-                  :width="columns.length - 1 === index ? 150 : auto"
+                  :width="columns.length - 1 === index ? 150 : 'auto'"
                   :fixed="columns.length - 1 === index ? 'right' : false"
                 >
                   <template #header>
@@ -1955,6 +1955,11 @@ const getDsIconName = data => {
 
 <style lang="less" scoped>
 @import '@/style/mixin.less';
+
+.ed-table {
+  --ed-table-header-bg-color: #f5f6f7;
+}
+
 .de-dataset-form {
   color: #1f2329;
   .top {
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index 90ddcc8499..6548715469 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -790,7 +790,7 @@ const getMenuList = (val: boolean) => {
                     v-for="(column, index) in columns"
                     :prop="column.dataKey"
                     :label="column.title"
-                    :width="columns.length - 1 === index ? 150 : auto"
+                    :width="columns.length - 1 === index ? 150 : 'auto'"
                     :fixed="columns.length - 1 === index ? 'right' : false"
                   >
                     <template #header>
@@ -846,6 +846,10 @@ const getMenuList = (val: boolean) => {
 <style lang="less" scoped>
 @import '@/style/mixin.less';
 
+.ed-table {
+  --ed-table-header-bg-color: #f5f6f7;
+}
+
 .filter-icon-span {
   border: 1px solid #bbbfc4;
   width: 32px;