update column

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,8 +60,6 @@
                 }
             }
         }
-    }
-
         .sortArrowGroup {
             .upArrow {
                 width: 0;
@@ -93,6 +91,7 @@
                 }
             }
         }
+    }
 
     .colOpera {
         width: 20px;

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,7 +103,6 @@ export default class TableColumn extends PureComponent<ColumnProps> {
                             </Tooltip>
                         )}
                     </span>
-                </div>
                     {sortConfig && !!sortFlag && (
                         <div className={s.sortArrowGroup}>
                             <div
@@ -128,6 +128,7 @@ export default class TableColumn extends PureComponent<ColumnProps> {
                         </div>
                     )}
                 </div>
+            </div>
         );
     }
 }

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>

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>

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[];