From e3d44b5694b87e8b32d468d8b97fdd409da10b52 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 六月 2023 09:23:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 94b50d8..c8f8539 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -13,6 +13,7 @@
class NewPageButton extends Component {
static propTpyes = {
+ BID: PropTypes.any, // BID
BData: PropTypes.any, // 涓昏〃鏁版嵁
btn: PropTypes.object, // 鎸夐挳
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
@@ -102,7 +103,7 @@
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
actionTrigger = (triggerId, record, type) => {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BID } = this.props
const { disabled } = this.state
if (disabled) return
@@ -193,18 +194,43 @@
window.open(url)
} else if (btn.pageTemplate === 'custom') {
let url = btn.url
+ if (window.GLOB.systemType === 'production' && btn.proUrl) {
+ url = btn.proUrl
+ }
+
+ if (btn.Ot === 'notRequired' && BID) {
+ Id = BID
+ }
+
+ if (/#\/iframe\//.test(url)) {
+ url = url.replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))
+
+ if (btn.joint === 'true' && Id) {
+ url = url + '/' + Id
+ }
+
+ let menu = {
+ MenuID: btn.uuid,
+ MenuName: btn.label,
+ type: 'iframe',
+ OpenType: 'newtab',
+ src: url
+ }
+ MKEmitter.emit('modifyTabs', menu)
+
+ return
+ }
+
let con = '?'
if (/\?/ig.test(url)) {
con = '&'
}
-
- if (btn.Ot === 'requiredSgl' && btn.joint !== 'false') {
+
+ if (btn.joint === 'true') {
url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
- } else if (btn.Ot === 'requiredSgl' && btn.joint === 'false') {
+ } else if (Id) {
url = url + `${con}id=${Id}`
- } else if (btn.joint !== 'false') {
- url = url + `${con}appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
}
window.open(url)
--
Gitblit v1.8.0