From 4366981fbe7d406e90487fd94450fab6eb31120d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 八月 2023 17:19:35 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 7dfd165..2a39aab 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -740,6 +740,11 @@
if (this.props.BID) {
param.BID = this.props.BID
}
+
+ if (btn.recordUser === 'true') {
+ param.username = sessionStorage.getItem('User_Name') || ''
+ param.fullname = sessionStorage.getItem('Full_Name') || ''
+ }
let primaryId = ''
@@ -776,6 +781,11 @@
if (this.props.BID) {
param.BID = this.props.BID
+ }
+
+ if (btn.recordUser === 'true') {
+ param.username = sessionStorage.getItem('User_Name') || ''
+ param.fullname = sessionStorage.getItem('Full_Name') || ''
}
let primaryId = setting.primaryKey ? cell[setting.primaryKey] || '' : ''
@@ -1226,7 +1236,13 @@
if (Array.isArray(res.mk_ex_data) && res.mk_ex_data.length > 0) {
let pices = res.mk_ex_data.map(item => {
item.$pice = true
- item.$record = record
+ item.$record = {...record}
+
+ if (item.hasOwnProperty('mk_api_key')) {
+ item.$record.mk_api_key = item.mk_api_key || record.mk_api_key || ''
+
+ delete item.mk_api_key
+ }
return item
})
params = [...pices, ...params]
@@ -1422,7 +1438,6 @@
result.status = false
result.message = result.$ErrMesg
result.ErrCode = 'E'
- result.ErrMesg = result.$ErrMesg
} else {
result.status = result.status !== false
result.ErrCode = result.ErrCode || '-1'
@@ -1874,7 +1889,8 @@
Api.genericInterface(result).then(res => {
if (!res) return // LoginError鏃朵腑鏂姹�
- if (ver_token && res.ErrMesg === 'token_error') {
+ if (ver_token && res.ErrCode === 'token_error') {
+ res.ErrCode = 'E'
this.execError(res)
return
}
--
Gitblit v1.8.0