From 76a4300654a18d228838c3f27455dc8e7a8cd616 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 17:04:42 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/tabviews/custom/components/share/normalTable/index.jsx | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 65f1256..e75297d 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -170,7 +170,7 @@
}
render() {
- let { col, config, record, className, style, triggerLink, updateStatus, ...resProps } = this.props
+ let { col, config, record, className, style, triggerLink, ...resProps } = this.props
if (!col) return (<td {...resProps} className={className} style={style}/>)
@@ -347,12 +347,12 @@
} else if (col.type === 'custom') {
style.padding = '0px'
resProps.children = (
- <CardCellComponent data={record} cards={config} elements={col.elements} updateStatus={this.props.updateStatus}/>
+ <CardCellComponent data={record} cards={config} elements={col.elements}/>
)
} else if (col.type === 'action') {
style.padding = '0px 5px'
resProps.children = (
- <CardCellComponent data={record} cards={config} elements={col.elements} updateStatus={this.props.updateStatus}/>
+ <CardCellComponent data={record} cards={config} elements={col.elements}/>
)
}
@@ -376,7 +376,6 @@
loading: PropTypes.bool, // 琛ㄦ牸鍔犺浇涓�
refreshdata: PropTypes.func, // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
chgSelectData: PropTypes.func, // 鏁版嵁鍒囨崲
- refreshbyaction: PropTypes.func, // 鎸夐挳鎵ц瀹屾垚鍚庡埛鏂�
}
state = {
@@ -442,8 +441,7 @@
record,
col: item,
config: item.type === 'custom' || item.type === 'action' ? {setting, columns: fields} : null,
- triggerLink: this.triggerLink,
- updateStatus: this.updateStatus
+ triggerLink: this.triggerLink
})
}
}
@@ -498,12 +496,6 @@
return
}
MKEmitter.removeListener('resetTable', this.resetTable)
- }
-
- updateStatus = (type, positon, btn) => {
- if (type === 'refresh') {
- this.props.refreshbyaction(positon, btn)
- }
}
// 瀛楁閫忚
@@ -803,8 +795,8 @@
<Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={pickup} onChange={this.pickupChange} /> : null
}
<Table
- size="middle"
components={components}
+ size={setting.size || 'middle'}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
columns={this.state.columns}
--
Gitblit v1.8.0