From 1da6506bf58270bacc2a4345002c6b082835580e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 十月 2021 23:17:08 +0800
Subject: [PATCH] 2021-10-21

---
 src/tabviews/custom/components/card/cardcellList/index.jsx |   73 ++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 5d1e62b..3c47e00 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -162,7 +162,7 @@
         try {
           originVal = parseFloat(originVal)
           contrastVal = parseFloat(contrastVal)
-        } catch {
+        } catch (e) {
           originVal = NaN
         }
 
@@ -173,7 +173,7 @@
         try {
           originVal = parseFloat(originVal)
           contrastVal = parseFloat(contrastVal)
-        } catch {
+        } catch (e) {
           originVal = NaN
         }
 
@@ -236,7 +236,7 @@
         try {
           originVal = parseFloat(originVal)
           contrastVal = parseFloat(contrastVal)
-        } catch {
+        } catch (e) {
           originVal = NaN
         }
 
@@ -247,7 +247,7 @@
         try {
           originVal = parseFloat(originVal)
           contrastVal = parseFloat(contrastVal)
-        } catch {
+        } catch (e) {
           originVal = NaN
         }
 
@@ -297,6 +297,10 @@
         }
       } else if (data.hasOwnProperty(card.field)) {
         val = data[card.field]
+      }
+
+      if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        return null
       }
 
       if (val !== '' && card.format) {
@@ -450,9 +454,13 @@
       }
 
       if (card.datatype === 'static') {
-        url = card.url
+        url = card.url || ''
       } else {
-        url = data[card.field]
+        url = data[card.field] || ''
+      }
+
+      if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        return null
       }
       
       if (url) {
@@ -511,7 +519,11 @@
       if (card.datatype === 'static') {
         val = card.value
       } else if (data.hasOwnProperty(card.field)) {
-        val = data[card.field]
+        val = data[card.field] || ''
+      }
+
+      if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        return null
       }
 
       return (
@@ -532,6 +544,10 @@
         url = data[card.field] || ''
       }
 
+      if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        return null
+      }
+
       return (
         <Col key={card.uuid} span={card.width}>
           <div style={card.style}>
@@ -545,7 +561,11 @@
       if (card.datatype === 'static') {
         val = card.value
       } else if (data.hasOwnProperty(card.field)) {
-        val = data[card.field]
+        val = data[card.field] || ''
+      }
+
+      if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        return null
       }
 
       return (
@@ -570,18 +590,25 @@
       let _style = card.style ? {...card.style} : {}
 
       if (card.$sync) {
+        if (card.eval === 'false') {
+          val = ''
+        }
         this.props.syncData.forEach(item => {
           let _val = card.formula
           Object.keys(item).forEach(key => {
             let reg = new RegExp('@' + key + '@', 'ig')
             _val = _val.replace(reg, item[key])
           })
-          try {
-            // eslint-disable-next-line
-            _val = eval(_val)
-          } catch {
-            _val = 0
+          if (card.eval !== 'false') {
+            try {
+              // eslint-disable-next-line
+              _val = eval(_val)
+            } catch (e) {
+              _val = 0
+            }
           }
+
+          if (!val) return
 
           val += _val
         })
@@ -592,18 +619,24 @@
           _val = _val.replace(reg, data[key])
         })
 
-        try {
-          // eslint-disable-next-line
-          _val = eval(_val)
-        } catch {
-          _val = 0
+        if (card.eval !== 'false') {
+          try {
+            // eslint-disable-next-line
+            _val = eval(_val)
+          } catch (e) {
+            _val = ''
+          }
         }
 
-        val = _val
+        val = _val === undefined ? '' : _val
       }
 
       if (val !== '') {
         val = `${card.prefix || ''}${val}${card.postfix || ''}`
+        if (card.eval === 'false' && /\s/ig.test(val)) {
+          val = val.replace(/\s/ig, '&nbsp;')
+          val = <span dangerouslySetInnerHTML={{__html: val}}></span>
+        }
       }
 
       if (card.marks) {
@@ -705,7 +738,7 @@
           </Col>
         )
       } else if (card.OpenType === 'funcbutton') {
-        if (card.funcType === 'changeuser') {
+        if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
           return (
             <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
               <ChangeUserButton

--
Gitblit v1.8.0