Merge pull request #326 from huixisheng/feature-timeline

Support Timeline
This commit is contained in:
Aresn 2017-03-02 10:49:34 +08:00 committed by GitHub
commit 8135d166e1
5 changed files with 72 additions and 6 deletions

View file

@ -1,7 +1,7 @@
<template>
<li :class="itemClasses">
<div :class="tailClasses"></div>
<div :class="headClasses" :style="customColor" v-el:dot><slot name="dot"></slot></div>
<div :class="headClasses" :style="customColor" ref="dot"><slot name="dot"></slot></div>
<div :class="contentClasses">
<slot></slot>
</div>
@ -22,8 +22,8 @@
dot: false
};
},
ready () {
this.dot = this.$els.dot.innerHTML.length ? true : false;
mounted () {
this.dot = this.$refs.dot.innerHTML.length ? true : false;
},
computed: {
itemClasses () {

View file

@ -36,7 +36,7 @@ import Steps from './components/steps';
// import Table from './components/table';
// import Tabs from './components/tabs';
// import Tag from './components/tag';
// import Timeline from './components/timeline';
import Timeline from './components/timeline';
// import TimePicker from './components/time-picker';
// import Tooltip from './components/tooltip';
// import Transfer from './components/transfer';
@ -103,8 +103,8 @@ const iview = {
// Tabs: Tabs,
// TabPane: Tabs.Pane,
// Tag,
// Timeline,
// TimelineItem: Timeline.Item,
Timeline,
TimelineItem: Timeline.Item,
// TimePicker,
// Tooltip,
// Transfer,

View file

@ -20,6 +20,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
<li><router-link to="/radio">Radio</router-link></li>
<li><router-link to="/checkbox">Checkbox</router-link></li>
<li><router-link to="/steps">Steps</router-link></li>
<li><router-link to="/timeline">Timeline</router-link></li>
</ul>
</nav>
<router-view></router-view>

View file

@ -44,6 +44,10 @@ const router = new VueRouter({
{
path: '/steps',
component: require('./routers/steps.vue')
},
{
path: '/timeline',
component: require('./routers/timeline.vue')
}
]
});

61
test/routers/timeline.vue Normal file
View file

@ -0,0 +1,61 @@
<style scoped>
.time{
font-size: 14px;
font-weight: bold;
}
.content{
padding-left: 5px;
}
</style>
<template>
<div>
<Timeline>
<Timeline-item>
<p class="time">1976</p>
<p class="content">Apple I 问世</p>
</Timeline-item>
<Timeline-item>
<p class="time">1984</p>
<p class="content">发布 Macintosh</p>
</Timeline-item>
<Timeline-item>
<p class="time">2007</p>
<p class="content">发布 iPhone</p>
</Timeline-item>
<Timeline-item>
<p class="time">2010</p>
<p class="content">发布 iPad</p>
</Timeline-item>
<Timeline-item>
<p class="time">2011年10月5日</p>
<p class="content">史蒂夫·乔布斯去世</p>
</Timeline-item>
</Timeline>
<Timeline>
<Timeline-item color="green">发布1.0版本</Timeline-item>
<Timeline-item color="green">发布2.0版本</Timeline-item>
<Timeline-item color="red">严重故障</Timeline-item>
<Timeline-item color="blue">发布3.0版本</Timeline-item>
</Timeline>
<Timeline pending>
<Timeline-item>发布1.0版本</Timeline-item>
<Timeline-item>发布2.0版本</Timeline-item>
<Timeline-item>发布3.0版本</Timeline-item>
<Timeline-item><a href="#">查看更多</a></Timeline-item>
</Timeline>
<Timeline>
<Timeline-item color="green">
<Icon type="trophy" slot="dot"></Icon>
<span>发布里程碑版本</span>
</Timeline-item>
<Timeline-item>发布1.0版本</Timeline-item>
<Timeline-item>发布2.0版本</Timeline-item>
<Timeline-item>发布3.0版本</Timeline-item>
</Timeline>
</div>
</template>
<script>
export default {
}
</script>