请求错误提示信息调整/布局改变以及窗口大小调整时计算看板容器大小设置布局大小

src/components/chartDesigner/charts/tableView.jsx

@@ -16,7 +16,7 @@ const TableView = ({ contentSize, chartDesigner, dispatch }) => {
             size='small'
             scroll={{
                 x: columns ? columns.length * 100 : 0,
-                y: contentSize.height - 38 -38 - 25
+                y: contentSize.height - 38 - 42
             }}
         />
     );

src/components/chartDesigner/charts/tableView.less

@@ -1,8 +1,22 @@
 .table-view {
-    .ant-table-header {
-        overflow-y: hidden !important;
-    }
-    .ant-table-body {
-        overflow: auto !important;
+    height: 100%;
+    .ant-spin-nested-loading {
+        height: 100%;
+        .ant-spin-container {
+            height: 100%;
+            padding-bottom: 40px;
+            .ant-table {
+                height: 100%;
+                .ant-table-header {
+                    overflow-y: hidden !important;
+                }
+                .ant-table-body {
+                    overflow: auto !important;
+                }
+            }
+            .ant-pagination {
+                margin: 8px 0;
+            }
+        }
     }
 }

src/components/chartDesigner/layout.less

@@ -24,6 +24,9 @@
                 border-style: solid;
                 border-color: #CCCCCC;
             }
