From 72194d09bc2eb9ab0b60bd000d98dc94c99ce82d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 06 十二月 2019 17:51:29 +0800
Subject: [PATCH] 2019-12-06

---
 src/tabviews/datamanage/table/index.jsx |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/tabviews/datamanage/table/index.jsx b/src/tabviews/datamanage/table/index.jsx
index b49715f..823c18a 100644
--- a/src/tabviews/datamanage/table/index.jsx
+++ b/src/tabviews/datamanage/table/index.jsx
@@ -11,10 +11,8 @@
     selectable: PropTypes.bool,
     dict: PropTypes.object, // 瀛楀吀椤�
     columns: PropTypes.array, // 琛ㄦ牸鍒�
-    data: PropTypes.oneOfType([
-      PropTypes.object,
-      PropTypes.array
-    ])
+    actions: PropTypes.any,
+    data: PropTypes.any
   }
 
   state = {
@@ -24,11 +22,7 @@
     pageSize: 10,
     columns: this.props.columns.map(item => {
       let _width = parseInt(item.Width) || 50
-      // if (/ID$/.test(item.FieldName) || item.FieldName.includes('PassWord')) {
-      //   _width = _width * 3
-      // } else if (item.FieldName.includes('Date')) {
-      //   _width = _width * 2
-      // }
+
       return {
         align: item.Align,
         dataIndex: item.FieldName,
@@ -116,9 +110,13 @@
         onChange: this.onSelectChange
       }
     }
+    let offset = 48
+    if (this.props.actions && this.props.actions.length > 0) {
+      offset = 105
+    }
     return (
       <div className="datamanage-table">
-        {this.state.fixed && <Affix offsetTop={105} className="fix-header">
+        {this.state.fixed && <Affix offsetTop={offset} className="fix-header">
           <Table
             bordered={true}
             rowSelection={rowSelection}

--
Gitblit v1.8.0