From 6c44bc79e5edc338b44fdc469220ddf0e3fc4028 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 九月 2021 22:51:27 +0800
Subject: [PATCH] 2021-09-14

---
 src/tabviews/zshare/normalTable/index.jsx |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 3f2291d..86261d5 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -1131,11 +1131,21 @@
       _footer = statFValue.map(f => `${f.label}(鍚堣)锛�${f.value}`).join('锛�')
     }
 
+    let height = setting.height || false
+    let style = {}
+    if (setting.color) {
+      style.color = setting.color
+    }
+    if (setting.fontSize) {
+      style.fontSize = setting.fontSize
+    }
+
     return (
-      <div className="normal-data-table mingke-table">
+      <div className={'normal-data-table mingke-table ' + (height ? 'fixed-height' : '')}>
         {offset && <Affix offsetTop={offset} className="fix-header">
           <Table
             size="middle"
+            style={style}
             bordered={setting.bordered !== 'false'}
             rowSelection={rowSelection}
             columns={this.state.columns.map(column => {
@@ -1150,6 +1160,7 @@
         </Affix>}
         <Table
           size="middle"
+          style={style}
           bordered={setting.bordered !== 'false'}
           rowSelection={rowSelection}
           columns={this.state.columns}
@@ -1208,7 +1219,7 @@
             return className
           }}
           loading={this.props.loading}
-          scroll={{ x: '100%', y: false }}
+          scroll={{ x: '100%', y: height }}
           onRow={(record, index) => {
             return {
               onClick: () => {this.changeRow(record, index)},

--
Gitblit v1.8.0