Browse Source

数据源预览数据报错问题

zhuth 6 years ago
parent
commit
edeb41c6ac
2 changed files with 4 additions and 7 deletions
  1. 4 5
      src/components/common/dataPreview/dataPreview.jsx
  2. 0 2
      src/models/dataSource.js

+ 4 - 5
src/components/common/dataPreview/dataPreview.jsx

@@ -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) {

+ 0 - 2
src/models/dataSource.js

@@ -1,7 +1,6 @@
 import { message } from 'antd'
 import * as service from '../services/index'
 import URLS from '../constants/url'
-import moment from 'moment'
 
 export default {
     namespace: 'dataSource',
@@ -783,7 +782,6 @@ export default {
                     const columns = JSON.parse(columnConfig).map(c => ({
                         title: c.columnLable,
                         dataIndex: c.columnName,
-                        render: c.columnType === 'time' ? ((v, r, i) => moment(v).format('YYYY-MM-DD')) : v => v
                     }));
                     const { list: dataSource, pageSize, total } = values;