From 4d970a832ce6a11907a38a91cb492f7611c59adb Mon Sep 17 00:00:00 2001
From: zhangwenshuai <zhangwenshuai@mttop.cn>
Date: Fri, 7 Aug 2020 18:23:04 +0800
Subject: [PATCH] update

---
 .../apolloTable/component/DragFixed.less      |  1 +
 .../apolloTable/component/DragFixed.tsx       |  2 ++
 .../apolloTable/component/DragSorted.less     |  3 +++
 .../apolloTable/component/DragSorted.tsx      |  7 +++---
 .../apolloTable/component/RightDragFixed.tsx  |  2 ++
 components/apolloTable/component/Table.tsx    |  3 +++
 components/apolloTable/utils/memCols.ts       | 23 +++++++++++++++----
 7 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/components/apolloTable/component/DragFixed.less b/components/apolloTable/component/DragFixed.less
index 5e5fc66..e0ded1d 100644
--- a/components/apolloTable/component/DragFixed.less
+++ b/components/apolloTable/component/DragFixed.less
@@ -6,6 +6,7 @@
     width: 2px;
     z-index: 4;
     background: transparent;
+    user-select: none;
     &.hovered {
         background: #aaa;
     }
diff --git a/components/apolloTable/component/DragFixed.tsx b/components/apolloTable/component/DragFixed.tsx
index 6a82e90..e5c7f2f 100644
--- a/components/apolloTable/component/DragFixed.tsx
+++ b/components/apolloTable/component/DragFixed.tsx
@@ -157,6 +157,8 @@ const DragFixed = (props: any) => {
             onMouseLeave={onMouseLeaveWrap}
         >
             <ResizableBox
+                width={2}
+                height={1}
                 handle={
                     <span
                         id="leftFixedHandle"
diff --git a/components/apolloTable/component/DragSorted.less b/components/apolloTable/component/DragSorted.less
index 9cfee3d..10ec52e 100644
--- a/components/apolloTable/component/DragSorted.less
+++ b/components/apolloTable/component/DragSorted.less
@@ -3,4 +3,7 @@
 .sortedWrap {
     width: 100%;
     height: 100%;
+    &.sortedAble {
+        cursor: grab;
+    }
 }
diff --git a/components/apolloTable/component/DragSorted.tsx b/components/apolloTable/component/DragSorted.tsx
index 655a0f2..6805674 100644
--- a/components/apolloTable/component/DragSorted.tsx
+++ b/components/apolloTable/component/DragSorted.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useRef } from 'react';
 import classNames from 'classnames';
 import s from './DragSorted.less';
-import { getCache, saveCache } from '@/submodule/components/apolloTable/utils/cache';
+import { getCache, saveCache } from '../utils/cache';
 
 const DragSorted = (props: any) => {
     const {
@@ -14,8 +14,9 @@ const DragSorted = (props: any) => {
         onDragSorted,
         columns,
         cachedFeAttr,
+        position,
     } = props;
-    if (!canSorted) {
+    if (!canSorted || position === 'left' || position === 'right') {
         return <div className={s.sortedWrap}>{props.children}</div>;
     }
     // 长按计时器
@@ -241,7 +242,7 @@ const DragSorted = (props: any) => {
 
     return (
         <div
-            className={classNames('draggableColumn', s.sortedWrap)}
+            className={classNames('draggableColumn', s.sortedWrap, s.sortedAble)}
             onMouseDown={onMouseDown}
             onMouseUp={onMouseUp}
             data-column-name={columnName}
diff --git a/components/apolloTable/component/RightDragFixed.tsx b/components/apolloTable/component/RightDragFixed.tsx
index 079be4a..99bcf69 100644
--- a/components/apolloTable/component/RightDragFixed.tsx
+++ b/components/apolloTable/component/RightDragFixed.tsx
@@ -163,6 +163,8 @@ const DragFixed = (props: any) => {
             onMouseLeave={onMouseLeaveWrap}
         >
             <ResizableBox
+                width={2}
+                height={1}
                 handle={
                     <span
                         id="rightFixedHandle"
diff --git a/components/apolloTable/component/Table.tsx b/components/apolloTable/component/Table.tsx
index e539c17..917fd64 100644
--- a/components/apolloTable/component/Table.tsx
+++ b/components/apolloTable/component/Table.tsx
@@ -281,6 +281,7 @@ export default class AirTable extends Component<TableProps, TableState> {
                     cachedFeAttr={cachedFeAttr}
                     tableId={tableId}
                     columns={formatColumns}
+                    position={position}
                 >
                     <Column
                         columnType={String(columnType)}
@@ -482,6 +483,7 @@ export default class AirTable extends Component<TableProps, TableState> {
                                                         height={headerHeight}
                                                         cellRenderer={this.renderHeaderCell.bind(this, {
                                                             showColumns: leftColumns,
+                                                            position: 'left',
                                                         })}
                                                     />
                                                 </div>
@@ -572,6 +574,7 @@ export default class AirTable extends Component<TableProps, TableState> {
                                                                     scrollLeft={scrollLeft}
                                                                     cellRenderer={this.renderHeaderCell.bind(this, {
                                                                         showColumns,
+                                                                        position: 'center',
                                                                     })}
                                                                 />
                                                             </div>
diff --git a/components/apolloTable/utils/memCols.ts b/components/apolloTable/utils/memCols.ts
index bdb3279..0fa4cd3 100644
--- a/components/apolloTable/utils/memCols.ts
+++ b/components/apolloTable/utils/memCols.ts
@@ -70,18 +70,30 @@ export const getLeftWidth = (
 // 格式化列数据（添加缓存的前端属性）
 export const getFormatColumns = (columns: ColumnProps[], cachedFeAttr: boolean, tableId: number | string) => {
     if (cachedFeAttr) {
-        const cachedCols = getCache({ tableId });
+        let shouldSave = false;
+        let cachedCols = getCache({ tableId });
         if (cachedCols) {
             columns = columns.map((item: any) => {
+                if (!cachedCols[item.columnName]) {
+                    shouldSave = true;
+                    cachedCols[item.columnName] = {
+                        columnName: item.columnName,
+                        width: item.width,
+                        align: item.align,
+                        fixed: item.fixed,
+                        hideScope: item.hideScope,
+                        orderNo: item.orderNo,
+                    };
+                }
                 return {
                     ...item,
                     ...cachedCols[item.columnName],
                 };
             });
         } else {
-            const data: any = {};
+            cachedCols = {};
             columns.map((item: any) => {
-                data[item.columnName] = {
+                cachedCols[item.columnName] = {
                     columnName: item.columnName,
                     width: item.width,
                     align: item.align,
@@ -91,9 +103,12 @@ export const getFormatColumns = (columns: ColumnProps[], cachedFeAttr: boolean,
                 };
             });
             if (columns.length > 0) {
-                saveCache({ tableId, data });
+                shouldSave = true;
             }
         }
+        if (shouldSave) {
+            saveCache({ tableId, data: cachedCols });
+        }
     }
     columns.sort((a, b) => {
         return a.orderNo - b.orderNo;
-- 
2.21.0