From 76a4300654a18d228838c3f27455dc8e7a8cd616 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 17:04:42 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index d6c03af..c5cb799 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -30,7 +30,6 @@
columns: PropTypes.any, // 瀛楁鍒�
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
ContainerId: PropTypes.any, // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
- updateStatus: PropTypes.func, // 鎸夐挳鐘舵�佹洿鏂�
}
state = {
@@ -725,7 +724,9 @@
this.sendMessage()
}
- this.props.updateStatus('refresh', btn.execSuccess, btn)
+ if (btn.execSuccess !== 'never') {
+ MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn)
+ }
}
sendMessage = () => {
@@ -867,7 +868,9 @@
loading: false
})
- this.props.updateStatus('refresh', btn.execError, btn)
+ if (btn.execError !== 'never') {
+ MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn)
+ }
}
/**
@@ -1179,6 +1182,7 @@
return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
<Button
type="link"
+ title={show === 'icon' ? btn.label : ''}
loading={loading}
style={btn.btnstyle || style}
icon={show === 'text' ? '' : (btn.icon || '')}
--
Gitblit v1.8.0