From 48a18736c461ad730bd264b0ac7b40b68a0e33a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 六月 2020 20:30:20 +0800
Subject: [PATCH] 2020-06-28
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index fce44aa..bfcaa33 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -228,6 +228,7 @@
}
let result = Utils.getExcelInSql(btn, data, this.state.dict)
+
if (result.errors) {
notification.warning({
top: 92,
@@ -239,27 +240,32 @@
}
let param = {
- ID: this.state.primaryId
+ ID: this.state.primaryId,
+ excel_in: result.lines
}
if (this.props.BID) {
param.BID = this.props.BID
}
- if (this.props.dataManager) { // 鏁版嵁鏉冮檺
- result.sql = result.sql.replace(/\$@/ig, '/*')
- result.sql = result.sql.replace(/@\$/ig, '*/')
- } else {
- result.sql = result.sql.replace(/@\$|\$@/ig, '')
- }
-
- param.LText = Utils.formatOptions(result.sql)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
if (btn.intertype === 'inner' && !btn.innerFunc) { // 绯荤粺瀛樺偍杩囩▼
param.func = 'sPC_TableData_InUpDe'
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ result.sql = result.sql.replace(/\$@/ig, '/*')
+ result.sql = result.sql.replace(/@\$/ig, '*/')
+ result.bottom = result.bottom.replace(/\$@/ig, '/*')
+ result.bottom = result.bottom.replace(/@\$/ig, '*/')
+ } else {
+ result.sql = result.sql.replace(/@\$|\$@/ig, '')
+ result.bottom = result.bottom.replace(/@\$|\$@/ig, '')
+ }
+
+ param.LText_insert = Utils.formatOptions(result.insert)
+ param.LText_bottom = Utils.formatOptions(result.bottom)
+ param.LText = Utils.formatOptions(result.sql)
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ 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)
}
--
Gitblit v1.8.0