From 66e4d2ef5ea7a86d5b60346410f37446a06c7c9f Mon Sep 17 00:00:00 2001
From: zhangwenshuai <zhangwenshuai@mttop.cn>
Date: Tue, 11 Aug 2020 15:39:13 +0800
Subject: [PATCH] update column

---
 components/apolloTable/component/Column.less  | 69 +++++++++----------
 components/apolloTable/component/Column.tsx   | 55 +++++++--------
 components/apolloTable/component/Table.tsx    |  4 +-
 components/apolloTable/component/index.tsx    |  2 +
 .../apolloTable/component/interface.tsx       |  1 +
 5 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/components/apolloTable/component/Column.less b/components/apolloTable/component/Column.less
index a545672..8f26e3a 100644
--- a/components/apolloTable/component/Column.less
+++ b/components/apolloTable/component/Column.less
@@ -15,23 +15,23 @@
     .colBrief {
         display: flex;
         align-items: center;
-        margin-right: @marginSmX;
-        //flex: 1;
+        flex: 1;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
         .colIcon {
+            display: flex;
             width: @textFontGen;
             color: @textPrimaryColor;
             margin-right: 5px;
         }
 
         .colTitle {
-            flex: 1;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
             text-align: left;
             color: @textPrimaryColor;
             font-weight: @weightSemiblod;
             display: flex;
+            margin-right: @marginSmX;
             &.required:before {
                 display: inline-block;
                 margin-right: 4px;
@@ -60,36 +60,35 @@
                 }
             }
         }
