From 1a14ff6035932eadfb6ef7970e3adb24b4e158a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十二月 2019 18:56:17 +0800
Subject: [PATCH] 2019-12-18
---
src/tabviews/commontable/mainTable/index.jsx | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/tabviews/commontable/mainTable/index.jsx b/src/tabviews/commontable/mainTable/index.jsx
index 1714101..6b65a50 100644
--- a/src/tabviews/commontable/mainTable/index.jsx
+++ b/src/tabviews/commontable/mainTable/index.jsx
@@ -6,30 +6,29 @@
export default class MainTable extends Component {
static propTpyes = {
- MenuID: PropTypes.string, // 鑿滃崟鍙傛暟
- setting: PropTypes.object, // 琛ㄦ牸澶撮儴鏄惁鍥哄畾浜庨〉闈笂鏂�
- loading: PropTypes.bool,
- total: PropTypes.number,
- select: PropTypes.object,
- dict: PropTypes.object, // 瀛楀吀椤�
- columns: PropTypes.array, // 琛ㄦ牸鍒�
- data: PropTypes.oneOfType([
- PropTypes.object,
- PropTypes.array
- ])
+ dict: PropTypes.object, // 瀛楀吀椤�
+ MenuID: PropTypes.string, // 鑿滃崟Id
+ setting: PropTypes.object, // 琛ㄦ牸鍏ㄥ眬璁剧疆锛歵ableType锛堣〃鏍兼槸鍚﹀彲閫夈�佸崟閫夈�佸閫夛級銆乧olumnfixed锛堝垪鍥哄畾锛夈�乤ctionfixed锛堟寜閽浐瀹氾級
+ columns: PropTypes.array, // 琛ㄦ牸鍒�
+ data: PropTypes.any, // 琛ㄦ牸鏁版嵁
+ total: PropTypes.number, // 鎬绘暟
+ loading: PropTypes.bool, // 琛ㄦ牸鍔犺浇涓�
+ refreshdata: PropTypes.func, // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
+ buttonTrigger: PropTypes.func // 琛ㄦ牸涓寜閽Е鍙戞搷浣�
}
state = {
- selectedRowKeys: [],
- pageIndex: 1,
- pageSize: 10,
- columns: null
+ selectedRowKeys: [], // 琛ㄦ牸涓�変腑琛�
+ pageIndex: 1, // 鍒濆椤甸潰绱㈠紩
+ pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
+ columns: null // 鏄剧ず鍒�
}
UNSAFE_componentWillMount () {
const { columns } = this.props
let _columns = []
- columns.forEach((item, index) => {
+
+ columns.forEach(item => {
let cell = {
align: item.Align,
dataIndex: item.field || item.uuid,
@@ -164,8 +163,7 @@
actionTrigger = (e, btn, record) => {
e.stopPropagation()
- console.log(btn)
- console.log(record)
+ this.props.buttonTrigger(btn, record)
}
copycontent = (e, content) => {
@@ -251,9 +249,9 @@
<div className="main-table">
{this.props.setting.columnfixed && <Affix offsetTop={offset} className="fix-header">
<Table
+ size="middle"
bordered={true}
rowSelection={rowSelection}
- size="middle"
columns={this.state.columns.map(column => {
return {
align: column.align,
@@ -265,9 +263,9 @@
/>
</Affix>}
<Table
+ size="middle"
bordered={true}
rowSelection={rowSelection}
- size="middle"
columns={this.state.columns}
dataSource={this.props.data ? this.props.data : []}
loading={this.props.loading}
--
Gitblit v1.8.0