From 6904c9273f5c7c3607ac5a9155aa511253d49b35 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 11 七月 2022 11:36:25 +0800
Subject: [PATCH] 2022-07-11
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 433744b..9840e07 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2270,32 +2270,32 @@
} else if (!btn.$toolbtn) {
icon = btn.icon || ''
label = btn.label
- className = 'mk-btn mk-' + btn.class
+ className = 'mk-btn mk-' + (btn.class || 'unset')
} else {
type = ''
icon = btn.icon || ''
label = btn.label
- className = 'mk-btn mk-' + btn.class
+ className = 'mk-btn mk-' + (btn.class || 'unset')
}
if (loadingNumber && !loadingTotal && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
}
- return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
+ return <>
<Button
type={type}
icon={icon}
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
loading={loading}
disabled={disabled}
- style={btn.style || null}
+ style={btn.style}
className={className}
- onClick={() => {this.actionTrigger()}}
+ onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
{this.getModels()}
{loadingTotal ? <Progress className="mk-button-progress" percent={(loadingTotal - loadingNumber) / loadingTotal * 100} size="small" showInfo={false} /> : null}
- </div>
+ </>
}
}
--
Gitblit v1.8.0