-    }
-
-    .sortArrowGroup {
-        .upArrow {
-            width: 0;
-            height: 0;
-            border-left: 3px solid transparent;
-            border-right: 3px solid transparent;
-            border-bottom: 6px solid #d8d8d8;
-            margin-bottom: 2px;
-            cursor: pointer;
-            &:hover {
-                border-bottom-color: #5088e4;
-            }
-            &.selected {
-                border-bottom-color: #5088e4;
-            }
-        }
-        .downArrow {
-            width: 0;
-            height: 0;
-            border-left: 3px solid transparent;
-            border-right: 3px solid transparent;
-            border-top: 6px solid #d8d8d8;
-            cursor: pointer;
-            &:hover {
-                border-top-color: #5088e4;
+        .sortArrowGroup {
+            .upArrow {
+                width: 0;
+                height: 0;
+                border-left: 3px solid transparent;
+                border-right: 3px solid transparent;
+                border-bottom: 6px solid #d8d8d8;
+                margin-bottom: 2px;
+                cursor: pointer;
+                &:hover {
+                    border-bottom-color: #5088e4;
+                }
+                &.selected {
+                    border-bottom-color: #5088e4;
+                }
             }
-            &.selected {
-                border-top-color: #5088e4;
+            .downArrow {
+                width: 0;
+                height: 0;
+                border-left: 3px solid transparent;
+                border-right: 3px solid transparent;
+                border-top: 6px solid #d8d8d8;
+                cursor: pointer;
+                &:hover {
+                    border-top-color: #5088e4;
+                }
+                &.selected {
+                    border-top-color: #5088e4;
+                }
             }
         }
     }
diff --git a/components/apolloTable/component/Column.tsx b/components/apolloTable/component/Column.tsx
index 9ab73c2..2f9dd88 100644
--- a/components/apolloTable/component/Column.tsx
+++ b/components/apolloTable/component/Column.tsx
@@ -76,17 +76,18 @@ export default class TableColumn extends PureComponent<ColumnProps> {
             rowSelection,
             icon,
             required,
+            leftMargin = 0,
         } = this.props;
         const { value = [] } = sortConfig || {};
         const sort = value.find((item: any) => {
             return item.colName === columnName;
         });
         const { sortType }: { sortType: string } = sort || {};
-        let marginLeft:any = 0;
+        let marginLeft: any = 0;
         if (columnIndex === 0 && (rowSelection || showIndex)) {
-            marginLeft = '72px';
+            marginLeft = `${leftMargin + 36}px`;
             if (!rowSelection) {
-                marginLeft = '91px';
+                marginLeft = `${leftMargin + 70}px`;
             }
         }
         return (
@@ -102,31 +103,31 @@ export default class TableColumn extends PureComponent<ColumnProps> {
                             </Tooltip>
                         )}
                     </span>
+                    {sortConfig && !!sortFlag && (
+                        <div className={s.sortArrowGroup}>
+                            <div
+                                className={sortType === 'ASC' ? classNames(s.upArrow, s.selected) : s.upArrow}
+                                onClick={() => {
+                                    if (sortType === 'ASC') {
+                                        this.removeSort();
+                                        return;
+                                    }
+                                    this.changeSort('ASC');
+                                }}
+                            />
+                            <div
+                                className={sortType === 'DESC' ? classNames(s.downArrow, s.selected) : s.downArrow}
+                                onClick={() => {
+                                    if (sortType === 'DESC') {
+                                        this.removeSort();
+                                        return;
+                                    }
+                                    this.changeSort('DESC');
+                                }}
+                            />
+                        </div>
+                    )}
                 </div>
-                {sortConfig && !!sortFlag && (
-                    <div className={s.sortArrowGroup}>
-                        <div
-                            className={sortType === 'ASC' ? classNames(s.upArrow, s.selected) : s.upArrow}
-                            onClick={() => {
-                                if (sortType === 'ASC') {
-                                    this.removeSort();
-                                    return;
-                                }
-                                this.changeSort('ASC');
-                            }}
-                        />
-                        <div
-                            className={sortType === 'DESC' ? classNames(s.downArrow, s.selected) : s.downArrow}
-                            onClick={() => {
-                                if (sortType === 'DESC') {
-                                    this.removeSort();
-                                    return;
-                                }
-                                this.changeSort('DESC');
-                            }}
-                        />
-                    </div>
-                )}
             </div>
         );
     }
diff --git a/components/apolloTable/component/Table.tsx b/components/apolloTable/component/Table.tsx
index 048fac9..9ff9e1c 100644
--- a/components/apolloTable/component/Table.tsx
+++ b/components/apolloTable/component/Table.tsx
@@ -239,12 +239,13 @@ export default class AirTable extends Component<TableProps, TableState> {
             showIndex,
             rowSelection,
             dataSource,
-            canResized,
+            canResized = true,
             onDragResized,
             canSorted,
             onDragSorted,
             tableId,
             cachedFeAttr,
+            leftMargin,
         } = this.props;
         const { columns } = this.state;
         const formatColumns = this.memoizeFormatColumns(columns, cachedFeAttr, tableId);
@@ -299,6 +300,7 @@ export default class AirTable extends Component<TableProps, TableState> {
                         dataSource={dataSource}
                         icon={icon}
                         required={requiredFlag}
+                        leftMargin={leftMargin}
                     />
                 </DragSorted>
             </DragResized>
diff --git a/components/apolloTable/component/index.tsx b/components/apolloTable/component/index.tsx
index 774c37a..d18c1d2 100644
--- a/components/apolloTable/component/index.tsx
+++ b/components/apolloTable/component/index.tsx
@@ -92,6 +92,7 @@ class AirTable extends React.Component<CommonProps, CommonState> {
             tableId,
             cachedFeAttr,
             renderFirstLeft,
+            leftMargin,
         } = this.props;
         const sortConfig = operateConfig
             && operateConfig.menusGroup
@@ -156,6 +157,7 @@ class AirTable extends React.Component<CommonProps, CommonState> {
                                 canSorted={canSorted}
                                 onDragSorted={onDragSorted}
                                 renderFirstLeft={renderFirstLeft}
+                                leftMargin={leftMargin}
                             />
                         </div>
                     </div>
diff --git a/components/apolloTable/component/interface.tsx b/components/apolloTable/component/interface.tsx
index f1c4839..ee1478e 100644
--- a/components/apolloTable/component/interface.tsx
+++ b/components/apolloTable/component/interface.tsx
@@ -85,6 +85,7 @@ export interface TableProps extends LoadConfigProps {
     onEmitMsg?: Function; // 是否支持消息协同
     cachedFeAttr?: boolean; // 是否启用前端缓存
     renderFirstLeft?:Function; // 第一个单元格特殊渲染
+    leftMargin?: number; // 第一个表头左侧对齐距离
 }
 export interface TableState {
     columns: ColumnProps[];
-- 
2.21.0