From f2fbe67d50390217de72c06582991825eea568bb Mon Sep 17 00:00:00 2001
From: zhangwenshuai <zhangwenshuai@mttop.cn>
Date: Thu, 15 Oct 2020 13:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/apolloTable/component/Table.less | 14 ++++++--------
 components/apolloTable/component/Table.tsx  |  8 ++------
 components/apolloTable/component/index.less | 19 ++++++-------------
 components/apolloTable/component/index.tsx  | 14 +++-----------
 4 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/components/apolloTable/component/Table.less b/components/apolloTable/component/Table.less
index 5923b09..0980794 100644
--- a/components/apolloTable/component/Table.less
+++ b/components/apolloTable/component/Table.less
@@ -6,14 +6,12 @@
     flex-direction: row;
     border: 1px solid @borderColor;
     overflow: hidden;
-    &.scroll {
-        height: 100%;
-        .loading {
-            position: absolute;
-            left: 50%;
-            transform: translate(-50%, -50%);
-            z-index: 10;
-        }
+    height: 100%;
+    .loading {
+        position: absolute;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        z-index: 10;
     }
     .leftSideContainer {
         box-shadow: 6px 0 6px -4px rgba(0, 0, 0, 0.15);
diff --git a/components/apolloTable/component/Table.tsx b/components/apolloTable/component/Table.tsx
index 832f92a..9112c0d 100644
--- a/components/apolloTable/component/Table.tsx
+++ b/components/apolloTable/component/Table.tsx
@@ -449,13 +449,9 @@ export default class AirTable extends Component<TableProps, TableState> {
                         {({ onScroll, scrollLeft, scrollTop }: any) => {
                             return (
                                 <div
-                                    className={
-                                        this.props.onScroll
-                                            ? classNames(styles.tableContainer, styles.scroll)
-                                            : styles.tableContainer
-                                    }
+                                    className={styles.tableContainer}
                                     style={{
-                                        paddingRight: this.props.onScroll ? paddingRight : 0,
+                                        paddingRight,
                                     }}
                                     id={`apolloTable_${tableId}`}
                                 >
diff --git a/components/apolloTable/component/index.less b/components/apolloTable/component/index.less
index 2da4616..b3e196e 100644
--- a/components/apolloTable/component/index.less
+++ b/components/apolloTable/component/index.less
@@ -1,26 +1,19 @@
 @import '../common';
 .container {
-    //overflow: hidden;
-    //height: 100%;
     width: 100%;
     position: relative;
-    &.scroll {
-        display: flex;
-        flex-direction: column;
-        height: calc(100vh - 92px);
-    }
+    display: flex;
+    flex-direction: column;
+    height: calc(100vh - 92px);
 
     .operateContainer {
     }
     .tableContainer {
         position: relative;
         box-shadow: @boxShadow;
-        //min-height: 600px;
-        &.scroll {
-            flex: 1;
-            display: flex;
-            flex-direction: column;
-        }
+        flex: 1;
+        display: flex;
+        flex-direction: column;
         .tableOperateContainer {
             height: 38px;
             overflow: hidden;
diff --git a/components/apolloTable/component/index.tsx b/components/apolloTable/component/index.tsx
index d18c1d2..1191b8f 100644
--- a/components/apolloTable/component/index.tsx
+++ b/components/apolloTable/component/index.tsx
@@ -102,19 +102,11 @@ class AirTable extends React.Component<CommonProps, CommonState> {
         return (
             <Provider value={{ locale: this.getContext() }}>
                 <div
-                    className={
-                        onScroll
-                            ? classNames(styles.container, styles.scroll, className)
-                            : classNames(styles.container, className)
-                    }
+                    className={classNames(styles.container, className)}
                 >
                     {operateConfig && <OperateConfig columns={columns} operateConfig={operateConfig} />}
                     <div
-                        className={
-                            onScroll
-                                ? classNames(styles.tableContainer, styles.scroll, tableClassName)
-                                : classNames(styles.tableContainer, tableClassName)
-                        }
+                        className={classNames(styles.tableContainer, tableClassName)}
                     >
                         {tableOperateConfig && (
                             <div className={styles.tableOperateContainer}>
@@ -128,7 +120,7 @@ class AirTable extends React.Component<CommonProps, CommonState> {
                                 dataSource={dataSource}
                                 rowStyle={rowStyle}
                                 rowClassName={rowClassName}
-                                onScroll={this.onScroll}
+                                onScroll={onScroll ? this.onScroll : undefined}
                                 distanceToLoad={distanceToLoad}
                                 cellEditable={cellEditable}
                                 emitChangeCell={emitChangeCell}
-- 
2.21.0