Resolve merge conflicts in ButtonList.vue and pageData.ts

layers/templates/GrGallery03/index.vue

@@ -1,10 +1,14 @@
 <script setup lang="ts">
 import { SplideSlide } from '@splidejs/vue-splide'
-import { getComponentGroup } from '#layers/utils/dataUtil'
+import {
+  getComponentGroup,
+  ensureMinimumSlideData,
+} from '#layers/utils/dataUtil'
 import type { Splide as SplideType } from '@splidejs/splide'
+import type { PageDataTemplateComponents } from '#layers/types/api/pageData'
 
 interface Props {
-  components: Record<string, any>
+  components: PageDataTemplateComponents
   pageVerTmplSeq: string
 }
 
@@ -17,11 +21,7 @@ const mainTitleData = computed(() =>
   getComponentGroup(props.components, 'mainTitle')
 )
 const slideData = computed(() => {
-  if (props.components.group_sets.length < 3) {
-    return [...props.components.group_sets, ...props.components.group_sets]
-  }
-
-  return props.components.group_sets
+  return ensureMinimumSlideData(props.components)
 })
 const subTitleData = ref(getComponentGroup(slideData?.value[0], 'subTitle'))
 const descriptionData = ref(