diff --git a/components/apolloTable/component/index.tsx b/components/apolloTable/component/index.tsx index 1df35f714b6aac8f8f6e341c72a073b0abdd6dac..2e40c18ce8fd540d341a42661a70646e7707ca6d 100644 --- a/components/apolloTable/component/index.tsx +++ b/components/apolloTable/component/index.tsx @@ -133,10 +133,9 @@ class AirTable extends React.Component { nextState.columns = nextProps.columns; } const operateConfig = nextProps.operateConfig; - const nextGroupConfig: any = - operateConfig && - operateConfig.menusGroup && - operateConfig.menusGroup.find((item: any) => { + const nextGroupConfig: any = operateConfig + && operateConfig.menusGroup + && operateConfig.menusGroup.find((item: any) => { return item.type === 'group'; }); if (nextGroupConfig && JSON.stringify(groupConfig) !== JSON.stringify(nextGroupConfig.value)) { @@ -214,18 +213,18 @@ class AirTable extends React.Component { cachedFeAttr, renderFirstLeft, leftMargin, + selfClass, } = this.props; - const sortConfig = - operateConfig && - operateConfig.menusGroup && - operateConfig.menusGroup.find((item: any) => { + const sortConfig = operateConfig + && operateConfig.menusGroup + && operateConfig.menusGroup.find((item: any) => { return item.type === 'sort'; }); const memDataSource = memoizeData(groupConfig, dataSource); return (
- {operateConfig && } + {operateConfig && }
{tableOperateConfig && (
diff --git a/components/apolloTable/component/operate/index.tsx b/components/apolloTable/component/operate/index.tsx index d629527852e6c85d1172f24737b48d729fbc3f68..57cb7bd7d9fb22aee4e6ef94a0c101df3cc3b98b 100644 --- a/components/apolloTable/component/operate/index.tsx +++ b/components/apolloTable/component/operate/index.tsx @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import { Button } from 'antd'; +import classname from 'classnames'; import Hide from '../hide'; import Filter from '../filter'; import Sort from '../sort'; @@ -10,6 +11,7 @@ import s from './index.less'; import { OperateConfigProps, ColumnProps } from '../interface'; interface Props { + selfClass?: string; operateConfig?: OperateConfigProps; columns: ColumnProps[]; } @@ -39,7 +41,9 @@ export default class Operate extends Component { }; renderBtn = (btn: any) => { - const { render, label, onClick, type, ghost, icon } = btn; + const { + render, label, onClick, type, ghost, icon, + } = btn; if (typeof render === 'function') { return render(btn); } @@ -52,12 +56,11 @@ export default class Operate extends Component { }; render() { - const { operateConfig, columns } = this.props; + const { operateConfig, columns, selfClass } = this.props; const { menusGroup, buttonsGroup, renderCustomNode, showCondition }: any = operateConfig || {}; - const filter: any = - menusGroup && - menusGroup.find((item: any) => { + const filter: any = menusGroup + && menusGroup.find((item: any) => { return item.type === 'filter'; }); return ( @@ -65,7 +68,7 @@ export default class Operate extends Component { {renderCustomNode && typeof renderCustomNode === 'function' ? renderCustomNode() : null}
{menusGroup && ( -
+
{menusGroup.map((item: any, i: number) => { return (