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/custom/components/card/cardcellList/index.jsx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index f87948f..33e1622 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -200,11 +200,6 @@
// }
let Id = ''
- let con = '?'
-
- if (/\?/ig.test(url)) {
- con = '&'
- }
if (cards.subtype === 'propcard' && cardCell) {
Id = cardCell.setting.primaryId || ''
@@ -213,6 +208,12 @@
}
if (card.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') || ''}`
}
@@ -987,6 +988,7 @@
<div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<NewPageButton
btn={card}
+ BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
--
Gitblit v1.8.0