From 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:37:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index f16a983..0317ad6 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -90,12 +90,13 @@
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = (triggerId, record, type) => {
- const { setting, BID, btn } = this.props
+ actionTrigger = (triggerId, _, type, lid) => {
+ const { setting, BID, btn, LID } = this.props
const { loading, disabled } = this.state
if (loading || disabled) return
if (triggerId && btn.uuid !== triggerId) return
+ if (type === 'linkbtn' && !btn.$toolbtn && LID !== lid) return
if (setting.supModule && !BID) {
notification.warning({
@@ -103,30 +104,23 @@
message: '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
- return
- } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(this.props.selectedData || []), fromJS(record))) {
- return
- }
-
- if (btn.errorType === 'error1') {
+ } else if (btn.errorType === 'error1') {
notification.warning({
top: 92,
message: '璇疯缃鍑哄垪锛�',
duration: 5
})
- return
} else if (btn.errorType === 'error2') {
notification.warning({
top: 92,
message: '鎸夐挳闇�鑷畾涔夊鍑烘暟鎹簮锛�',
duration: 5
})
- return
- }
-
- MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
- if (window.GLOB.systemType === 'production') {
- MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+ } else {
+ MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
+ if (window.GLOB.systemType === 'production') {
+ MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+ }
}
}
@@ -1097,7 +1091,7 @@
loading={loading}
disabled={disabled}
style={btn.style || null}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
--
Gitblit v1.8.0