diff --git a/CHANGE.md b/CHANGE.md index 503c287..cf1065d 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -23,4 +23,6 @@ class 改为了 className ### Carousel 废弃 activeIndex,使用 v-model,v-for="n in slides.length",Vue2的数字循环,是从1开始的 ### Tree -废弃 data,改为 value,使用 v-model,key 更名为 name \ No newline at end of file +废弃 data,改为 value,使用 v-model,key 更名为 name,不能再 template 的prop 上使用 this +### Circle +改名为 iCircle \ No newline at end of file diff --git a/README.md b/README.md index 7cb8dd5..9962baf 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ - [ ] Breadcrumb - [x] Steps - [ ] LoadingBar -- [ ] Circle +- [x] Circle - [x] Affix - [ ] BackTop - [ ] Spin diff --git a/src/index.js b/src/index.js index d09f286..5a5f475 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,7 @@ import Card from './components/card'; import Carousel from './components/carousel'; // import Cascader from './components/cascader'; import Checkbox from './components/checkbox'; -// import Circle from './components/circle'; +import Circle from './components/circle'; import Collapse from './components/collapse'; // import DatePicker from './components/date-picker'; // import Dropdown from './components/dropdown'; @@ -62,7 +62,7 @@ const iview = { // Cascader, Checkbox, CheckboxGroup: Checkbox.Group, - // Circle, + iCircle: Circle, // DatePicker, // Dropdown, // DropdownItem: Dropdown.Item, diff --git a/test/app.vue b/test/app.vue index fb17227..22a1a62 100644 --- a/test/app.vue +++ b/test/app.vue @@ -33,6 +33,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
  • Card
  • Tree
  • Rate
  • +
  • Circle
  • diff --git a/test/main.js b/test/main.js index eaef5dc..f9a9ca2 100644 --- a/test/main.js +++ b/test/main.js @@ -96,6 +96,10 @@ const router = new VueRouter({ { path: '/rate', component: require('./routers/rate.vue') + }, + { + path: '/circle', + component: require('./routers/circle.vue') } ] }); diff --git a/test/routers/circle.vue b/test/routers/circle.vue new file mode 100644 index 0000000..7352e71 --- /dev/null +++ b/test/routers/circle.vue @@ -0,0 +1,57 @@ + + + -- libgit2 0.21.4