用户注销后重置model/账号信息页面返回

src/components/dataConnect/list.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Layout, Row, Col, Button, Icon, Card, Tooltip, Select, Menu, Dropdown } from 'antd'
+import { Layout, Row, Col, Button, Icon, Card, Select, Menu, Dropdown } from 'antd'
 import { connect } from 'dva'
 import DeleteBox from '../common/deleteBox/deleteBox'
 import EmptyContent from '../common/emptyContent/index'

src/components/user/userInfo.jsx

@@ -1,13 +1,13 @@
 /**
  * 用户信息管理
  */
-import { Layout, Form, Avatar, Input, Select } from 'antd'
+import { Layout, Form, Avatar, Input, Select, Button, Icon } from 'antd'
 import { connect } from 'dva'
 import './userinfo.less'
-const { Content } = Layout
+const { Header, Content } = Layout
 const { Item: FormItem } = Form
 
-const UserInfo = ({ main }) => {
+const UserInfo = ({ main, dispatch }) => {
     const { name, department, job, role } = main.currentUser;
     const formItemLayout = {
         labelCol: {
@@ -21,6 +21,11 @@ const UserInfo = ({ main }) => {
     };
     return (
         <Layout className='layout-userinfo'>
+            <Header>
+                <Button onClick={() => {
+                    dispatch({ type: 'main/goBack', path: '/home' });
+                }}><Icon type='left' />返回</Button>
+            </Header>
             <Content className='content-userinfo'>
                 <Form>
                     <FormItem

src/components/user/userinfo.less

@@ -1,5 +1,8 @@
 .layout-userinfo {
     background: @content-background-color;
+    &>.ant-layout-header {
+        background: #fff;
+    }
     .content-userinfo {
         background: #fff;
         box-shadow: 0 0 10px 0 rgba(41,54,72,0.10);

src/models/chartPolicy.js

@@ -16,8 +16,8 @@ function getBodyFilter(modelFilter) {
     if(type === 'scale' && operator === 'between') {
         bodyFilter['value'] = value1 + ',' + value2;
     }else if(type === 'time') {
-        let v1 = moment(value1).format('YYYY-MM-DD');
-        let v2 = moment(value2).format('YYYY-MM-DD');
+        let v1 = value1.dynamic ? value1.name : moment(value1).format('YYYY-MM-DD');
+        let v2 = value2.dynamic ? value2.name : moment(value2).format('YYYY-MM-DD');
 
         if(operator === 'between') {
             bodyFilter['value'] = v1 + ',' + v2;
@@ -45,8 +45,8 @@ function getModelFilter(resFilter) {
     }else if(columnType === 'time') {
         let value1 = value.split(',')[0];
         let value2 = value.split(',')[1];
-        let v1 = moment(value1);
-        let v2 = moment(value2);
+        let v1 = moment(value1).isValid() ? moment(value1).format('YYYY-MM-DD') : value1;
+        let v2 = moment(value2).isValid() ? moment(value2).format('YYYY-MM-DD') : value2;
 
         if(symbol === 'between') {
             modelFilter['value1'] = v1;

src/models/dataSourcePolicy.js

@@ -16,8 +16,8 @@ function getBodyFilter(modelFilter) {
     if(type === 'scale' && operator === 'between') {
         bodyFilter['value'] = value1 + ',' + value2;
     }else if(type === 'time') {
-        let v1 = moment(value1).format('YYYY-MM-DD HH:mm:ss');
-        let v2 = moment(value2).format('YYYY-MM-DD HH:mm:ss');
+        let v1 = value1.dynamic ? value1.name : moment(value1).format('YYYY-MM-DD');
+        let v2 = value2.dynamic ? value2.name : moment(value2).format('YYYY-MM-DD');
 
         if(operator === 'between') {
             bodyFilter['value'] = v1 + ',' + v2;
@@ -45,9 +45,9 @@ function getModelFilter(resFilter) {
     }else if(columnType === 'time') {
         let value1 = value.split(',')[0];
         let value2 = value.split(',')[1];
-        let v1 = moment(value1);
-        let v2 = moment(value2);
-
+        let v1 = moment(value1).isValid() ? moment(value1).format('YYYY-MM-DD') : value1;
+        let v2 = moment(value2).isValid() ? moment(value2).format('YYYY-MM-DD') : value2;
+        
         if(symbol === 'between') {
             modelFilter['value1'] = v1;
             modelFilter['value2'] = v2;

src/models/main.js

@@ -169,6 +169,17 @@ export default {
                     { name: 'authenticated', value: false },
                 ]});
                 // yield put({ type: 'recent/listRecentDashboard', recentDashboard: [] });
+                yield put({ type: 'dataConnect/reset' });
+                yield put({ type: 'dataSource/reset' });
+                yield put({ type: 'dataSourceDetail/reset' });
+                yield put({ type: 'chart/reset' });
+                yield put({ type: 'chartDesigner/reset' });
+                yield put({ type: 'authority/reset' });
+                yield put({ type: 'dashboard/reset' });
+                yield put({ type: 'dashboardDesigner/reset' });
+                yield put({ type: 'home/reset' });
+                yield put({ type: 'logs/reset' });
+                yield put({ type: 'recent/reset' });
             }catch(e) {
                 console.log(e);
                 message.error('注销失败: ' + e.message);

src/theme.js

@@ -21,5 +21,5 @@ module.exports = {
 
     // Tabs
     'tab-background': '#F5FBFE',
-    'tab-background-active': 'item-active-bg-color',
+    'tab-background-active': '@item-active-bg-color',
 };