Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.修复vuex不能使用的bug;2.swiper组件注册问题；3.radio和checkbox支持HTML标签 #148

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

1.修复vuex不能使用的bug;2.swiper组件注册问题；3.radio和checkbox支持HTML标签 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default {
}

// vuex store
if (!store) appOptions.store = store
if (store) appOptions.store = store

const app = new Vue(appOptions).$mount('von-app')

Expand Down
2 changes: 1 addition & 1 deletion src/components/checkbox/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<hairline-top v-if="i > 0"></hairline-top>

<input type="checkbox" :name="checkboxName" :id="checkboxName + '-' + i" v-model="v" :value="i">
<span v-text="option"></span>
<span v-html="option"></span>
<i
:class="{
'icon ion-ios-checkmark-empty assertive': v.indexOf(i) > -1 && theme == 'assertive',
Expand Down
2 changes: 1 addition & 1 deletion src/components/radio/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}"
>
</i>
<span v-text="option"></span>
<span v-html="option"></span>

<hairline-bottom v-if="i < options.length - 1"></hairline-bottom>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ export default function install (Vue, options) {
Vue.component('button-bar', ButtonBar)
Vue.component('scalable', Scalable)

// Advanced ComponentsVue.component('swiper', Swiper)
// Advanced Components
Vue.component('swiper', Swiper)
Vue.component('swiper-item', SwiperItem)
Vue.component('scroll', Scroll)
Vue.component('cascade', Cascade)
Expand Down