From 285e8132595b1d4e3c1519224e33f4ebcf9d4725 Mon Sep 17 00:00:00 2001
From: zhangwenshuai <zhangwenshuai@mttop.cn>
Date: Mon, 10 Aug 2020 15:38:38 +0800
Subject: [PATCH] update fixed bug

---
 components/apolloTable/component/DragFixed.tsx      | 2 +-
 components/apolloTable/component/RightDragFixed.tsx | 2 +-
 components/apolloTable/utils/memCols.ts             | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/apolloTable/component/DragFixed.tsx b/components/apolloTable/component/DragFixed.tsx
index ec6f5fa..f408821 100644
--- a/components/apolloTable/component/DragFixed.tsx
+++ b/components/apolloTable/component/DragFixed.tsx
@@ -121,7 +121,7 @@ const DragFixed = (props: any) => {
             if (fixedCol[item.columnName] === 1) {
                 item.fixed = 'left';
             } else {
-                if (item.fixed === 'left') {
+                if (!!item.showStatus && item.fixed === 'left') {
                     item.fixed = '';
                 }
             }
diff --git a/components/apolloTable/component/RightDragFixed.tsx b/components/apolloTable/component/RightDragFixed.tsx
index e11f94c..e73e976 100644
--- a/components/apolloTable/component/RightDragFixed.tsx
+++ b/components/apolloTable/component/RightDragFixed.tsx
@@ -127,7 +127,7 @@ const DragFixed = (props: any) => {
             if (fixedCol[item.columnName] === 1) {
                 item.fixed = 'right';
             } else {
-                if (item.fixed === 'right') {
+                if (!!item.showStatus && item.fixed === 'right') {
                     item.fixed = '';
                 }
             }
diff --git a/components/apolloTable/utils/memCols.ts b/components/apolloTable/utils/memCols.ts
index 0fa4cd3..552cab5 100644
--- a/components/apolloTable/utils/memCols.ts
+++ b/components/apolloTable/utils/memCols.ts
@@ -81,7 +81,6 @@ export const getFormatColumns = (columns: ColumnProps[], cachedFeAttr: boolean,
                         width: item.width,
                         align: item.align,
                         fixed: item.fixed,
-                        hideScope: item.hideScope,
                         orderNo: item.orderNo,
                     };
                 }
@@ -98,7 +97,6 @@ export const getFormatColumns = (columns: ColumnProps[], cachedFeAttr: boolean,
                     width: item.width,
                     align: item.align,
                     fixed: item.fixed,
-                    hideScope: item.hideScope,
                     orderNo: item.orderNo,
                 };
             });
-- 
2.21.0