From 9a82bce9cf0ed4a51c1b0b0669eaa38cedbace07 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 七月 2020 16:35:58 +0800
Subject: [PATCH] 2020-07-16
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 6130d75..1804531 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -15,15 +15,12 @@
class ExcelInButton extends Component {
static propTpyes = {
+ show: PropTypes.any, // 鏄剧ず鏍峰紡
BID: PropTypes.string, // 涓昏〃ID
- BData: PropTypes.any, // 涓昏〃鏁版嵁
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
- MenuID: PropTypes.string, // 鑿滃崟ID
btn: PropTypes.object, // 鎸夐挳
- columns: PropTypes.array, // 瀛楁鍒�
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
- ContainerId: PropTypes.any, // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
updateStatus: PropTypes.func, // 鎸夐挳鐘舵�佹洿鏂�
triggerBtn: PropTypes.any,
}
@@ -392,18 +389,25 @@
}
render() {
- const { btn } = this.props
+ const { btn, show } = this.props
const { loading } = this.state
return (
<div className="mk-btn-wrap">
- <Button
+ {!show ? <Button
className={'mk-btn mk-' + btn.class}
icon={btn.icon}
onClick={() => {this.actionTrigger()}}
loading={loading}
- >{btn.label}</Button>
- <ExcelIn MenuID={this.props.MenuID} btn={btn} triggerExcelIn={() => this.updateStatus('start')} returndata={this.getexceldata} ref="excelIn" />
+ >{btn.label}</Button> : null}
+ {show === 'icon' ? <Button
+ className="import-icon"
+ icon="upload"
+ onClick={() => {this.actionTrigger()}}
+ loading={loading}
+ title={btn.label}
+ ></Button> : null}
+ <ExcelIn btn={btn} triggerExcelIn={() => this.updateStatus('start')} returndata={this.getexceldata} ref="excelIn" />
</div>
)
}
--
Gitblit v1.8.0