From 1637a24e160f87e171fc4978a8c9cb8875cdcabb Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 20 五月 2022 01:12:51 +0800 Subject: [PATCH] 2022-05-20 --- src/tabviews/zshare/actionList/excelInbutton/index.jsx | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx index b535cfc..e51530e 100644 --- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx +++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx @@ -25,7 +25,7 @@ btn: PropTypes.object, // 鎸夐挳 setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆 disabled: PropTypes.any, // 琛屾寜閽鐢� - lineId: PropTypes.any, // 琛岀储寮�+涓婚敭鍊硷紝鐢ㄤ簬琛屾寜閽弻鍑� + lineBtn: PropTypes.any, // 鏄惁涓鸿绾ф寜閽� } state = { @@ -120,16 +120,11 @@ * @description 瑙﹀彂鎸夐挳鎿嶄綔 */ actionTrigger = (triggerId, record, type) => { - const { setting, Tab, BID, btn, selectedData } = this.props + const { setting, Tab, BID, btn, selectedData, lineBtn } = this.props const { loading, disabled } = this.state if (loading || disabled) return - if (triggerId) { - if (btn.uuid !== triggerId) return - if (this.props.lineId && record && record[0] && this.props.lineId !== record[0].$$key) { - return - } - } + if (triggerId && btn.uuid !== triggerId) return if (((Tab && Tab.supMenu) || setting.supModule) && !BID) { notification.warning({ @@ -138,10 +133,8 @@ duration: 5 }) return - } else if (type === 'linkbtn' && selectedData && selectedData.length === 1) { - if (record[0].$Index !== selectedData[0].$Index) { - return - } + } else if (type === 'linkbtn' && lineBtn && !is(fromJS(selectedData || []), fromJS(record))) { + return } let data = record || selectedData || [] -- Gitblit v1.8.0