Resolve merge conflicts in ButtonList.vue and pageData.ts

layers/templates/GrVisual03/index.vue

@@ -5,9 +5,10 @@ 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
 }