2024-11-21

king

2024-11-21 6ed4e1dc4b9575a22f74f57fbf90abe02b315de7

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

@@ -649,10 +649,21 @@
          }
        }

        let _style = {...card.style}

        if (card.marks) {
          let _s = {}
          getMark(card.marks, data, _s)

          if (_s.color) {
            _style.color = _s.color
          }
        }

        if (card.tipType === 'text') {
          contents.push(
            <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              <div style={card.style}>
              <div style={_style}>
                {val ? <Tooltip title={val}>
                  <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>{icon}</div>
                </Tooltip> : <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>{icon}</div>}
@@ -662,7 +673,7 @@
        } else {
          contents.push(
            <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              <div style={card.style}>
              <div style={_style}>
                {val ? <Tooltip title={val}>
                  <MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>
                </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>}