Merge branch 'master' into positec

king

2022-05-17 2ae980243b7ad705dea575eadcfc4cf4e24073bd

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

@@ -21,6 +21,7 @@
const NewPageButton = asyncComponent(() => import('@/tabviews/zshare/actionList/newpagebutton'))
const ChangeUserButton = asyncComponent(() => import('@/tabviews/zshare/actionList/changeuserbutton'))
const PrintButton = asyncComponent(() => import('@/tabviews/zshare/actionList/printbutton'))
const FuncMegvii = asyncComponent(() => import('@/tabviews/zshare/actionList/funcMegvii'))
const BarCode = asyncElementComponent(() => import('@/components/barcode'))
const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
const MkProgress = asyncElementComponent(() => import('@/components/mkProgress'))
@@ -71,6 +72,14 @@

  openNewView = (e, card) => {
    const { cardCell, data, cards } = this.props

    if (data.$disabled) return

    if (card.anchors && card.anchors.length > 0) {
      let id = card.anchors[card.anchors.length - 1]
      let node = document.getElementById('anchor' + id)
      node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'})
    }

    if (!card.link) return
    e.stopPropagation()
@@ -348,10 +357,10 @@
        }
      }

      if (card.link) {
      if (card.link || (card.anchors && card.anchors.length > 0)) {
        _style.cursor = 'pointer'
      }

  
      if (card.bgImage && data[card.bgImage]) {
        _style.backgroundImage = `url('${data[card.bgImage]}')`
      }
@@ -873,6 +882,21 @@
              />
            </Col>
          )
        } else if (card.funcType === 'megvii') {
          return (
            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
              <FuncMegvii
                BID={data.$$BID}
                disabled={_disabled}
                lineId={data.$$key || ''}
                btn={card}
                show={card.show}
                style={card.style}
                setting={cards.setting}
                selectedData={_data}
              />
            </Col>
          )
        }
      }
    }