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/normalbutton/index.jsx | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 06de85c..027b704 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -126,17 +126,23 @@
// 鏁版嵁閫夋嫨绫诲瀷鏍￠獙
this.actionSettingError()
return
- } else if (btn.intertype === 'inner') {
- // 浣跨敤鍐呴儴鎺ュ彛鏃讹紝鍐呴儴鍑芥暟鍜屾暟鎹簮涓嶅彲鍚屾椂涓虹┖, 浣跨敤绯荤粺鍑芥暟鏃讹紝绫诲瀷涓嶅彲涓虹┖
- if (!btn.innerFunc && (!btn.sql || (btn.sql && !btn.sqlType))) {
+ } else if (btn.intertype === 'system') {
+ // 浣跨敤鍐呴儴鎺ュ彛鏃讹紝鎿嶄綔绫诲瀷鍜屾暟鎹簮涓嶅彲涓虹┖
+ if (!btn.sql || !btn.sqlType) {
this.actionSettingError()
return
- } else if (data.length === 0 && !btn.innerFunc && btn.verify && btn.verify.voucher && btn.verify.voucher.enabled) {
+ } else if (data.length === 0 && btn.verify && btn.verify.voucher && btn.verify.voucher.enabled) {
notification.warning({
top: 92,
message: '浣跨敤鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒',
duration: 5
})
+ return
+ }
+ } else if (btn.intertype === 'inner') {
+ // 浣跨敤鍐呴儴鎺ュ彛鏃讹紝鍐呴儴鍑芥暟涓嶅彲涓虹┖
+ if (!btn.innerFunc) {
+ this.actionSettingError()
return
}
} else if (btn.intertype === 'outer') {
@@ -145,7 +151,7 @@
this.actionSettingError()
return
}
- } else if (!['inner', 'outer'].includes(btn.intertype)) {
+ } else if (!['inner', 'outer', 'system'].includes(btn.intertype)) {
// 鎺ュ彛绫诲瀷閿欒
this.actionSettingError()
return
@@ -182,7 +188,7 @@
*/
execSubmit = (data, _resolve, formdata) => {
const { setting, columns, btn } = this.props
- if (btn.intertype === 'inner') {
+ if (btn.intertype === 'inner' || btn.intertype === 'system') {
// 鎵ц鏂瑰紡涓哄琛屾嫾鎺ワ紝涓旀墦寮�鏂瑰紡涓鸿〃鍗曟椂锛屼細杞负寰幆鍙戦�佽姹�
// 鎵撳紑鏂瑰紡涓烘ā鎬佹锛屼娇鐢ㄥ唴閮ㄥ嚱鏁版坊鍔�(鏈夋壒閲忔坊鍔犲満鏅紝宸插幓闄�)
if (
@@ -229,7 +235,7 @@
param.LText1 = LText1
param.LText = LText
- 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)
}
} else if (btn.OpenType === 'pop') { // 琛ㄥ崟
@@ -270,7 +276,7 @@
param.LText1 = LText1
param.LText = LText
- 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)
} else if (btn.sql) {
param.ID = primaryId
@@ -289,17 +295,17 @@
param.LText1 = LText1
param.LText = LText
- 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) { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
} else if (this.props.menuType === 'HS' && param.func === 's_sDataDictb_TBBack' && param.LTextOut) { // 鍑芥暟 s_sDataDictb_TBBack 浜戠楠岃瘉
- 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.LTextOut, 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) => {
@@ -356,7 +362,7 @@
param.LText2 = LText2
param.LText1 = LText1
param.LText = LText
- 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)
}
} else if (btn.OpenType === 'pop') { // 琛ㄥ崟
@@ -396,7 +402,7 @@
param.LText1 = LText1
param.LText = LText
- 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)
} else if (btn.sql) {
param.ID = primaryId
@@ -415,17 +421,17 @@
param.LText1 = LText1
param.LText = LText
- 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) { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
} else if (this.props.menuType === 'HS' && param.func === 's_sDataDictb_TBBack' && param.LTextOut) { // 鍑芥暟 s_sDataDictb_TBBack 浜戠楠岃瘉
- 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.LTextOut, param.timestamp)
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
return param
@@ -579,9 +585,9 @@
// 鍑芥暟 s_sDataDictb_TBBack 浜戠楠岃瘉
if (this.props.menuType === 'HS' && param.func === 's_sDataDictb_TBBack' && param.LTextOut) {
- 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.LTextOut, param.timestamp)
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
// 瀛樺湪鍐呴儴鍑芥暟鏃讹紝鏁版嵁棰勫鐞�
@@ -628,9 +634,9 @@
// 鍑芥暟 s_sDataDictb_TBBack 浜戠楠岃瘉
if (res.func === 's_sDataDictb_TBBack' && res.LTextOut) {
- res.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ res.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
res.secretkey = Utils.encrypt(res.LTextOut, res.timestamp)
- res.open_key = Utils.encrypt(res.secretkey, res.timestamp, true)
+ res.open_key = Utils.encryptOpenKey(res.secretkey, res.timestamp)
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
@@ -655,9 +661,9 @@
// 鍑芥暟 s_sDataDictb_TBBack 浜戠楠岃瘉
if (this.props.menuType === 'HS' && _callbackparam.func === 's_sDataDictb_TBBack' && _callbackparam.LTextOut) {
- _callbackparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ _callbackparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
_callbackparam.secretkey = Utils.encrypt(_callbackparam.LTextOut, _callbackparam.timestamp)
- _callbackparam.open_key = Utils.encrypt(_callbackparam.secretkey, _callbackparam.timestamp, true)
+ _callbackparam.open_key = Utils.encryptOpenKey(_callbackparam.secretkey, _callbackparam.timestamp)
}
return Api.genericInterface(_callbackparam)
@@ -847,6 +853,7 @@
}
cell.data_sql = Utils.formatOptions(_option.sql)
+ cell.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
cell.arr_field = _option.field
}
@@ -878,6 +885,7 @@
}
cell.data_sql = Utils.formatOptions(_option.sql)
+ cell.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
cell.arr_field = _option.field
}
--
Gitblit v1.8.0