From 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:37:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 0199b4a..5a78f3e 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -100,16 +100,13 @@
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = (triggerId, record, type) => {
- const { btn, selectedData, BID } = this.props
+ actionTrigger = (triggerId, record, type, lid) => {
+ const { btn, selectedData, BID, LID } = this.props
const { disabled } = this.state
if (disabled) return
if (triggerId && btn.uuid !== triggerId) return
-
- if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(selectedData || []), fromJS(record))) {
- return
- }
+ if (type === 'linkbtn' && !btn.$toolbtn && LID !== lid) return
let data = record || selectedData || []
@@ -270,10 +267,7 @@
if (/#\/iframe\//.test(url)) {
url = url.replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
-
- if (btn.joint === 'true' && Id) {
- url = url + '/' + Id
- }
+ url = url + '/' + Id
let menu = {
MenuID: btn.uuid,
@@ -287,16 +281,26 @@
return
}
- let con = '?'
-
- if (/\?/ig.test(url)) {
- con = '&'
- }
-
if (btn.joint === 'true') {
+ let con = '?'
+
+ if (/\?/ig.test(url)) {
+ con = '&'
+ }
url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
- } else if (Id) {
- url = url + `${con}id=${Id}`
+ } else if (/@/.test(url)) {
+ url = url.replace(/@id@/ig, Id)
+ url = url.replace(/@appkey@/ig, window.GLOB.appkey)
+ url = url.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
+ url = url.replace(/@LoginUID@/ig, sessionStorage.getItem('LoginUID'))
+
+ if (btn.Ot === 'requiredSgl' && data[0]) {
+ Object.keys(data[0]).forEach(key => {
+ if (/^\$/.test(key)) return
+ let reg = new RegExp('@' + key + '@', 'ig')
+ url = url.replace(reg, data[0][key])
+ })
+ }
}
window.open(url)
@@ -330,7 +334,7 @@
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
style={btn.style || null}
disabled={disabled}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
--
Gitblit v1.8.0