From 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:38:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/tabbutton/index.jsx | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/tabviews/zshare/actionList/tabbutton/index.jsx b/src/tabviews/zshare/actionList/tabbutton/index.jsx
index 461c1aa..d96f206 100644
--- a/src/tabviews/zshare/actionList/tabbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/tabbutton/index.jsx
@@ -100,16 +100,13 @@
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = (triggerId, record, type) => {
- const { btn, selectedData, BID } = this.props
+ actionTrigger = (triggerId, record, type, lid) => {
+ const { btn, selectedData, BID, LID } = this.props
const { disabled } = this.state
if (disabled || btn.multiMenus) return
if (triggerId && btn.uuid !== triggerId) return
-
- if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(selectedData || []), fromJS(record))) {
- return
- }
+ if (type === 'linkbtn' && !btn.$toolbtn && LID !== lid) return
let data = record || selectedData || []
@@ -152,7 +149,7 @@
return uuid
})()
primaryId = primaryId + (btn.sign || '')
- } else {
+ } else if (btn.sysId !== 'empty') {
primaryId = BID || ''
}
}
@@ -194,6 +191,14 @@
duration: 5
})
return
+ }
+
+ if (btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') {
+ Object.keys(data[0]).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ menu.param[key] = data[0][key]
+ })
}
newtab = menu
@@ -256,7 +261,7 @@
return uuid
})()
primaryId = primaryId + (tab.sign || '')
- } else {
+ } else if (btn.sysId !== 'empty') {
primaryId = BID || ''
}
}
@@ -325,7 +330,7 @@
type="link"
title={btn.show === 'icon' ? btn.label : ''}
style={btn.style || null}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
>{label}</Button>
</Dropdown>)
}
@@ -337,7 +342,7 @@
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
style={btn.style || null}
disabled={disabled}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
--
Gitblit v1.8.0