From 7e5200a09b2c6282382ec8725220f5561de139f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 18:05:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 46 ++++++++++++----------------------------------
1 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index ea19291..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: '褰撳墠瀵煎叆鏁版嵁閲忚繃澶э紝濡傞亣閿欒鎻愮ず锛岃鍒嗘壒瀵煎叆锛�',
@@ -347,7 +325,7 @@
delete param.excel_in
// param.excel_in_type = 'true'
- param.exec_type = 'y'
+ param.exec_type = window.GLOB.execType || 'y'
param.LText = result.sql
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -358,7 +336,7 @@
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.secretkey = Utils.encrypt('', param.timestamp)
if (window.GLOB.mkHS) { // 浜戠楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -372,7 +350,7 @@
if (unCheckParam) {
unCheckParam.LText = unCheckParam.LText.replace(/\$check@/ig, '/*').replace(/@check\$/ig, '*/')
- unCheckParam.LText = Utils.formatOptions(unCheckParam.LText)
+ unCheckParam.LText = Utils.formatOptions(unCheckParam.LText, unCheckParam.exec_type)
unCheckParam.secretkey = Utils.encrypt('', unCheckParam.timestamp)
unCheckParam.menuname = btn.logLabel
--
Gitblit v1.8.0