Merge branch 'master' into bms

king

2021-01-15 76a4300654a18d228838c3f27455dc8e7a8cd616

 src/tabviews/zshare/actionList/asyncButtonComponent.jsx

@@ -25,10 +25,26 @@
    render() {
      const C = this.state.component
      const btn = this.props.btn || {}
      let style = {}

      if (!C && btn.btnstyle) {
        if (btn.btnstyle.marginRight) {
          style.marginRight = btn.btnstyle.marginRight
        }
        if (btn.btnstyle.marginLeft) {
          style.marginLeft = btn.btnstyle.marginLeft
        }
        if (btn.btnstyle.marginTop) {
          style.marginTop = btn.btnstyle.marginTop
        }
        if (btn.btnstyle.marginBottom) {
          style.marginBottom = btn.btnstyle.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>
    }
  }
}