From f38b3321250222b81a797a538d9c3efa9f8a0ecb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 29 五月 2022 03:54:05 +0800
Subject: [PATCH] 2022-05-29
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 75 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 8d81265..c9dca42 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -19,7 +19,6 @@
static propTpyes = {
BID: PropTypes.string, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
- show: PropTypes.any, // 鏄剧ず鏍峰紡
Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
btn: PropTypes.object, // 鎸夐挳
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
@@ -977,51 +976,47 @@
}
render() {
- const { btn, show } = this.props
+ const { btn } = this.props
const { loading, hidden, disabled } = this.state
if (hidden) return null
- if (show === 'actionList') {
- return (
- <Button
- className={'mk-btn mk-' + btn.class}
- icon={btn.icon}
- disabled={disabled}
- title={disabled ? (btn.reason || '') : ''}
- onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
- loading={loading}
- >{btn.label}</Button>
- )
- } else { // icon銆乼ext銆� all 鍗＄墖
- let label = ''
- let icon = ''
+ let label = ''
+ let icon = ''
+ let type = 'link'
+ let className = ''
- if (show === 'button') {
- label = btn.label
- icon = btn.icon || ''
- } else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
- icon = ''
- } else if (show === 'icon') {
- icon = btn.icon || 'download'
- // } else if (show === 'text') {
- } else {
- label = btn.label
- }
-
- return (
- <Button
- type="link"
- title={disabled ? (btn.reason || '') : (show === 'icon' ? btn.label : '')}
- loading={loading}
- disabled={disabled}
- style={btn.style}
- icon={icon}
- onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
- >{label}</Button>
- )
+ if (btn.show === 'button') {
+ label = btn.label
+ icon = btn.icon || ''
+ } else if (btn.show === 'link') {
+ label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
+ icon = ''
+ } else if (btn.show === 'icon') {
+ icon = btn.icon || 'download'
+ } else if (!btn.$toolbtn) {
+ icon = btn.icon || ''
+ label = btn.label
+ className = 'mk-btn mk-' + btn.class
+ } else {
+ type = ''
+ icon = btn.icon || ''
+ label = btn.label
+ className = 'mk-btn mk-' + btn.class
}
+
+ return (
+ <Button
+ type={type}
+ title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
+ loading={loading}
+ disabled={disabled}
+ style={btn.style || null}
+ icon={icon}
+ className={className}
+ onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
+ >{label}</Button>
+ )
}
}
--
Gitblit v1.8.0