Merge branch '2.0' into 2.0-backtop

This commit is contained in:
Aresn 2017-03-07 10:36:10 +08:00 committed by GitHub
commit 7d535fc915
8 changed files with 71 additions and 40 deletions

View file

@ -24,7 +24,7 @@ import Menu from './components/menu';
// import Message from './components/message';
// import Modal from './components/modal';
// import Notice from './components/notice';
// import Page from './components/page';
import Page from './components/page';
import Poptip from './components/poptip';
import Progress from './components/progress';
import Radio from './components/radio';
@ -85,7 +85,7 @@ const iview = {
// Notice,
iOption: Option,
OptionGroup,
// Page,
Page,
Panel: Collapse.Panel,
Poptip,
Progress,