Merge branch '2.0' of https://github.com/iview/iview into feature-card

This commit is contained in:
huixisheng 2017-03-02 17:45:47 +08:00
commit 49dd45f46f
28 changed files with 190 additions and 69 deletions

View file

@ -40,7 +40,7 @@ import Timeline from './components/timeline';
// import TimePicker from './components/time-picker';
// import Tooltip from './components/tooltip';
// import Transfer from './components/transfer';
// import Tree from './components/tree';
import Tree from './components/tree';
import Upload from './components/upload';
import { Row, Col } from './components/grid';
// import { Select, Option, OptionGroup } from './components/select';
@ -108,7 +108,7 @@ const iview = {
// TimePicker,
// Tooltip,
// Transfer,
// Tree,
Tree,
Upload
};