From ff6e6017772369cbfa010dc62cf37117255099fb Mon Sep 17 00:00:00 2001 From: zuiidea Date: Sat, 25 Feb 2017 22:08:01 +0800 Subject: [PATCH] code style --- src/components/common/TableBodyWrapper.js | 15 +++++++-------- src/components/users/list.js | 23 +++++++++++------------ src/index.js | 4 ++-- src/router.js | 5 +++-- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/components/common/TableBodyWrapper.js b/src/components/common/TableBodyWrapper.js index 658b400..2875b8a 100644 --- a/src/components/common/TableBodyWrapper.js +++ b/src/components/common/TableBodyWrapper.js @@ -16,7 +16,7 @@ const enterAnim = [ ease: 'easeOutQuad', onComplete: (e) => { e.target.style.height = 'auto' - }, + } }, { opacity: 1, x: 0, @@ -41,19 +41,18 @@ const leaveAnim = [ ] const TableBodyWrapper = ({ body, page = 1, current }) => { - // 切换分页去除动画; - if(current != +page) { + if (current !== +page) { return body } return ( + component='tbody' + className={body.props.className} + enter={enterAnim} + leave={leaveAnim} + appear={false}> {body.props.children} ) diff --git a/src/components/users/list.js b/src/components/users/list.js index 4b78130..fb4ada3 100644 --- a/src/components/users/list.js +++ b/src/components/users/list.js @@ -5,7 +5,7 @@ import TableBodyWrapper from '../common/TableBodyWrapper' const confirm = Modal.confirm -function list({ +function list ({ loading, dataSource, pagination, @@ -17,7 +17,6 @@ function list({ onStatusItem, location }) { - const handleMenuClick = (record, e) => { if (e.key === '1') { onEditItem(record) @@ -80,16 +79,16 @@ function list({ key: 'operation', width: 100, render: (text, record) => { - return ( handleMenuClick(record, e)}> - 编辑 - 删除 - }> - - ) - } + return ( handleMenuClick(record, e)}> + 编辑 + 删除 + }> + + ) + } } ] diff --git a/src/index.js b/src/index.js index 77d1ce1..d81b2cd 100644 --- a/src/index.js +++ b/src/index.js @@ -5,8 +5,8 @@ import { browserHistory } from 'dva/router' // 1. Initialize const app = dva({ history: browserHistory, - onError(error) { - console.error("app onError -- ", error) + onError (error) { + console.error('app onError -- ', error) } }) diff --git a/src/router.js b/src/router.js index aaa2fb8..1d9c2b7 100644 --- a/src/router.js +++ b/src/router.js @@ -2,8 +2,8 @@ import React from 'react' import {Router} from 'dva/router' import App from './routes/app' -const cached = {}; -function registerModel(app, model) { +const cached = {} +const registerModel = (app, model) => { if (!cached[model.namespace]) { app.model(model) cached[model.namespace] = 1 @@ -17,6 +17,7 @@ export default function ({history, app}) { component: App, getIndexRoute (nextState, cb) { require.ensure([], require => { + registerModel(app, require('./models/dashboard')) cb(null, {component: require('./routes/dashboard')}) }) },