Commit e6be7c01 by zhaochengxiang

新增字段默认加入重点关注

parent 2df8e4fa
...@@ -334,7 +334,7 @@ const ImportActionTable = (props) => { ...@@ -334,7 +334,7 @@ const ImportActionTable = (props) => {
setKeywordCondition({ keyword: '', needFilter: false }); setKeywordCondition({ keyword: '', needFilter: false });
const iid = generateUUID(); const iid = generateUUID();
const newData = [...moveRowRef.current.data, {iid}]; const newData = [...moveRowRef.current.data, {iid, needAttention: true }];
if (newData.length > supportMaxAttributeCountPerPage) { if (newData.length > supportMaxAttributeCountPerPage) {
...@@ -366,7 +366,7 @@ const ImportActionTable = (props) => { ...@@ -366,7 +366,7 @@ const ImportActionTable = (props) => {
const iid = generateUUID(); const iid = generateUUID();
if (index === 0) { if (index === 0) {
newData = [{iid}, ...newData]; newData = [{iid, needAttention: true}, ...newData];
setInsertIndex(0); setInsertIndex(0);
edit(newData[0], false); edit(newData[0], false);
} else { } else {
...@@ -395,7 +395,7 @@ const ImportActionTable = (props) => { ...@@ -395,7 +395,7 @@ const ImportActionTable = (props) => {
const index = newData.findIndex((item) => record.iid === item.iid); const index = newData.findIndex((item) => record.iid === item.iid);
const iid = generateUUID(); const iid = generateUUID();
newData.splice(index+1, 0, {iid}); newData.splice(index+1, 0, {iid, needAttention: true});
const _pageNum = parseInt((index+2)/supportMaxAttributeCountPerPage) + (((index+2)%supportMaxAttributeCountPerPage===0)?0:1); const _pageNum = parseInt((index+2)/supportMaxAttributeCountPerPage) + (((index+2)%supportMaxAttributeCountPerPage===0)?0:1);
...@@ -663,26 +663,6 @@ const ImportActionTable = (props) => { ...@@ -663,26 +663,6 @@ const ImportActionTable = (props) => {
return (index+1).toString(); return (index+1).toString();
} }
}, },
// {
// title: '重点关注',
// width: 75,
// dataIndex: 'needAttention',
// fixed: 'left',
// editable: (type==='model'?true:false),
// render: (needAttention, record, index) => {
// if (!needAttention) {
// return (
// <CloseOutlined />
// );
// } else if (needAttention === true) {
// return (
// <CheckOutlined />
// )
// }
// return '';
// }
// },
{ {
title: '中文名称', title: '中文名称',
width: 200, width: 200,
...@@ -817,7 +797,26 @@ const ImportActionTable = (props) => { ...@@ -817,7 +797,26 @@ const ImportActionTable = (props) => {
} }
}, },
{ {
title: '描述', title: '重点关注',
width: 75,
dataIndex: 'needAttention',
editable: (type==='model'?true:false),
render: (needAttention, record, index) => {
if (!needAttention) {
return (
<CloseOutlined />
);
} else if (needAttention === true) {
return (
<CheckOutlined />
)
}
return '';
}
},
{
title: '业务含义',
dataIndex: 'remark', dataIndex: 'remark',
editable: true, editable: true,
ellipsis: true, ellipsis: true,
...@@ -850,7 +849,7 @@ const ImportActionTable = (props) => { ...@@ -850,7 +849,7 @@ const ImportActionTable = (props) => {
} }
}, },
{ {
title: '业务定义', title: '计算规则',
dataIndex: 'definition', dataIndex: 'definition',
editable: true, editable: true,
ellipsis: true, ellipsis: true,
...@@ -1040,7 +1039,7 @@ const ImportActionTable = (props) => { ...@@ -1040,7 +1039,7 @@ const ImportActionTable = (props) => {
//审批页面不显示重点关注 //审批页面不显示重点关注
if (action==='flow') { if (action==='flow') {
_columns = _columns.filter((col) => col.dataIndex!=='needAttention') _columns = _columns.filter((col) => col.dataIndex!=='needAttention');
} }
return _columns.map((col) => { return _columns.map((col) => {
......
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