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/excelInbutton/index.jsx | 52 +++++++++++++++++++++++-----------------------------
1 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index b14214d..ab1cc80 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -106,12 +106,15 @@
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = (triggerId, record, type) => {
- const { setting, BID, btn, selectedData } = this.props
+ actionTrigger = (triggerId, record, type, lid) => {
+ const { setting, BID, btn, selectedData, 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 || []
if (setting.supModule && !BID) {
notification.warning({
@@ -119,44 +122,35 @@
message: '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
- return
- } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(selectedData || []), fromJS(record))) {
- return
- }
-
- let data = record || selectedData || []
-
- if (btn.Ot === 'requiredSgl' && data.length !== 1) {
+ } else if (btn.Ot === 'requiredSgl' && data.length !== 1) {
// 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
notification.warning({
top: 92,
message: '璇烽�夋嫨鍗曡鏁版嵁锛�',
duration: 5
})
- return
} else if (!btn.verify || !btn.verify.sheet || !btn.verify.columns || btn.verify.columns.length === 0) {
notification.warning({
top: 92,
message: 'excel瀵煎叆楠岃瘉淇℃伅鏈缃紒',
duration: 5
})
- return
- }
-
- let primaryId = '' // 瀵煎叆鏃惰Id
- if (btn.Ot === 'requiredSgl' && setting.primaryKey) {
- primaryId = data[0][setting.primaryKey] || ''
- }
-
- this.setState({
- selines: data,
- primaryId: primaryId
- }, () => {
- this.refs.excelIn.exceltrigger()
- })
-
- if (window.GLOB.systemType === 'production') {
- MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎叆Excel'})
+ } else {
+ let primaryId = '' // 瀵煎叆鏃惰Id
+ if (btn.Ot === 'requiredSgl' && setting.primaryKey) {
+ primaryId = data[0][setting.primaryKey] || ''
+ }
+
+ this.setState({
+ selines: data,
+ primaryId: primaryId
+ }, () => {
+ this.refs.excelIn.exceltrigger()
+ })
+
+ if (window.GLOB.systemType === 'production') {
+ MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎叆Excel'})
+ }
}
}
@@ -554,7 +548,7 @@
loading={loading}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
<ExcelIn btn={btn} triggerExcelIn={() => this.setState({ loading: true })} returndata={this.getexceldata} ref="excelIn" />
--
Gitblit v1.8.0