From f724c64b419f148985c0bd5a1153e3fc7d84b9e6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 七月 2023 17:03:27 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index a31ae6b..8ccf673 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -557,6 +557,29 @@
return col
})
+
+ if (data && data[0]) {
+ let errors = []
+ columns.forEach(col => {
+ if (col.Column && data[0][col.Column] === undefined) {
+ errors.push(col.Text)
+ }
+ })
+
+ if (errors.length) {
+ notification.error({
+ top: 92,
+ message: '鏁版嵁涓己灏戝瓧娈碉細' + errors.join('銆�'),
+ duration: 5
+ })
+
+ this.setState({
+ loading: false
+ })
+
+ return
+ }
+ }
try {
if (imgCol) {
@@ -1143,6 +1166,10 @@
let node = document.getElementById('tab' + id)
node && node.click()
}
+
+ if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
+ }
}
/**
@@ -1184,6 +1211,10 @@
} else if (btn.execError !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', [])
}
+
+ if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
+ }
}
render() {
--
Gitblit v1.8.0