Merge branch 'master' into positec

king

2023-06-14 7cfd25aebe5869244e40dbbcd6384f115f35e66e

 src/tabviews/custom/components/table/base-table/index.jsx

@@ -200,7 +200,7 @@
            })
          }
          if (setting.controlField) {
            if (setting.controlVal.includes(item[setting.controlField])) {
            if (setting.controlVal.includes(item[setting.controlField] + '')) {
              item.$disabled = true
            }
          }