From e7062fee38bd54850e521ae7498275bc0f370702 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 七月 2023 17:13:26 +0800
Subject: [PATCH] 2023-07-19
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 42ff8eb..7c6d11e 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -823,6 +823,15 @@
if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
+ } else if (card.eval === 'func') {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}} dangerouslySetInnerHTML={{__html: val}}></div>
+ </div>
+ </div>
+ )
+ return
}
if (card.round && typeof(val) === 'number') {
@@ -830,9 +839,7 @@
val = val.toFixed(card.decimal)
}
- if (card.eval === 'func') {
- val = <span dangerouslySetInnerHTML={{__html: val}}></span>
- } else if (val !== '') {
+ if (val !== '') {
if (val && typeof(val) === 'string') {
val = val.replace(/\n/ig, '<br/>')
if (!/<(span|div|p|a|img)\s/g.test(val)) {
--
Gitblit v1.8.0