Merge branch 'develop' into vue3

2020-08-09 10:32:21 +09:00 · 2020-08-09 10:32:21 +09:00 · 2b89707012
commit 2b89707012
parent 6d141c0cc1 917d3d0bd3
32 changed files with 664 additions and 458 deletions
--- a/src/client/components/ui/pagination.vue
+++ b/src/client/components/ui/pagination.vue
@ -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