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/funcMegvii/index.jsx | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
index 19fc33c..652dc2a 100644
--- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx
+++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
@@ -108,12 +108,16 @@
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = (triggerId, record, type) => {
- const { BID, btn, selectedData, setting } = this.props
+ actionTrigger = (triggerId, record, type, lid) => {
+ const { BID, btn, selectedData, setting, 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
+
+ let data = record || selectedData || []
+ // let data = fromJS(mockdata.data).toJS()
if (setting.supModule && !BID) {
notification.warning({
@@ -121,29 +125,20 @@
message: '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
- return
- } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(selectedData || []), fromJS(record))) {
- return
- }
-
- let data = record || selectedData || []
- // let data = fromJS(mockdata.data).toJS()
-
- if (data.length === 0) {
+ } else if (data.length === 0) {
// 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
notification.warning({
top: 92,
message: '璇烽�夋嫨琛岋紒',
duration: 5
})
- return
+ } else {
+ this.setState({
+ loading: true,
+ lines: data
+ })
+ this.getIpList()
}
-
- this.setState({
- loading: true,
- lines: data
- })
- this.getIpList()
}
getIpList = () => {
@@ -533,7 +528,7 @@
loading={loading}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
{this.getModels()}
--
Gitblit v1.8.0