feat: Table 默认展示数据项可按column位置展示，不统一在底部展示

NSFI · Jul 15, 2020 · aed8604 · hepeguo · Jul 15, 2020 · aed8604
1 parent 102b34f
commit aed8604
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/site/docs/zh-CN/table.md b/site/docs/zh-CN/table.md
@@ -115,6 +115,7 @@ const columns = [{
       title: 'Address',
       dataIndex: 'address',
       key: 'address',
+      filtrateDefault: true,
     }, {
       title: 'Action',
       key: 'action',
@@ -2264,6 +2265,7 @@ ReactDOM.render(<Demo {...context.props}/>,mountNode);
 | filtrateTitle | 筛选Checkbox显示文字 | String \| ReactNode | - |
 | width | 列宽度 | String \| Number | - |
 | ellipsis | 该列是否使用ellipsis属性,需要配合`scroll.x`使用，且指定列宽度，固定列中使用需要指定为像素宽度。 | Boolean | false |
+| filtrateDefault | 默认展示数据项，且按column位置展示，不统一在底部展示，区别columnFiltrate.defaultColumns | Boolean | false |
 
 ### ColumnGroup
 

diff --git a/source/components/Table/ColumnFiltrateModal.tsx b/source/components/Table/ColumnFiltrateModal.tsx
@@ -122,7 +122,7 @@ class ColumnFiltrateModal<T> extends React.Component<ColumnFiltrateProps<T>, Col
     this.setState({
       checkedOption,
       okButtonDisabled: (
-        JSON.stringify(checkedOption && checkedOption.sort()) == 
+        JSON.stringify(checkedOption && checkedOption.sort()) ==
         JSON.stringify(checkedOptionConfirm && checkedOptionConfirm.sort())
       )
     });
@@ -137,7 +137,7 @@ class ColumnFiltrateModal<T> extends React.Component<ColumnFiltrateProps<T>, Col
       .map((column) => {
         const uniqKey = getColumnKey(column);
         //fixed /分组不能控制显示隐藏
-        const disabled = !!column.fixed || !!column.children;
+        const disabled = !!column.fixed || !!column.children || !!column.filtrateDefault;
         const title = column.filtrateTitle || column.title;
         return {
           label: <ToolTip title={title}>{title}</ToolTip>,

diff --git a/source/components/Table/interface.tsx b/source/components/Table/interface.tsx
@@ -38,6 +38,7 @@ export interface ColumnProps<T> {
   onCell?: (record: T) => any;
   onHeaderCell?: (props: ColumnProps<T>) => any;
   ellipsis?: boolean;
+  filtrateDefault?: boolean;
 }
 
 export interface TableComponents {