Merge remote-tracking branch 'origin/main'

io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue

@@ -2005,8 +2005,8 @@ const handlerQueryFormShowField = () => {
     const rowColsNum = queryFormRef.value.getColsNum() * (props.queryFormRowNum || 1);
     let currRowColsNum = 0;
     props.queryFormFields.forEach((item: any) => {
-      if (item.hasOwnProperty('colspan')) {
-        currRowColsNum += item.colspan;
+      if (item.hasOwnProperty('colSpan')) {
+        currRowColsNum += item.colSpan;
       } else {
         currRowColsNum += 1;
       }