|
|
@@ -63,8 +63,7 @@ class DataPreview extends React.Component {
|
|
|
bordered
|
|
|
columns={columns.map((c, i) => {
|
|
|
let obj = {
|
|
|
- title: c.label,
|
|
|
- dataIndex: c.name,
|
|
|
+ ...c,
|
|
|
onCell: () => {
|
|
|
return {
|
|
|
style: {
|
|
|
@@ -75,14 +74,14 @@ class DataPreview extends React.Component {
|
|
|
},
|
|
|
};
|
|
|
if(c.type === 'time') {
|
|
|
- obj.render = (v, r, i) => {
|
|
|
+ obj.render = v => {
|
|
|
let text = moment(v).isValid() ? moment(v).format('YYYY-MM-DD') : v
|
|
|
- return <EllipsisTooltip title={text}>{text}</EllipsisTooltip>
|
|
|
+ return <EllipsisTooltip key={i} title={text}>{text}</EllipsisTooltip>
|
|
|
}
|
|
|
}else {
|
|
|
obj.render = v => {
|
|
|
let text = v === null ? '空' : v
|
|
|
- return <EllipsisTooltip title={text}>{text}</EllipsisTooltip>
|
|
|
+ return <EllipsisTooltip key={i} title={text}>{text}</EllipsisTooltip>
|
|
|
}
|
|
|
}
|
|
|
if(i !== columns.length - 1) {
|