Browse Source

饼图钻取逻辑变更/指标看板autoLayout延时/登录样式手动引入

zhuth 6 years ago
parent
commit
70c1472bbc

+ 2 - 7
src/components/chartDesigner/charts/echartsView.jsx

@@ -11,7 +11,7 @@ moment.suppressDeprecationWarnings = true;
 class EchartsView extends Component {
     render() { 
         const { chartOption, inDashBoard, item } = this.props;
-        if(!chartOption || ((!chartOption.series || chartOption.series.length === 0) && (!chartOption.baseOption || !chartOption.baseOption.series || chartOption.baseOption.series.length === 0))) {
+        if(!chartOption || ((!chartOption.series || chartOption.series.length === 0 || !chartOption.series[0].data || chartOption.series[0].data.length === 0) && (!chartOption.baseOption || !chartOption.baseOption.series || chartOption.baseOption.series.length === 0 || !chartOption.baseOption.series[0].data || chartOption.baseOption.series[0].data.length === 0))) {
             return <EmptyContent />
         }else {
             const { baseOption } = chartOption;
@@ -289,11 +289,6 @@ class EchartsView extends Component {
                 let month = value.split('/')[1];
                 let year = value.split('/')[0];
 
-                /* 对月数进行格式化 */
-                if(month < 10){
-                    month = '0' + month
-                } 
-
                 return {
                     value1: moment(`${year}-${month}-01`).format('YYYY-MM'),
                     value2: '',
@@ -314,7 +309,7 @@ class EchartsView extends Component {
             }
             case 'day':{
                 return {
-                    value1: moment(`${value}`).format('YYYY-MM-DD'),
+                    value1: moment(value).format('YYYY-MM-DD'),
                     value2: '',
                     operator: '=',
                     operatorLabel: '等于'

+ 1 - 1
src/components/chartDesigner/charts/indicatorView.jsx

@@ -24,7 +24,7 @@ class IndicatorView extends React.Component {
         window.clearTimeout(this.resizeKey);
         this.resizeKey = window.setTimeout(() => {
             this.autoLayout()
-        }, 100);
+        }, 300);
     }
 
     autoLayout = () => {

+ 1 - 0
src/components/common/login/login.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import Login from 'ant-design-pro/lib/Login'
+import 'ant-design-pro/lib/Login/style/index';
 import { Alert, Checkbox, Icon } from 'antd'
 import { Redirect } from 'dva/router'
 import { connect } from 'dva'

+ 0 - 3
src/components/common/login/login.less

@@ -40,9 +40,6 @@
         }
         .login-content {
             padding: 0 36px 24px;
-            .antd-pro-login-login .ant-form-item {
-                margin: 0 2px 23px;
-            }
             .ant-form-item-control {
                 line-height: 32px;
             }