Commit 456daf3492b924f4346f003a1fddd34b98b6628b
1 parent
15368be1
support Tag
support Tag
Showing
6 changed files
with
50 additions
and
50 deletions
Show diff stats
README.md
src/components/tag/tag.vue
| 1 | <template> | 1 | <template> |
| 2 | - <div :class="classes" transition="fade"> | ||
| 3 | - <span :class="dotClasses" v-if="showDot"></span><span :class="textClasses"><slot></slot></span><Icon v-if="closable" type="ios-close-empty" @click.stop="close"></Icon> | ||
| 4 | - </div> | 2 | + <transition name="fade"> |
| 3 | + <div :class="classes"> | ||
| 4 | + <span :class="dotClasses" v-if="showDot"></span><span :class="textClasses"><slot></slot></span><Icon v-if="closable" type="ios-close-empty" @click.native.stop="close"></Icon> | ||
| 5 | + </div> | ||
| 6 | + </transition> | ||
| 5 | </template> | 7 | </template> |
| 6 | <script> | 8 | <script> |
| 7 | import Icon from '../icon'; | 9 | import Icon from '../icon'; |
src/index.js
| @@ -35,7 +35,7 @@ import Steps from './components/steps'; | @@ -35,7 +35,7 @@ import Steps from './components/steps'; | ||
| 35 | import Switch from './components/switch'; | 35 | import Switch from './components/switch'; |
| 36 | // import Table from './components/table'; | 36 | // import Table from './components/table'; |
| 37 | // import Tabs from './components/tabs'; | 37 | // import Tabs from './components/tabs'; |
| 38 | -// import Tag from './components/tag'; | 38 | +import Tag from './components/tag'; |
| 39 | import Timeline from './components/timeline'; | 39 | import Timeline from './components/timeline'; |
| 40 | // import TimePicker from './components/time-picker'; | 40 | // import TimePicker from './components/time-picker'; |
| 41 | // import Tooltip from './components/tooltip'; | 41 | // import Tooltip from './components/tooltip'; |
| @@ -102,7 +102,7 @@ const iview = { | @@ -102,7 +102,7 @@ const iview = { | ||
| 102 | // iTable: Table, | 102 | // iTable: Table, |
| 103 | // Tabs: Tabs, | 103 | // Tabs: Tabs, |
| 104 | // TabPane: Tabs.Pane, | 104 | // TabPane: Tabs.Pane, |
| 105 | - // Tag, | 105 | + Tag, |
| 106 | Timeline, | 106 | Timeline, |
| 107 | TimelineItem: Timeline.Item, | 107 | TimelineItem: Timeline.Item, |
| 108 | // TimePicker, | 108 | // TimePicker, |
test/app.vue
| @@ -24,6 +24,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; } | @@ -24,6 +24,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; } | ||
| 24 | <li><router-link to="/switch">Switch</router-link></li> | 24 | <li><router-link to="/switch">Switch</router-link></li> |
| 25 | <li><router-link to="/alert">Alert</router-link></li> | 25 | <li><router-link to="/alert">Alert</router-link></li> |
| 26 | <li><router-link to="/badge">Badge</router-link></li> | 26 | <li><router-link to="/badge">Badge</router-link></li> |
| 27 | + <li><router-link to="/tag">Tag</router-link></li> | ||
| 27 | </ul> | 28 | </ul> |
| 28 | </nav> | 29 | </nav> |
| 29 | <router-view></router-view> | 30 | <router-view></router-view> |
test/main.js
| @@ -60,6 +60,10 @@ const router = new VueRouter({ | @@ -60,6 +60,10 @@ const router = new VueRouter({ | ||
| 60 | { | 60 | { |
| 61 | path: '/badge', | 61 | path: '/badge', |
| 62 | component: require('./routers/badge.vue') | 62 | component: require('./routers/badge.vue') |
| 63 | + }, | ||
| 64 | + { | ||
| 65 | + path: '/tag', | ||
| 66 | + component: require('./routers/tag.vue') | ||
| 63 | } | 67 | } |
| 64 | ] | 68 | ] |
| 65 | }); | 69 | }); |
test/routers/tag.vue
| 1 | <template> | 1 | <template> |
| 2 | - <Tag>标签一</Tag> | ||
| 3 | - <Tag>标签二</Tag> | ||
| 4 | - <Tag closable>标签三</Tag> | ||
| 5 | - <Tag closable color="blue">标签一</Tag> | ||
| 6 | - <Tag closable color="green">标签二</Tag> | ||
| 7 | - <Tag closable color="red">标签三</Tag> | ||
| 8 | - <Tag closable color="yellow">标签四</Tag> | ||
| 9 | - <br><br> | ||
| 10 | - <Tag type="dot">标签一</Tag> | ||
| 11 | - <Tag type="dot" closable>标签一</Tag> | ||
| 12 | - <Tag type="dot" color="blue">标签一</Tag> | ||
| 13 | - <Tag type="dot" color="blue" closable>标签一</Tag> | ||
| 14 | - <Tag type="dot" color="green">标签一</Tag> | ||
| 15 | - <Tag type="dot" color="green" closable>标签一</Tag> | ||
| 16 | - <Tag type="dot" color="red">标签一</Tag> | ||
| 17 | - <Tag type="dot" color="red" closable>标签一</Tag> | ||
| 18 | - <Tag type="dot" color="yellow">标签一</Tag> | ||
| 19 | - <Tag type="dot" color="yellow" closable>标签一</Tag> | ||
| 20 | - <br><br> | ||
| 21 | - <Tag type="border">标签一</Tag> | ||
| 22 | - <Tag type="border" closable>标签一</Tag> | ||
| 23 | - <Tag type="border" color="blue">标签一</Tag> | ||
| 24 | - <Tag type="border" color="blue" closable>标签一</Tag> | ||
| 25 | - <Tag type="border" color="green">标签一</Tag> | ||
| 26 | - <Tag type="border" color="green" closable>标签一</Tag> | ||
| 27 | - <Tag type="border" color="red">标签一</Tag> | ||
| 28 | - <Tag type="border" color="red" closable>标签一</Tag> | ||
| 29 | - <Tag type="border" color="yellow">标签一</Tag> | ||
| 30 | - <Tag type="border" color="yellow" closable>标签一</Tag> | ||
| 31 | - <i-button type="primary" @click="modal1 = true">显示对话框</i-button> | ||
| 32 | - <Modal | ||
| 33 | - :visible.sync="modal1" | ||
| 34 | - title="普通的Modal对话框标题" | ||
| 35 | - :loading="loading" @on-ok="ok"> | ||
| 36 | - <p>对话框内容</p> | ||
| 37 | - <p>对话框内容</p> | ||
| 38 | - <p>对话框内容</p> | ||
| 39 | - {{ loading }} | ||
| 40 | - <i-button @click="loading = true">true</i-button> | ||
| 41 | - <i-button @click="loading = false">false</i-button> | ||
| 42 | - </Modal> | ||
| 43 | - <br><br> | ||
| 44 | - <Tag type="border" color="yellow" closable @click="clickTag" @on-close="clickTagClose">标签一</Tag> | 2 | + <div> |
| 3 | + <Tag>标签一</Tag> | ||
| 4 | + <Tag>标签二</Tag> | ||
| 5 | + <Tag closable>标签三</Tag> | ||
| 6 | + <Tag closable color="blue">标签一</Tag> | ||
| 7 | + <Tag closable color="green">标签二</Tag> | ||
| 8 | + <Tag closable color="red">标签三</Tag> | ||
| 9 | + <Tag closable color="yellow">标签四</Tag> | ||
| 10 | + <br><br> | ||
| 11 | + <Tag type="dot">标签一</Tag> | ||
| 12 | + <Tag type="dot" closable>标签一</Tag> | ||
| 13 | + <Tag type="dot" color="blue">标签一</Tag> | ||
| 14 | + <Tag type="dot" color="blue" closable>标签一</Tag> | ||
| 15 | + <Tag type="dot" color="green">标签一</Tag> | ||
| 16 | + <Tag type="dot" color="green" closable>标签一</Tag> | ||
| 17 | + <Tag type="dot" color="red">标签一</Tag> | ||
| 18 | + <Tag type="dot" color="red" closable>标签一</Tag> | ||
| 19 | + <Tag type="dot" color="yellow">标签一</Tag> | ||
| 20 | + <Tag type="dot" color="yellow" closable>标签一</Tag> | ||
| 21 | + <br><br> | ||
| 22 | + <Tag type="border">标签一</Tag> | ||
| 23 | + <Tag type="border" closable>标签一</Tag> | ||
| 24 | + <Tag type="border" color="blue">标签一</Tag> | ||
| 25 | + <Tag type="border" color="blue" closable>标签一</Tag> | ||
| 26 | + <Tag type="border" color="green">标签一</Tag> | ||
| 27 | + <Tag type="border" color="green" closable>标签一</Tag> | ||
| 28 | + <Tag type="border" color="red">标签一</Tag> | ||
| 29 | + <Tag type="border" color="red" closable>标签一</Tag> | ||
| 30 | + <Tag type="border" color="yellow">标签一</Tag> | ||
| 31 | + <Tag type="border" color="yellow" closable>标签一</Tag> | ||
| 32 | + <Button type="primary" @click="modal1 = true">显示对话框</Button> | ||
| 33 | + <br><br> | ||
| 34 | + <Tag v-if="ccc" closable @on-close="clickTagClose">标签一</Tag> | ||
| 35 | + </div> | ||
| 45 | </template> | 36 | </template> |
| 46 | <script> | 37 | <script> |
| 47 | import { Tag, Modal, iButton } from 'iview'; | 38 | import { Tag, Modal, iButton } from 'iview'; |
| @@ -50,7 +41,8 @@ | @@ -50,7 +41,8 @@ | ||
| 50 | data () { | 41 | data () { |
| 51 | return { | 42 | return { |
| 52 | modal1: false, | 43 | modal1: false, |
| 53 | - loading: true | 44 | + loading: true, |
| 45 | + ccc: true | ||
| 54 | } | 46 | } |
| 55 | }, | 47 | }, |
| 56 | methods: { | 48 | methods: { |
| @@ -63,6 +55,7 @@ | @@ -63,6 +55,7 @@ | ||
| 63 | console.log('click tag'); | 55 | console.log('click tag'); |
| 64 | }, | 56 | }, |
| 65 | clickTagClose() { | 57 | clickTagClose() { |
| 58 | + this.ccc = false; | ||
| 66 | console.log('click tag close-icon'); | 59 | console.log('click tag close-icon'); |
| 67 | } | 60 | } |
| 68 | } | 61 | } |