From 6c16e43cd6521460c804391c042348dbb14086fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 16 六月 2020 09:44:40 +0800
Subject: [PATCH] 2020-06-16
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 0893de7..58365e2 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -279,6 +279,10 @@
}
}
+ if (this.props.menuType === 'HS' && param.timestamp) { // 浜戠楠岃瘉
+ param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ }
+
Api.genericInterface(param).then((res) => {
if (res.status) {
this.execSuccess(res)
@@ -381,6 +385,10 @@
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)
}
return param
@@ -673,6 +681,7 @@
*/
execError = (res) => {
const { btn } = this.props
+ const { btnconfig } = this.state
if (res.ErrCode === 'E') {
Modal.error({
@@ -694,9 +703,9 @@
} else if (res.ErrCode === 'NM') {
message.error(res.message || res.ErrMesg)
}
-
+
let _unclose = false
- if (btn.OpenType === 'pop') {
+ if (btn.OpenType === 'pop' && btnconfig && btnconfig.setting.display !== 'prompt') {
_unclose = true
} else {
this.setState({
@@ -973,8 +982,9 @@
destroyOnClose
>
<MutilForm
- dict={this.state.dict}
BID={BID}
+ dict={this.state.dict}
+ menuType={this.props.menuType}
action={btnconfig}
inputSubmit={this.handleOk}
data={this.state.tabledata[0]}
--
Gitblit v1.8.0