+            .content-body {
+                height: 100%;
+            }
         }
     }
     .ant-layout-sider {

src/components/dashboardDesigner/chartView.jsx

@@ -30,7 +30,7 @@ const ChartView = ({ item, itemSize, chart, editMode, dispatch }) => {
                     size='small'
                     scroll={{
                         x: columns ? columns.length * 100 : 0,
-                        y: height - 38 - 50 -16 , // 减去工具栏高度、表格标题栏高度、分页工具高度、缩放调整按钮高度
+                        y: height - 38 - 50 - 16 , // 减去工具栏高度、表格标题栏高度、分页工具高度、缩放调整按钮高度
                     }}
                     columns={columns ? columns.map(c => ({
                         ...c,

src/components/dashboardDesigner/content.jsx

@@ -23,6 +23,13 @@ class DashboardDesignerContent extends React.Component {
 
     componentDidMount() {
         this.refreshContentSize(true);
+        this.addResizeListener();
+    }
+
+    addResizeListener = () => {
+        window.addEventListener("resize", () => {
+            this.refreshContentSize(true);
+        });
     }
 
     showBox = (o) => {

src/components/dashboardDesigner/header.jsx

@@ -18,7 +18,7 @@ class Header extends React.Component {
     }
 
     render() {
-        const { dashboardDesigner, dispatch, updateThumbnail } = this.props;
+        const { dashboardDesigner, dispatch } = this.props;
         return (
             <div className='dashboarddesigner-header'>
                 <div className='header-item toolbar-back'>

src/components/dashboardDesigner/layout.jsx

@@ -16,23 +16,23 @@ class DashboardDesigner extends React.Component {
         const { code } = this.props.match.params;
         dispatch({ type: 'dashboardDesigner/reset' });
         dispatch({ type: 'chart/fetchList' });
-        if(code !== 'create') {
+        if (code !== 'create') {
             dispatch({ type: 'dashboard/remoteDetail', code: code });
         }
     }
 
 
     saveToPNG = (element) => {
-        html2canvas(element).then(function(canvas) {
-                var pageData = canvas.toDataURL('image/png', 1.0);
+        html2canvas(element).then(function (canvas) {
+            let pageData = canvas.toDataURL('image/png', 1.0);
 
-                //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
-                var pdf = new jsPDF('', 'pt', 'a4');
+            //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
+            let pdf = new jsPDF('', 'pt', 'a4');
 
-                //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
-                pdf.addImage(pageData, 'PNG', 0, 0, 595.28, 592.28/canvas.width * canvas.height );
+            //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
+            pdf.addImage(pageData, 'PNG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
 
-                pdf.save('stone.pdf');
+            pdf.save('stone.pdf');
         });
     }
 
@@ -46,11 +46,16 @@ class DashboardDesigner extends React.Component {
                 <DashboardDesignerContent />
             </Content>
             <div style={{ display: loading ? 'block' : 'none', position: 'absolute', height: '100%', width: '100%', zIndex: '4', background: 'rgba(51,51,51,.1)' }}>
-                <Spin style={{ display: 'inline-block', position: 'absolute', top: '50%', left: '50%', margin: '-10px' }} indicator={<Icon type="loading" style={{ fontSize: 24 }} spin />}/>
+                <Spin style={{ display: 'inline-block', position: 'absolute', top: '50%', left: '50%', margin: '-10px' }} indicator={<Icon type="loading" style={{ fontSize: 24 }} spin />} />
             </div>
         </Layout>
     }
 
 }
 
-export default connect(({ present: { dashboardDesigner } }) => ({ dashboardDesigner }))(DashboardDesigner)
+function mapStateToProps(state) {
+    let loading = state.present.loading.models.dashboard;
+    return { loading }
+}
+
+export default connect(mapStateToProps)(DashboardDesigner)

src/components/dashboardDesigner/viewLayout.jsx

@@ -1,5 +1,4 @@
 import React from "react"
-import { findDOMNode } from 'react-dom'
 import "./viewLayout.less"
 import ReactGridLayout from 'react-grid-layout'
 import { Icon, Modal } from 'antd'

src/components/dashboardDesigner/viewLayout.less

@@ -150,7 +150,6 @@
   }
   .react-grid-layout {
     background: #eee;
-    overflow: hidden;
   }
   .layoutJSON {
     background: #ddd;
@@ -258,7 +257,7 @@
   
   .react-grid-item.react-draggable-dragging {
     transition: none;
-    opacity: 0.5;
+    opacity: 0.8;
     z-index: 3 !important;
     will-change: transform;
   }

src/constants/url.js

@@ -36,19 +36,19 @@ const URLS = {
 
     /***************************************数据源***************************************/
 
-    DATASOURCE_ADD: BASE_URL + '/inputDataConnector', // 新增数据源
+    DATASOURCE_ADD: BASE_URL + '/Connector/inputDataConnector', // 新增数据源
 
-    DATASOURCE_UPDATE: BASE_URL + '/updateData', // 修改数据源
+    DATASOURCE_UPDATE: BASE_URL + '/Connector/updateData', // 修改数据源
 
-    DATASOURCE_DELETE: BASE_URL + '/delDataConnector', // 删除数据源
+    DATASOURCE_DELETE: BASE_URL + '/Connector/delDataConnector', // 删除数据源
 
-    DATASOURCE_LIST: BASE_URL + '/getListDataConnector', // 获得数据源列表
+    DATASOURCE_LIST: BASE_URL + '/Connector/getListDataConnector', // 获得数据源列表
 
-    DATASOURCE_DETAIL: BASE_URL + '/getDataConnector', // 获得单个数据源详细数据
+    DATASOURCE_DETAIL: BASE_URL + '/Connector/getDataConnector', // 获得单个数据源详细数据
 
     DATASOURCE_QUERY_SQLCOLUMNS: BASE_URL + '/implementSql', // 根据sql请求列数据信息
     
-    DATASOURCE_QUERY_DATACOLUMNS: BASE_URL + '/getColumnData', // 获得数据源下的列
+    DATASOURCE_QUERY_DATACOLUMNS: BASE_URL + '/DataBase/getColumnData', // 获得数据源下的列
 
     DATASOURCE_QUERY_COLUMNDATA: BASE_URL + '/getScreenByBaseId', // 数据源获得列去重之后的数据
 
@@ -66,15 +66,15 @@ const URLS = {
 
     /***************************************数据连接配置***************************************/
 
-    DATACONNECT_ADD: BASE_URL + '/inputDatabases', // 新增数据连接配置
+    DATACONNECT_ADD: BASE_URL + '/DataBase/inputDatabases', // 新增数据连接配置
 
-    DATACONNECT_UPDATE: BASE_URL + '/updatabases', // 修改数据连接配置
+    DATACONNECT_UPDATE: BASE_URL + '/DataBase/updatabases', // 修改数据连接配置
 
-    DATACONNECT_DELETE: BASE_URL + '/delDatabases', // 删除数据连接配置
+    DATACONNECT_DELETE: BASE_URL + '/DataBase/delDatabases', // 删除数据连接配置
 
-    DATACONNECT_LIST: BASE_URL + '/getDatabases', // 获得数据连接列表
+    DATACONNECT_LIST: BASE_URL + '/DataBase/getDatabases', // 获得数据连接列表
 
-    DATACONNECT_VALIDATE: BASE_URL + '/testConnect', // 校验数据库连接是否合法
+    DATACONNECT_VALIDATE: BASE_URL + '/DataBase/testConnect', // 校验数据库连接是否合法
 
     /***************************************图表***************************************/
 
@@ -118,17 +118,17 @@ const URLS = {
 
     /***************************************数据源分组***************************************/
 
-    GROUP_DATASOURCE_LIST: BASE_URL + '/getConnectorGroup', // 获得数据源所有分组/子分组
+    GROUP_DATASOURCE_LIST: BASE_URL + '/Connector/getConnectorGroup', // 获得数据源所有分组/子分组
 
-    GROUP_DATASOURCE_ADD: BASE_URL + '/setConnectorGroup', // 新增数据源分组/子分组
+    GROUP_DATASOURCE_ADD: BASE_URL + '/Connector/setConnectorGroup', // 新增数据源分组/子分组
 
-    GROUP_DATASOURCE_UPDATE: BASE_URL + '/updataDataConnectorGroup', // 修改数据源分组信息
+    GROUP_DATASOURCE_UPDATE: BASE_URL + '/Connector/updataDataConnectorGroup', // 修改数据源分组信息
 
-    GROUP_DATASOURCE_SET_GROUP: BASE_URL + '/updateConnectConfigGroup', // 设置数据源所属分组
+    GROUP_DATASOURCE_SET_GROUP: BASE_URL + '/Connector/updateConnectConfigGroup', // 设置数据源所属分组
 
-    GROUP_DATASOURCE_LIST_UPDATE: BASE_URL + '/updataConnectorGroup', // 批量修改数据源分组信息
+    GROUP_DATASOURCE_LIST_UPDATE: BASE_URL + '/Connector/updataConnectorGroup', // 批量修改数据源分组信息
 
-    GROUP_DATASOURCE_DELETE: BASE_URL + '/delDataConnectorGroup', // 删除数据源分组/子分组
+    GROUP_DATASOURCE_DELETE: BASE_URL + '/Connector/delDataConnectorGroup', // 删除数据源分组/子分组
 
     /***************************************图表分组***************************************/
 

src/models/chartDesigner.js

@@ -412,12 +412,13 @@ export default {
                     }
                     yield put({ type: 'silentSetField', name: 'chartOption', value: config });
                 }else {
-                    message.error(res.err || res.data.msg);
+                    message.error('请求柱状图数据失败: ' + res.err || res.data.msg);
                     yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
                 }
             }catch(e) {
                 console.error(e);
                 yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
+                message.error('请求柱状图数据失败');
             }
         },
         *fetchPieData(action, { select, call, put }) {
@@ -456,12 +457,13 @@ export default {
                     }
                     yield put({ type: 'silentSetField', name: 'chartOption', value: config });
                 }else {
-                    message.error(res.err || res.data.msg);
+                    message.error('请求饼图数据失败: ' + res.err || res.data.msg);
                     yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
                 }
             }catch(e) {
                 console.error(e);
                 yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
+                message.error('请求饼图数据失败');
             }
         },
         *fetchLineData(action, { select, call, put }) {
@@ -501,12 +503,13 @@ export default {
                     }
                     yield put({ type: 'silentSetField', name: 'chartOption', value: config });
                 }else {
-                    message.error(res.err || res.data.msg);
+                    message.error('请求折线图数据失败: ' + res.err || res.data.msg);
                     yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
                 }
             }catch(e) {
                 console.error(e);
                 yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
+                message.error('请求折线图数据失败');
             }
         },
         *fetchScatterData(action, { select, call, put }) {
@@ -546,12 +549,13 @@ export default {
                     }
                     yield put({ type: 'silentSetField', name: 'chartOption', value: config });
                 }else {
-                    message.error(res.err || res.data.msg);
+                    message.error('请求散点图数据失败: ' + res.err || res.data.msg);
                     yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
                 }
             }catch(e) {
                 console.error(e);
                 yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
+                message.error('请求散点图数据失败');
             }
         },
         *fetchDataViewData(action, { select, call, put }) {
@@ -597,12 +601,13 @@ export default {
                     }
                     yield put({ type: 'silentSetField', name: 'chartOption', value: config });
                 }else {
-                    message.error(res.err || res.data.msg);
+                    message.error('请求列表数据失败: ' + res.err || res.data.msg);
                     yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
                 }
             }catch(e) {
                 console.error(e);
                 yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
+                message.error('请求列表数据失败');
             }
         },
         *fetchAggregateTableData(action, { select, call, put }) {
@@ -676,12 +681,13 @@ export default {
                     }
                     yield put({ type: 'silentSetField', name: 'chartOption', value: config });
                 }else {
-                    message.error(res.err || res.data.msg);
+                    message.error('请求统计数据失败: ' + res.err || res.data.msg);
                     yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
                 }
             }catch(e) {
                 console.error(e);
                 yield put({ type: 'silentSetField', name: 'chartOption', value: {} });
+                message.error('请求统计数据失败');
             }
         }
     },

src/models/chartPolicy.js

@@ -120,7 +120,7 @@ export default {
                     })) : [];
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('请求图表策略列表失败');
+                    message.error('请求图表策略列表失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -153,7 +153,7 @@ export default {
                     });
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('添加失败');
+                    message.error('添加失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -181,7 +181,7 @@ export default {
                 if(!res.err && res.data.code > 0) {
                     yield put({ type: 'modify', policy });
                 }else {
-                    message.error('修改失败');
+                    message.error('修改失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -208,7 +208,7 @@ export default {
                     }
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('删除失败');
+                    message.error('删除失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -237,7 +237,7 @@ export default {
                         targets
                     } });
                 }else {
-                    message.error('设置对象失败');
+                    message.error('设置对象失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -263,7 +263,7 @@ export default {
                     }));
                     yield put({ type: 'setColumnData', columnData });
                 }else {
-                    message.error('获得图表列数据失败:'+res.err||res.data.msg);
+                    message.error('获得图表列数据失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);

src/models/dashboard.js

@@ -51,6 +51,8 @@ export default {
                     })
                     console.log('请求看板列表', list);
                     yield put({ type: 'list', list: list });
+                }else {
+                    message.error('请求看板列表失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(e);
@@ -237,7 +239,7 @@ export default {
                     message.success('移交成功');
                 }else {
                     console.log(body, res.err || res.data.msg);
-                    message.error('移交失败');
+                    message.error('移交失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);

src/models/dashboardPolicy.js

@@ -117,7 +117,7 @@ export default {
                     })) : [];
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('请求图表策略列表失败');
+                    message.error('请求图表策略列表失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -151,7 +151,7 @@ export default {
                     });
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('添加失败');
+                    message.error('添加失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -180,7 +180,7 @@ export default {
                 if(!res.err && res.data.code > 0) {
                     yield put({ type: 'modify', policy });
                 }else {
-                    message.error('修改失败');
+                    message.error('修改失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -208,7 +208,7 @@ export default {
                     }
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('删除失败');
+                    message.error('删除失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -238,7 +238,7 @@ export default {
                         targets
                     } });
                 }else {
-                    message.error('设置对象失败');
+                    message.error('设置对象失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);

src/models/dataConnect.js

@@ -230,7 +230,7 @@ export default {
                         yield put({ type: 'setNewModelField', name: 'visibleBox', value: false });
                         message.success('新增成功');
                     }else {
-                        message.error('新增失败');
+                        message.error('新增失败: ' + res.err || res.data.msg);
                     }
                 }else {
                     yield put({ type: 'setNewModelInvalid', name: 'invalid', value: true });
@@ -306,7 +306,7 @@ export default {
                         message.success('修改成功');
                         yield put({ type: 'setNewModelField', name: 'visibleBox', value: false });
                     }else {
-                        message.error('修改失败');
+                        message.error('修改失败: ' + res.err || res.data.msg);
                     }
                 }else {
                     yield put({ type: 'setNewModelInvalid', name: 'invalid', value: true });

src/models/dataSourcePolicy.js

@@ -110,7 +110,7 @@ export default {
                     })) : [];
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('请求数据源策略列表失败');
+                    message.error('请求数据源策略列表失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -144,7 +144,7 @@ export default {
                     });
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('添加失败');
+                    message.error('添加失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -173,7 +173,7 @@ export default {
                 if(!res.err && res.data.code > 0) {
                     yield put({ type: 'modify', policy });
                 }else {
-                    message.error('修改失败');
+                    message.error('修改失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -200,7 +200,7 @@ export default {
                     }
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('删除失败');
+                    message.error('删除失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -229,7 +229,7 @@ export default {
                         targets
                     } });
                 }else {
-                    message.error('设置对象失败');
+                    message.error('设置对象失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);

src/models/user.js

@@ -38,7 +38,7 @@ export default {
                     }));
                     yield put({ type: 'list', list });
                 }else {
-                    message.error('请求用户列表失败');
+                    message.error('请求用户列表失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(e);
@@ -57,7 +57,7 @@ export default {
                     message.success('修改成功');
                 }else {
                     console.log(body, res.err || res.data.msg);
-                    message.error('修改失败');
+                    message.error('修改失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);

src/models/userGroup.js

@@ -108,7 +108,7 @@ export default {
                     yield put({ type: 'list', list: list.sort((a, b) => a.createTime - b.createTime) });
                 }else {
                     console.log(res.err || res.data.msg);
-                    message.error('请求用户组列表失败:' + res.err || res.data.msg);
+                    message.error('请求用户组列表失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(e);
@@ -138,7 +138,7 @@ export default {
                     yield put({ type: 'resetNewModel' });
                     message.success('新增成功');
                 }else {
-                    message.error('新增失败');
+                    message.error('新增失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(e);
@@ -164,7 +164,7 @@ export default {
                     // yield put({ type: 'resetNewModel' });
                     message.success('修改成功');
                 }else {
-                    message.error('修改失败');
+                    message.error('修改失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -184,7 +184,7 @@ export default {
                     message.success('删除成功');
                 }else {
                     console.log([group.code], res.err || res.data.msg);
-                    message.error('删除失败');
+                    message.error('删除失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log([group.code], e);
@@ -220,7 +220,7 @@ export default {
                     }));
                     yield put({ type: 'setMemberList', groupCode, memberList });
                 }else {
-                    message.error('请求用户组成员列表失败');
+                    message.error('请求用户组成员列表失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(groupCode, e);
@@ -243,7 +243,7 @@ export default {
                     yield put({ type: 'remoteMemberList', groupCode: group.code, mandatory: true });
                     yield put({ type: 'setNewModelField', name: 'visibleAddMemberBox', value: false });
                 }else {
-                    message.error('添加失败');
+                    message.error('添加失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);
@@ -265,7 +265,7 @@ export default {
                 if(!res.err && res.data.code > 0) {
                     yield put({ type: 'remoteMemberList', groupCode, mandatory: true });
                 }else {
-                    message.error('删除失败');
+                    message.error('删除失败: ' + res.err || res.data.msg);
                 }
             }catch(e) {
                 console.log(body, e);

src/routes/mainLayout.js

@@ -4,7 +4,6 @@ import { Route, Switch } from 'dva/router'
 import { Redirect } from 'dva/router'
 import Navigator from '../components/common/navigator'
 import HomePage from '../components/homePage/homePage'
-import Login from '../components/common/login/login'
 import Loading from '../components/common/loading/loading'
 import DataSourceDetail from '../components/datasource/dataSourceDetail'
 import DataSource from '../components/datasource/dataSource'