From 151d3aee0218a3eb6b928b0b327be6cd9ac7652c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 七月 2021 16:02:07 +0800
Subject: [PATCH] 2021-07-01

---
 src/tabviews/custom/components/share/normalTable/index.jsx |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index e32c343..2d53f40 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -191,7 +191,7 @@
           content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)} ${content.substr(11, 2)}:${content.substr(14, 2)}:${content.substr(17, 2)}`
         }
   
-        content = col.prefix + content + col.postfix
+        content = (col.prefix || '') + content + (col.postfix || '')
       }
 
       if (col.marks) {
@@ -350,6 +350,10 @@
       )
     } else if (col.type === 'custom') {
       style.padding = '0px'
+      if (col.style) {
+        style = {...style, ...col.style}
+      }
+
       resProps.children = (
         <CardCellComponent data={record} cards={config} elements={col.elements}/>
       )
@@ -423,7 +427,10 @@
           if (item.rowspan === 'true') {
             rowspans.push(item.field)
           }
-          if (_format && !Math.floor(Math.random() * radio)) {
+          if (item.type === 'index') {
+            item.field = '$Index'
+            item.type = 'text'
+          } else if (_format && !Math.floor(Math.random() * radio)) {
             item.blur = true
           }
   

--
Gitblit v1.8.0