Merge branch 'master' into bms

king

2021-11-17 fe5dc955911feb6c376298e618de673da166fcab

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

@@ -639,6 +639,13 @@
        </Col>
      )
    } else if (card.eleType === 'button') {
      if (card.control === 'hidden') {
        let s = data[card.controlField]
        if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
          return null
        }
      }
      
      let _data = [data]

      if (data.$$type === 'extendCard' || data.$$empty) {