From 6781ba45775af16872ac68f7e459b1072b16c4cc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十月 2023 17:33:47 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.jsx |   68 +++++++++++++++++++++++++++-------
 1 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 4ce4d1b..0f95fec 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -309,6 +309,14 @@
           }
         } else if (mark.innerStyle) {
           content = <span style={mark.innerStyle}>{content}</span>
+        } else if (mark.space) {
+          content = <><span dangerouslySetInnerHTML={{__html: mark.space}}></span>{content}</>
+        } else if (mark.point) {
+          if (mark.position === 'front') {
+            content = <>{mark.point}{content}</>
+          } else {
+            content = <>{content}{mark.point}</>
+          }
         }
       }
 
@@ -397,6 +405,14 @@
           }
         } else if (mark.innerStyle) {
           content = <span style={mark.innerStyle}>{content}</span>
+        } else if (mark.space) {
+          content = <><span dangerouslySetInnerHTML={{__html: mark.space}}></span>{content}</>
+        } else if (mark.point) {
+          if (mark.position === 'front') {
+            content = <>{mark.point}{content}</>
+          } else {
+            content = <>{content}{mark.point}</>
+          }
         }
       }
 
@@ -441,9 +457,7 @@
           let func = new Function('data', col.formula)
           content = func([record])
         } catch (e) {
-          if (window.GLOB.debugger === true) {
-            console.warn(e)
-          }
+          console.warn(e)
           content = ''
         }
       } else {
@@ -457,10 +471,8 @@
             // eslint-disable-next-line
             content = eval(content)
           } catch (e) {
-            if (window.GLOB.debugger === true) {
-              console.info(content)
-              console.warn(e)
-            }
+            console.info(content)
+            console.warn(e)
             content = ''
           }
         }
@@ -498,6 +510,14 @@
           }
         } else if (mark.innerStyle) {
           content = <span style={mark.innerStyle}>{content}</span>
+        } else if (mark.space) {
+          content = <><span dangerouslySetInnerHTML={{__html: mark.space}}></span>{content}</>
+        } else if (mark.point) {
+          if (mark.position === 'front') {
+            content = <>{mark.point}{content}</>
+          } else {
+            content = <>{content}{mark.point}</>
+          }
         }
       }
 
@@ -750,6 +770,14 @@
             }
           } else if (mark.innerStyle) {
             content = <span style={mark.innerStyle}>{content}</span>
+          } else if (mark.space) {
+            content = <><span dangerouslySetInnerHTML={{__html: mark.space}}></span>{content}</>
+          } else if (mark.point) {
+            if (mark.position === 'front') {
+              content = <>{mark.point}{content}</>
+            } else {
+              content = <>{content}{mark.point}</>
+            }
           }
         }
 
@@ -817,6 +845,14 @@
             }
           } else if (mark.innerStyle) {
             content = <span style={mark.innerStyle}>{content}</span>
+          } else if (mark.space) {
+            content = <><span dangerouslySetInnerHTML={{__html: mark.space}}></span>{content}</>
+          } else if (mark.point) {
+            if (mark.position === 'front') {
+              content = <>{mark.point}{content}</>
+            } else {
+              content = <>{content}{mark.point}</>
+            }
           }
         }
 
@@ -850,9 +886,7 @@
           let func = new Function('data', col.formula)
           content = func([record])
         } catch (e) {
-          if (window.GLOB.debugger === true) {
-            console.warn(e)
-          }
+          console.warn(e)
           content = ''
         }
       } else {
@@ -866,10 +900,8 @@
             // eslint-disable-next-line
             content = eval(content)
           } catch (e) {
-            if (window.GLOB.debugger === true) {
-              console.info(content)
-              console.warn(e)
-            }
+            console.info(content)
+            console.warn(e)
             content = ''
           }
         }
@@ -907,6 +939,14 @@
           }
         } else if (mark.innerStyle) {
           content = <span style={mark.innerStyle}>{content}</span>
+        } else if (mark.space) {
+          content = <><span dangerouslySetInnerHTML={{__html: mark.space}}></span>{content}</>
+        } else if (mark.point) {
+          if (mark.position === 'front') {
+            content = <>{mark.point}{content}</>
+          } else {
+            content = <>{content}{mark.point}</>
+          }
         }
       }
 

--
Gitblit v1.8.0