Merge branch 'master' into positec

king

2023-07-25 92e33bccf862aaa5d6190fa9913619283b62a9a2

Merge branch 'master' into positec

 src/tabviews/custom/components/card/cardcellList/index.jsx

@@ -542,6 +542,17 @@
          val = card.tooltip
        }

        if (/\\n|\n/.test(val)) {
          val = val + val
          val = val.replace(/(\\n|\n)$/, '')
        
          if (val) {
            val = val.split(/\\n|\n/)
        
            val = <div>{val.map((cell, i) => <div style={{marginBottom: 2}} key={i}>{cell}</div>)}</div>
          }
        }

        if (card.tipType === 'text') {
          contents.push(
            <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>

 src/tabviews/custom/components/card/cardcellList/index.scss

@@ -194,6 +194,9 @@
    height: 26px;
  }

  .ant-col {
    min-height: 0px;
  }
  .ant-col[class*="x"] {
    float: left;
    box-sizing: border-box;