Merge branch 'develop'

king

2024-07-01 0559bee7aa852d88fedf9002504f52d9e6228eb4

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

@@ -1034,6 +1034,17 @@
          className = mark.signType
        }

        if (card.link && !data.$disabled) {
          _style.cursor = 'pointer'
          contents.push(
            <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
                {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> : 
                <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
              </div>
            </div>
          )
        } else {
        contents.push(
          <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
            <div style={_style}>
@@ -1042,6 +1053,7 @@
            </div>
          </div>
        )
        }
      } else if (card.eleType === 'tag') {
        let vals = ''
  
@@ -1223,6 +1235,7 @@
            name={name}
            BID={data.$$BID}
            LID={lid}
            columns={cards.columns}
            BData={data.$$BData || ''}
            disabled={_disabled}
            selectedData={_data}
@@ -1285,6 +1298,7 @@
              disabled={_disabled}
              LID={lid}
              btn={card}
              columns={cards.columns}
              selectedData={_data}
            />
          }