Merge branch 'master' into bms

king

2021-11-17 ab397d396be4853dbc4e1d7829e4f542ecbdd7f2

 src/menu/components/card/cardcellcomponent/index.jsx

@@ -400,6 +400,12 @@
      let _elements = elements.map(cell => {
        if (cell.uuid === res.uuid) {
          res = {...cell, ...res}

          if (!res.control) {
            delete res.controlField
            delete res.controlVal
          }
          
          delete res.focus
          let style = {}