Resolve merge conflicts in ButtonList.vue and pageData.ts

This commit is contained in:
“hyeonggkim”
2025-10-17 11:15:48 +09:00
81 changed files with 1090 additions and 802 deletions

View File

@@ -1,8 +1,9 @@
<script setup lang="ts">
import { getComponentGroup, getComponentGroupAry } from '#layers/utils/dataUtil'
import type { PageDataTemplateComponents } from '#layers/types/api/pageData'
interface Props {
components: Record<string, any>
components: PageDataTemplateComponents
pageVerTmplSeq: string
}
@@ -36,12 +37,12 @@ const buttonListData = computed(() =>
<WidgetsMainTitle
v-if="mainTitleData"
:resources-data="mainTitleData"
class="w-[355px] md:w-[944px]"
class="w-full max-w-[355px] md:max-w-[944px]"
/>
<WidgetsDescription
v-if="descriptionData"
:resources-data="descriptionData"
class="w-[355px] md:w-[944px]"
class="w-full max-w-[355px] md:max-w-[944px]"
/>
<client-only>
<WidgetsVideoPlay