部分容错性调整

src/components/chartDesigner/content.jsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { findDOMNode } from 'react-dom'
 import { Layout, Tabs, Switch, Button } from 'antd'
 import BaseConfigForm from './sections/baseConfigForm'
 import AggregateTableConfigForm from './sections/aggregateTableConfigForm'

src/components/common/login/login.jsx

@@ -61,46 +61,50 @@ class LoginComponent extends React.Component {
         this.setState({
             fetching: true
         }, () => {
-            service.fetch({
-                url: URLS.LOGIN,
-                body: body
-            }).then(r => {
-                if(!r.err && r.data.code > 0) {
-                    return r.data.data;
-                }else {
-                    this.setState({
-                        notice: r.err || r.data.msg,
+            try {
+                service.fetch({
+                    url: URLS.LOGIN,
+                    body: body
+                }).then(r => {
+                    console.log('登录', body, r);
+                    if(!r.err && r.data.code > 0) {
+                        return r.data.data;
+                    }else {
+                        this.setState({
+                            notice: r.err || r.data.msg,
+                        });
+                        throw (r.err || r.data.msg);
+                    }
+                }).then(resData => {
+                    const token = resData.token;
+                    const expireTime = resData.times;
+                    const user = resData.user;
+                    const currentUser = {
+                        code: user.id+'',
+                        account: user.userName,
+                        password: user.passWord,
+                        name: user.name,
+                        role: user.role || 'default',
+                        department: user.department,
+                        job: user.post,
+                    };
+                    dispatch({ type: 'main/setCurrentUser', user: currentUser });
+                    authenticate(token, expireTime, currentUser, autoLogin, () => {
+                        this.setState({
+                            redirectToReferrer: true,
+                            fetching: false
+                        });
                     });
-                    throw (r.err || r.data.msg);
-                }
-            }).then(resData => {
-                console.log('登录', body, resData);
-                const token = resData.token;
-                const expireTime = resData.times;
-                const user = resData.user;
-                const currentUser = {
-                    code: user.id+'',
-                    account: user.userName,
-                    password: user.passWord,
-                    name: user.name,
-                    role: user.role || 'default',
-                    department: user.department,
-                    job: user.post,
-                };
-                dispatch({ type: 'main/setCurrentUser', user: currentUser });
-                authenticate(token, expireTime, currentUser, autoLogin, () => {
+                }).catch(ex => {
+                    console.error('登录失败', ex);
                     this.setState({
-                        redirectToReferrer: true,
+                        notice: (ex || ex.message ) || '登录失败',
                         fetching: false
                     });
                 });
-            }).catch(ex => {
-                console.error('登录失败', ex);
-                this.setState({
-                    notice: (ex || ex.message ) || '登录失败',
-                    fetching: false
-                });
-            });
+            }catch(e) {
+                console.error(e);
+            }
         });
     };
 

src/components/dashboardDesigner/content.jsx

@@ -209,7 +209,7 @@ class DashboardDesignerContent extends React.Component {
             <Content className='dashboard-content'>
                 <Layout className='content-layout'>
                     <Content className='viewlayout'>
-                        <ViewLayout contentSize={contentSize} editMode={editMode}/>
+                        <ViewLayout isOwner={isOwner} contentSize={contentSize} editMode={editMode}/>
                     </Content>
                     <Sider className='config-sider' width={(isOwner && editMode) ? 380 : 0}>
                         <ConfigForm/>

src/components/dashboardDesigner/viewLayout.jsx

@@ -83,7 +83,7 @@ class ViewLayout extends React.PureComponent {
     }
 
     render() {
-        const { dashboardDesigner, contentSize } = this.props;
+        const { isOwner, dashboardDesigner, contentSize } = this.props;
         const { editMode } = dashboardDesigner;
         const { visiblePreviewBox, previewItem } = this.state;
         const children = dashboardDesigner.items.map((item) => this.createElement(item, false, !item.chartOption));
@@ -104,8 +104,8 @@ class ViewLayout extends React.PureComponent {
             >
                 {(children.length === 0) ? <div key='default-chartview' className='default-chartview' data-grid={{ x: 0, y: 0, w: 12, h: 2, minW: 12, maxW: 12, minH: 2, maxH: 2, static: true }}>
                     <div className='tip'>
-                        <Icon type="plus-circle" theme="outlined" />
-                        <span>未添加图表</span>
+                        <Icon type="message" theme="outlined" />
+                        {isOwner ? <span>请在工具栏右侧选择图表或富文本类型添加到看板</span> : <span>未添加图表</span>}
                     </div>
                 </div> : children}
             </ReactGridLayout>

src/components/dashboardDesigner/viewLayout.less

@@ -1,7 +1,6 @@
 .dashboard-viewcontent {
   .default-chartview {
-    background: white;
-    border: 2px dashed #CCCCCC;
+    background: transparent;
     display: flex;
     justify-content: center;
     .tip {

src/models/dataSource.js

@@ -228,7 +228,7 @@ export default {
                 console.log('解析数据源', code, res);
                 if(!res.err && res.data.code > 0) {
                     let resData = res.data.data;
-                    let columnConfig = JSON.parse(resData.columnConfig);
+                    let columnConfig = JSON.parse(resData.columnConfig) || [];
                     let dbConfig = JSON.parse(resData.dbConfig);
                     let tags = JSON.parse(resData.dataTag);
                     let data = {