Merge branch 'develop' into vue3

This commit is contained in:
syuilo
2020-08-09 10:32:21 +09:00
32 changed files with 664 additions and 458 deletions

View File

@@ -19,14 +19,14 @@ import MkButton from './button.vue';
import paging from '../../scripts/paging';
export default defineComponent({
mixins: [
paging({}),
],
components: {
MkButton
},
mixins: [
paging({}),
],
props: {
pagination: {
required: true

View File

@@ -42,6 +42,7 @@ export default defineComponent({
},
methods: {
toggle() {
if (this.disabled) return;
this.$emit('change', this.value);
}
}
@@ -61,7 +62,10 @@ export default defineComponent({
&.disabled {
opacity: 0.6;
cursor: not-allowed;
&, * {
cursor: not-allowed !important;
}
}
&.checked {