Merge branch '2.0' into anchor

This commit is contained in:
Lison 2018-06-20 11:00:05 +08:00 committed by GitHub
commit 754eedf571
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
156 changed files with 61134 additions and 18815 deletions

View file

@ -44,6 +44,7 @@ import Switch from './components/switch';
import Table from './components/table';
import Tabs from './components/tabs';
import Tag from './components/tag';
import Time from './components/time';
import Timeline from './components/timeline';
import TimePicker from './components/time-picker';
import Tooltip from './components/tooltip';
@ -118,6 +119,7 @@ const components = {
Tabs: Tabs,
TabPane: Tabs.Pane,
Tag,
Time,
Timeline,
TimelineItem: Timeline.Item,
TimePicker,
@ -142,7 +144,8 @@ const iview = {
iProgress: Progress,
iSelect: Select,
iSwitch: Switch,
iTable: Table
iTable: Table,
iTime: Time
};
const install = function(Vue, opts = {}) {