Merge branch 'master' into positec

king

2023-10-18 6781ba45775af16872ac68f7e459b1072b16c4cc

 src/tabviews/custom/components/share/normalTable/index.jsx

@@ -144,6 +144,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}</>
          }
        }
      }
      if (col.blur) {
@@ -208,6 +216,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}</>
          }
        }
      }

@@ -337,9 +353,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 {
@@ -352,10 +366,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 = ''
          }
  
@@ -389,6 +401,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}</>
          }
        }
      }