Merge branch 'master' of http://apollo.mttop.cn/gitlab/web_component/submodule

components/apolloTable/component/Table.tsx

@@ -345,7 +345,11 @@ export default class AirTable extends Component<TableProps, TableState> {
         const record: any = dataSource[rowIndex]; // 行数据
         const rowData: any = showData[rowIndex]; // 行数据
         const columnConfig: any = showColumns[columnIndex]; // 列属性
-        const columnData: any = rowData.rowData[columnIndex]; // 列数据
+        // const columnData: any = rowData.rowData[columnIndex]; // 列数据
+        const columnData: any = rowData.rowData.find((temp) => {
+            return temp.colName === columnConfig.columnName;
+        }); // 列数据
+
         const cellData: any = columnData && columnData.cellValueList; // 列数据
 
         const { cellClassName, cellStyle, bordered = false } = columnConfig;
@@ -519,7 +523,7 @@ export default class AirTable extends Component<TableProps, TableState> {
                                                             showColumns: leftColumns,
                                                         })}
                                                         onScroll={(...arg: Array<Object>) => {
-                                                            onScroll(...arg);
+                                                            onScroll({ scrollTop: arg[0].scrollTop });
                                                             this.onScroll(arg[0]);
                                                         }}
                                                         columnCount={leftCount}