From 79e1455e4ba4f4a7d04a483dda1a354e53921a69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 04 十一月 2020 19:04:14 +0800
Subject: [PATCH] 2020-11-04

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

diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 8375248..2c2a41c 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -91,7 +91,7 @@
   getContent = (card) => {
     const { data, BID, cards } = this.props
 
-    if (card.eleType === 'text' || card.eleType === 'number') {
+    if (card.eleType === 'text') {
       let val = ''
 
       if (card.datatype === 'static') {
@@ -100,6 +100,48 @@
         val = data[card.field]
       }
 
+      if (val !== '' && card.format) {
+        if (card.format === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(val)) {
+          val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)}`
+        }
+      }
+
+      if (val !== '') {
+        val = `${card.prefix || ''}${val}${card.postfix || ''}`
+      }
+
+      return (
+        <Col key={card.uuid} span={card.width}>
+          <div style={card.style}>
+            <div className={'ant-mk-text line' + card.height} style={{height: card.innerHeight || 21}}>{val}</div>
+          </div>
+        </Col>
+      )
+    } else if (card.eleType === 'number') {
+      let val = ''
+
+      if (card.datatype === 'static') {
+        val = card.value
+      } else if (data.hasOwnProperty(card.field)) {
+        val = data[card.field]
+      }
+
+      if (val !== '' && typeof(val) === 'number') {
+        if (card.format === 'percent') {
+          val = val * 100
+        }
+
+        if (card.col && card.col.type === 'number') {
+          val = val.toFixed(card.col.decimal || 0)
+        } else {
+          val = '' + val
+        }
+        
+        if (card.format === 'thdSeparator') {
+          val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+        }
+      }
+
       if (val !== '') {
         val = `${card.prefix || ''}${val}${card.postfix || ''}`
       }

--
Gitblit v1.8.0