From 76427d51a079a5fd1f45bf7188249e7a4647ae05 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 九月 2020 10:37:25 +0800
Subject: [PATCH] 2020-09-14
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 1804531..53fd47f 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -186,26 +186,26 @@
/**
* @description Excel 瀵煎叆
*/
- getexceldata = (data, errors) => {
+ getexceldata = (data, errors, sheetName) => {
const { btn } = this.props
if (errors) {
if (errors === 'notexit') {
notification.warning({
top: 92,
- message: '宸ヤ綔琛ㄣ��' + btn.verify.sheet + '銆嬩笉瀛樺湪锛�',
+ message: '宸ヤ綔琛ㄣ��' + sheetName + '銆嬩笉瀛樺湪锛�',
duration: 5
})
} else if (errors === 'empty') {
notification.warning({
top: 92,
- message: '宸ヤ綔琛ㄣ��' + btn.verify.sheet + '銆嬩负绌猴紒',
+ message: '宸ヤ綔琛ㄣ��' + sheetName + '銆嬩负绌猴紒',
duration: 5
})
} else if (errors === 'headerError') {
notification.warning({
top: 92,
- message: '宸ヤ綔琛ㄣ��' + btn.verify.sheet + '銆嬭〃澶磋缃敊璇紒',
+ message: '宸ヤ綔琛ㄣ��' + sheetName + '銆嬭〃澶磋缃敊璇紝璇锋鏌ヨ〃澶翠腑鐨勫悕绉板強椤哄簭锛屼笌鎸夐挳Excel鍒椾俊鎭槸鍚︿竴鑷达紒',
duration: 5
})
}
@@ -217,7 +217,7 @@
if (!data || data.length === 0) {
notification.warning({
top: 92,
- message: '鏈幏鍙栧埌宸ヤ綔琛ㄣ��' + btn.verify.sheet + '銆嬫暟鎹紒',
+ message: '鏈幏鍙栧埌宸ヤ綔琛ㄣ��' + sheetName + '銆嬫暟鎹紒',
duration: 5
})
this.updateStatus('over')
@@ -230,7 +230,7 @@
})
}
- let result = Utils.getExcelInSql(btn, data, this.state.dict)
+ let result = Utils.getExcelInSql(btn, data, this.state.dict, (this.props.BID || ''))
if (result.errors) {
notification.warning({
@@ -251,7 +251,7 @@
param.BID = this.props.BID
}
- if (btn.intertype === 'inner' && !btn.innerFunc) { // 绯荤粺瀛樺偍杩囩▼
+ if (btn.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼
param.func = 'sPC_TableData_InUpDe'
if (this.props.dataManager) { // 鏁版嵁鏉冮檺
@@ -268,10 +268,10 @@
param.LText1 = Utils.formatOptions(result.insert)
param.LText2 = Utils.formatOptions(result.bottom)
param.LText = Utils.formatOptions(result.sql)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
if (this.props.menuType === 'HS' && param.timestamp) { // 浜戠楠岃瘉
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
Api.genericInterface(param).then((res) => {
@@ -351,9 +351,9 @@
if (this.props.menuType === 'HS' && res.func === 's_sDataDictb_excelIn') { // s_sDataDictb_excelIn 浜戠楠岃瘉
param.LText = Utils.formatOptions(result.sql)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
return Api.genericInterface(res)
--
Gitblit v1.8.0