From a1b34fcc49cfeb7324cb7f4584380426ec6b092f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 29 五月 2022 20:08:00 +0800
Subject: [PATCH] 2022-05-29
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index c5efa4a..69b040a 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -861,7 +861,7 @@
_resolve()
})
} else { // 瓒呭嚭20涓姹傛椂寰幆鎵ц
- if (btn.progress === 'progressbar') {
+ if (btn.progress === 'progressbar' && btn.$toolbtn) {
this.setState({
loadingTotal: params.length
})
@@ -926,7 +926,7 @@
})
}
- if (_params.length > 1 && btn.progress === 'progressbar') {
+ if (_params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {
this.setState({
loadingTotal: _params.length
})
@@ -947,7 +947,7 @@
params = this.getInnerParam(data, formdata)
}
- if (params.length > 1 && btn.progress === 'progressbar') {
+ if (params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {
this.setState({
loadingTotal: params.length
})
@@ -2140,10 +2140,14 @@
} else {
type = ''
icon = btn.icon || ''
- label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
+ label = btn.label
className = 'mk-btn mk-' + btn.class
}
+ 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()}>
<Button
type={type}
--
Gitblit v1.8.0