Commit ca780ffc authored by XieZhiXiong's avatar XieZhiXiong

删除内外部过滤条件

parent a19e21e8
...@@ -90,8 +90,6 @@ const MemberPr1: React.FC<{}> = props => { ...@@ -90,8 +90,6 @@ const MemberPr1: React.FC<{}> = props => {
title: '外部状态', title: '外部状态',
dataIndex: 'outerStatusName', dataIndex: 'outerStatusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => ( render: (text, record) => (
<StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} /> <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
), ),
...@@ -100,8 +98,6 @@ const MemberPr1: React.FC<{}> = props => { ...@@ -100,8 +98,6 @@ const MemberPr1: React.FC<{}> = props => {
title: '内部状态', title: '内部状态',
dataIndex: 'innerStatusName', dataIndex: 'innerStatusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />, render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />,
}, },
{ {
...@@ -175,8 +171,6 @@ const MemberPr1: React.FC<{}> = props => { ...@@ -175,8 +171,6 @@ const MemberPr1: React.FC<{}> = props => {
roles = [], roles = [],
levels = [], levels = [],
sources = [], sources = [],
outerStatus = [],
innerStatus = [],
} = data; } = data;
const newColumns = columns.slice(); const newColumns = columns.slice();
...@@ -187,16 +181,6 @@ const MemberPr1: React.FC<{}> = props => { ...@@ -187,16 +181,6 @@ const MemberPr1: React.FC<{}> = props => {
'statusName', 'statusName',
status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0), status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
); );
coverColFiltersItem(
newColumns,
'outerStatusName',
outerStatus.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
coverColFiltersItem(
newColumns,
'innerStatusName',
innerStatus.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
setColumns(newColumns); setColumns(newColumns);
......
...@@ -90,8 +90,6 @@ const MemberPr2: React.FC<{}> = props => { ...@@ -90,8 +90,6 @@ const MemberPr2: React.FC<{}> = props => {
title: '外部状态', title: '外部状态',
dataIndex: 'outerStatusName', dataIndex: 'outerStatusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => ( render: (text, record) => (
<StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} /> <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
), ),
...@@ -100,8 +98,6 @@ const MemberPr2: React.FC<{}> = props => { ...@@ -100,8 +98,6 @@ const MemberPr2: React.FC<{}> = props => {
title: '内部状态', title: '内部状态',
dataIndex: 'innerStatusName', dataIndex: 'innerStatusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />, render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />,
}, },
{ {
...@@ -175,8 +171,6 @@ const MemberPr2: React.FC<{}> = props => { ...@@ -175,8 +171,6 @@ const MemberPr2: React.FC<{}> = props => {
roles = [], roles = [],
levels = [], levels = [],
sources = [], sources = [],
outerStatus = [],
innerStatus = [],
} = data; } = data;
const newColumns = columns.slice(); const newColumns = columns.slice();
...@@ -187,16 +181,6 @@ const MemberPr2: React.FC<{}> = props => { ...@@ -187,16 +181,6 @@ const MemberPr2: React.FC<{}> = props => {
'statusName', 'statusName',
status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0), status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
); );
coverColFiltersItem(
newColumns,
'outerStatusName',
outerStatus.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
coverColFiltersItem(
newColumns,
'innerStatusName',
innerStatus.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
setColumns(newColumns); setColumns(newColumns);
......
...@@ -91,8 +91,6 @@ const MemberPrConfirm: React.FC<{}> = props => { ...@@ -91,8 +91,6 @@ const MemberPrConfirm: React.FC<{}> = props => {
title: '外部状态', title: '外部状态',
dataIndex: 'outerStatusName', dataIndex: 'outerStatusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => ( render: (text, record) => (
<StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} /> <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
), ),
...@@ -101,8 +99,6 @@ const MemberPrConfirm: React.FC<{}> = props => { ...@@ -101,8 +99,6 @@ const MemberPrConfirm: React.FC<{}> = props => {
title: '内部状态', title: '内部状态',
dataIndex: 'innerStatusName', dataIndex: 'innerStatusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />, render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />,
}, },
{ {
...@@ -178,8 +174,6 @@ const MemberPrConfirm: React.FC<{}> = props => { ...@@ -178,8 +174,6 @@ const MemberPrConfirm: React.FC<{}> = props => {
roles = [], roles = [],
levels = [], levels = [],
sources = [], sources = [],
outerStatus = [],
innerStatus = [],
} = data; } = data;
const newColumns = columns.slice(); const newColumns = columns.slice();
...@@ -190,16 +184,6 @@ const MemberPrConfirm: React.FC<{}> = props => { ...@@ -190,16 +184,6 @@ const MemberPrConfirm: React.FC<{}> = props => {
'statusName', 'statusName',
status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0), status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
); );
coverColFiltersItem(
newColumns,
'outerStatusName',
outerStatus.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
coverColFiltersItem(
newColumns,
'innerStatusName',
innerStatus.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
setColumns(newColumns); setColumns(newColumns);
......
...@@ -90,8 +90,6 @@ const MemberPrSubmit: React.FC<{}> = props => { ...@@ -90,8 +90,6 @@ const MemberPrSubmit: React.FC<{}> = props => {
title: '外部状态', title: '外部状态',
dataIndex: 'outerStatusName', dataIndex: 'outerStatusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => ( render: (text, record) => (
<StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} /> <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
), ),
...@@ -100,8 +98,6 @@ const MemberPrSubmit: React.FC<{}> = props => { ...@@ -100,8 +98,6 @@ const MemberPrSubmit: React.FC<{}> = props => {
title: '内部状态', title: '内部状态',
dataIndex: 'innerStatusName', dataIndex: 'innerStatusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />, render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />,
}, },
{ {
...@@ -175,8 +171,6 @@ const MemberPrSubmit: React.FC<{}> = props => { ...@@ -175,8 +171,6 @@ const MemberPrSubmit: React.FC<{}> = props => {
roles = [], roles = [],
levels = [], levels = [],
sources = [], sources = [],
outerStatus = [],
innerStatus = [],
} = data; } = data;
const newColumns = columns.slice(); const newColumns = columns.slice();
...@@ -187,16 +181,6 @@ const MemberPrSubmit: React.FC<{}> = props => { ...@@ -187,16 +181,6 @@ const MemberPrSubmit: React.FC<{}> = props => {
'statusName', 'statusName',
status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0), status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
); );
coverColFiltersItem(
newColumns,
'outerStatusName',
outerStatus.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
coverColFiltersItem(
newColumns,
'innerStatusName',
innerStatus.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
setColumns(newColumns); setColumns(newColumns);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment