Merge branch 'master' into positec

king

2023-06-07 17014ea028b2b0ce3aafab3c16eed14bf3fbc83a

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

@@ -112,7 +112,7 @@
        }

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

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

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

          if (setting.controlField) {
            if (setting.controlVal.includes(item[setting.controlField])) {
            if (setting.controlVal.includes(item[setting.controlField] + '')) {
              item.$disabled = true
            }
          }