Merge branch 'master' into positec

king

2022-09-16 66cc7818cf5e13c44f4372e7d47fb72df7d2f752

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

@@ -243,7 +243,7 @@
        contents.push(
          <Col key={card.uuid} span={card.width}>
            <div style={card.style}>
              <div className="ant-mk-text"><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
              <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
            </div>
          </Col>
        )
@@ -454,6 +454,21 @@
        )
      } else if (card.eleType === 'icon') {
        let val = ''
        let height = card.innerHeight

        if (!height) { // 兼容
          let fontSize = 14
          let lineHeight = 1.5
    
          if (card.style.fontSize) {
            fontSize = parseInt(card.style.fontSize)
          }
          if (card.style.lineHeight) {
            lineHeight = parseFloat(card.style.lineHeight)
          }
    
          height = fontSize * lineHeight
        }
  
        if (card.datatype === 'static') {
          val = card.tooltip
@@ -465,8 +480,8 @@
          <Col key={card.uuid} span={card.width}>
            <div style={card.style}>
              {val ? <Tooltip title={val}>
                <MkIcon className="ant-mk-icon" style={{height: card.innerHeight || 'auto'}} type={card.icon}/>
              </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: card.innerHeight || 'auto'}} type={card.icon}/>}
                <MkIcon className="ant-mk-icon" style={{height: height}} type={card.icon}/>
              </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: height}} type={card.icon}/>}
            </div>
          </Col>
        )
@@ -660,8 +675,8 @@
  
        contents.push(
          <Col key={card.uuid} span={card.width}>
            <div className="ant-mk-date" style={card.style}>
              {val}
            <div style={card.style}>
              <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}>{val}</div>
            </div>
          </Col>
        )