From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/asyncButtonComponent.jsx | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/zshare/actionList/asyncButtonComponent.jsx b/src/tabviews/zshare/actionList/asyncButtonComponent.jsx
index 34eb4ca..30d70ed 100644
--- a/src/tabviews/zshare/actionList/asyncButtonComponent.jsx
+++ b/src/tabviews/zshare/actionList/asyncButtonComponent.jsx
@@ -25,10 +25,18 @@
render() {
const C = this.state.component
const btn = this.props.btn || {}
+ let style = {}
+
+ if (!C && btn.style) {
+ style.marginRight = btn.style.marginRight || ''
+ style.marginLeft = btn.style.marginLeft || ''
+ style.marginTop = btn.style.marginTop || ''
+ style.marginBottom = btn.style.marginBottom || ''
+ }
return C ?
<C {...this.props} /> :
- <Button className={'mk-btn mk-' + btn.class} icon={btn.icon} disabled={true} >{btn.label}</Button>
+ <Button className={'mk-btn mk-' + btn.class} style={style} icon={btn.icon} disabled={true} >{btn.label}</Button>
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0