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/excelInbutton/index.jsx |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 3376583..fce44aa 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -106,7 +106,6 @@
       this.setState({
         primaryId: primaryId
       }, () => {
-        this.updateStatus('start')
         this.refs.excelIn.exceltrigger()
       })
     } else {
@@ -260,6 +259,10 @@
 
     if (btn.intertype === 'inner' && !btn.innerFunc) { // 绯荤粺瀛樺偍杩囩▼
       param.func = 'sPC_TableData_InUpDe'
+      
+      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) {
@@ -380,7 +383,7 @@
           onClick={() => {this.actionTrigger()}}
           loading={loading}
         >{btn.label}</Button>
-        <ExcelIn MenuID={this.props.MenuID} btn={btn} returndata={this.getexceldata} ref="excelIn" />
+        <ExcelIn MenuID={this.props.MenuID} btn={btn} triggerExcelIn={() => this.updateStatus('start')} returndata={this.getexceldata} ref="excelIn" />
       </div>
     )
   }

--
Gitblit v1.8.0