From 6ee201b2f734c9e704fb989aca0dabd09890c724 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 18:07:18 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 40 +++++++++-------------------------------
1 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index b4ac4ee..bfc7d78 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -276,43 +276,21 @@
/**
* @description Excel 瀵煎叆
*/
- getexceldata = (data, errors, sheetName, errDetail) => {
+ getexceldata = (data, error) => {
const { btn, BID } = this.props
- if (errors) {
- if (errors === 'notexit') {
- notification.warning({
- top: 92,
- message: '宸ヤ綔琛ㄣ��' + sheetName + '銆嬩笉瀛樺湪锛�',
- duration: 5
- })
- } else if (errors === 'empty') {
- notification.warning({
- top: 92,
- message: '宸ヤ綔琛ㄣ��' + sheetName + '銆嬩负绌猴紒',
- duration: 5
- })
- } else if (errors === 'headerError') {
- notification.warning({
- top: 92,
- message: `宸ヤ綔琛ㄣ��${sheetName}銆嬭〃澶撮敊璇紝${errDetail}`,
- duration: 5
- })
- }
+ if (error) {
+ notification.warning({
+ top: 92,
+ message: error,
+ duration: 5
+ })
this.setState({ loading: false })
return
}
-
- if (!data || data.length === 0) {
- notification.warning({
- top: 92,
- message: '鏈幏鍙栧埌宸ヤ綔琛ㄣ��' + sheetName + '銆嬫暟鎹紒',
- duration: 5
- })
- this.setState({ loading: false })
- return
- } else if (data.length * btn.verify.columns.length > 30000) {
+
+ if (data.length * btn.verify.columns.length > 30000) {
notification.warning({
top: 92,
message: '褰撳墠瀵煎叆鏁版嵁閲忚繃澶э紝濡傞亣閿欒鎻愮ず锛岃鍒嗘壒瀵煎叆锛�',
--
Gitblit v1.8.0