From 2b46797c3a5868f7f26329da5834c13aae07ad69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 四月 2023 11:59:34 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/card/cardcellList/index.jsx |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 5171fb0..185042e 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -409,7 +409,8 @@
           return null
         }
   
-        if (typeof(val) === 'number') {
+        if (!isNaN(val) && val !== '') {
+          val = +val
           if (card.round) {
             val = Math.round(val * card.round) / card.round
           }
@@ -695,7 +696,7 @@
       } else if (card.eleType === 'formula') {
         let val = 0
         let _style = card.style ? {...card.style} : {}
-  
+
         if (card.$sync) {
           if (card.eval === 'false') {
             val = ''
@@ -725,7 +726,7 @@
             let reg = new RegExp('@' + key + '@', 'ig')
             _val = _val.replace(reg, data[key])
           })
-  
+
           if (card.eval !== 'false') {
             try {
               // eslint-disable-next-line
@@ -737,14 +738,18 @@
   
           val = _val === undefined ? '' : _val
         }
-  
+
         if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
           return null
         }
   
         if (val !== '') {
           if (val && typeof(val) === 'string') {
-            val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, '&nbsp;')
+            val = val.replace(/\n/ig, '<br/>')
+            if (!/<(span|div|p|a|img)\s/g.test(val)) {
+              val = val.replace(/\s/ig, '&nbsp;')
+            }
+
             val = <span dangerouslySetInnerHTML={{__html: val}}></span>
           }
   
@@ -752,10 +757,10 @@
             let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
             val = <><span style={_s}>{card.prefix || ''}</span>{val}<span style={_s}>{card.postfix || ''}</span></>
           } else {
-            val = `${card.prefix || ''}${val}${card.postfix || ''}`
+            val = <>{card.prefix || ''}{val}{card.postfix || ''}</>
           }
         }
-  
+
         let className = ''
         if (card.marks) {
           let mark = getMark(card.marks, data, _style)

--
Gitblit v1.8.0