From 0559bee7aa852d88fedf9002504f52d9e6228eb4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 01 七月 2024 16:03:40 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 2412eb3..ba48a45 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -1034,14 +1034,26 @@
className = mark.signType
}
- contents.push(
- <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={_style}>
- {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
- <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ if (card.link && !data.$disabled) {
+ _style.cursor = 'pointer'
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ </div>
</div>
- </div>
- )
+ )
+ } else {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ </div>
+ </div>
+ )
+ }
} else if (card.eleType === 'tag') {
let vals = ''
@@ -1223,6 +1235,7 @@
name={name}
BID={data.$$BID}
LID={lid}
+ columns={cards.columns}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
@@ -1285,6 +1298,7 @@
disabled={_disabled}
LID={lid}
btn={card}
+ columns={cards.columns}
selectedData={_data}
/>
}
--
Gitblit v1.8.0