From a5f9ff7bacdf95635bd8659ca9af12dd60e1fa91 Mon Sep 17 00:00:00 2001
From: MoreStrive <minhnguyenyh2020@gmail.com>
Date: Fri, 5 Jul 2024 11:02:04 +0700
Subject: [PATCH] fix: null component

---
 .../templates/advertisings/advertisings/index.vue        | 1 +
 .../page-component/templates/advertisings/index.vue      | 6 +++++-
 .../page-component/templates/articles/cards/index.vue    | 6 +++++-
 .../page-component/templates/articles/details/index.vue  | 6 +++++-
 .../page-component/templates/articles/index.vue          | 6 +++++-
 .../templates/categories/categories/index.vue            | 6 +++++-
 .../page-component/templates/categories/index.vue        | 1 +
 .../templates/collections/articles/index.vue             | 6 +++++-
 .../templates/collections/categories/index.vue           | 1 +
 .../page-component/templates/collections/index.vue       | 6 +++++-
 .../dynamic-page/page-component/templates/index.vue      | 6 +++++-
 .../templates/navigations/bottoms/index.vue              | 1 +
 .../templates/navigations/directions/index.vue           | 1 +
 .../page-component/templates/navigations/index.vue       | 3 ++-
 .../page-component/templates/navigations/tops/index.vue  | 1 +
 .../page-component/templates/others/index.vue            | 6 +++++-
 .../page-component/templates/others/stocks/index.vue     | 9 ++++++---
 .../page-component/templates/others/weathers/index.vue   | 1 +
 .../page-component/templates/sections/articles/index.vue | 1 +
 .../page-component/templates/sections/index.vue          | 1 +
 components/dynamic-page/page-section/layouts/index.vue   | 1 +
 .../page-section/templates/articles/index.vue            | 6 +++++-
 .../page-section/templates/category/index.vue            | 1 +
 .../page-section/templates/category/misses/index.vue     | 6 +++++-
 components/dynamic-page/page-section/templates/index.vue | 2 +-
 .../dynamic-page/page-section/templates/none/index.vue   | 6 +++++-
 .../page-section/templates/sections/index.vue            | 1 +
 .../page-section/templates/sections/misses/index.vue     | 6 +++++-
 components/dynamic-page/page/layouts/index.vue           | 6 +++++-
 components/dynamic-page/page/templates/index.vue         | 6 +++++-
 30 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/components/dynamic-page/page-component/templates/advertisings/advertisings/index.vue b/components/dynamic-page/page-component/templates/advertisings/advertisings/index.vue
index cd28de2..68efce8 100644
--- a/components/dynamic-page/page-component/templates/advertisings/advertisings/index.vue
+++ b/components/dynamic-page/page-component/templates/advertisings/advertisings/index.vue
@@ -31,6 +31,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
   />
diff --git a/components/dynamic-page/page-component/templates/advertisings/index.vue b/components/dynamic-page/page-component/templates/advertisings/index.vue
index f25e66c..07d8936 100644
--- a/components/dynamic-page/page-component/templates/advertisings/index.vue
+++ b/components/dynamic-page/page-component/templates/advertisings/index.vue
@@ -30,5 +30,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" />
+  <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" 
+  />
 </template>
diff --git a/components/dynamic-page/page-component/templates/articles/cards/index.vue b/components/dynamic-page/page-component/templates/articles/cards/index.vue
index bb1cb4a..8a08b50 100644
--- a/components/dynamic-page/page-component/templates/articles/cards/index.vue
+++ b/components/dynamic-page/page-component/templates/articles/cards/index.vue
@@ -37,5 +37,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" />
+  <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" 
+  />
 </template>
diff --git a/components/dynamic-page/page-component/templates/articles/details/index.vue b/components/dynamic-page/page-component/templates/articles/details/index.vue
index 761c76a..318cb95 100644
--- a/components/dynamic-page/page-component/templates/articles/details/index.vue
+++ b/components/dynamic-page/page-component/templates/articles/details/index.vue
@@ -33,5 +33,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" />
+  <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" 
+  />
 </template>
diff --git a/components/dynamic-page/page-component/templates/articles/index.vue b/components/dynamic-page/page-component/templates/articles/index.vue
index 6ced580..f7ebdb9 100644
--- a/components/dynamic-page/page-component/templates/articles/index.vue
+++ b/components/dynamic-page/page-component/templates/articles/index.vue
@@ -32,5 +32,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" />
+  <component
+    v-if="definedDynamicComponent[getCurrentComponent]" 
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" 
+  />
 </template>
diff --git a/components/dynamic-page/page-component/templates/categories/categories/index.vue b/components/dynamic-page/page-component/templates/categories/categories/index.vue
index 2c2c1b1..d027c3b 100644
--- a/components/dynamic-page/page-component/templates/categories/categories/index.vue
+++ b/components/dynamic-page/page-component/templates/categories/categories/index.vue
@@ -31,5 +31,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" />
+  <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
+  />
 </template>
diff --git a/components/dynamic-page/page-component/templates/categories/index.vue b/components/dynamic-page/page-component/templates/categories/index.vue
index 78c98cd..fad29d7 100644
--- a/components/dynamic-page/page-component/templates/categories/index.vue
+++ b/components/dynamic-page/page-component/templates/categories/index.vue
@@ -31,6 +31,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" 
   />
diff --git a/components/dynamic-page/page-component/templates/collections/articles/index.vue b/components/dynamic-page/page-component/templates/collections/articles/index.vue
index 30f4acf..0311484 100644
--- a/components/dynamic-page/page-component/templates/collections/articles/index.vue
+++ b/components/dynamic-page/page-component/templates/collections/articles/index.vue
@@ -30,5 +30,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" />
+  <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
+  />
 </template>
diff --git a/components/dynamic-page/page-component/templates/collections/categories/index.vue b/components/dynamic-page/page-component/templates/collections/categories/index.vue
index 67ba740..62367bb 100644
--- a/components/dynamic-page/page-component/templates/collections/categories/index.vue
+++ b/components/dynamic-page/page-component/templates/collections/categories/index.vue
@@ -30,6 +30,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
   />
diff --git a/components/dynamic-page/page-component/templates/collections/index.vue b/components/dynamic-page/page-component/templates/collections/index.vue
index 3c461fb..54392b7 100644
--- a/components/dynamic-page/page-component/templates/collections/index.vue
+++ b/components/dynamic-page/page-component/templates/collections/index.vue
@@ -31,5 +31,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" />
+  <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
+  />
 </template>
diff --git a/components/dynamic-page/page-component/templates/index.vue b/components/dynamic-page/page-component/templates/index.vue
index 9be5748..700467e 100644
--- a/components/dynamic-page/page-component/templates/index.vue
+++ b/components/dynamic-page/page-component/templates/index.vue
@@ -36,5 +36,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" />
+  <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
+  />
 </template>
diff --git a/components/dynamic-page/page-component/templates/navigations/bottoms/index.vue b/components/dynamic-page/page-component/templates/navigations/bottoms/index.vue
index 20e223a..1177f76 100644
--- a/components/dynamic-page/page-component/templates/navigations/bottoms/index.vue
+++ b/components/dynamic-page/page-component/templates/navigations/bottoms/index.vue
@@ -32,6 +32,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
   />
diff --git a/components/dynamic-page/page-component/templates/navigations/directions/index.vue b/components/dynamic-page/page-component/templates/navigations/directions/index.vue
index 0aeef30..3144388 100644
--- a/components/dynamic-page/page-component/templates/navigations/directions/index.vue
+++ b/components/dynamic-page/page-component/templates/navigations/directions/index.vue
@@ -32,6 +32,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
   />
diff --git a/components/dynamic-page/page-component/templates/navigations/index.vue b/components/dynamic-page/page-component/templates/navigations/index.vue
index 6fda69e..fede96d 100644
--- a/components/dynamic-page/page-component/templates/navigations/index.vue
+++ b/components/dynamic-page/page-component/templates/navigations/index.vue
@@ -33,7 +33,8 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component 
+  <component
+    v-if="definedDynamicComponent[getCurrentComponent]" 
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
   />
diff --git a/components/dynamic-page/page-component/templates/navigations/tops/index.vue b/components/dynamic-page/page-component/templates/navigations/tops/index.vue
index 2d070a5..956b3c7 100644
--- a/components/dynamic-page/page-component/templates/navigations/tops/index.vue
+++ b/components/dynamic-page/page-component/templates/navigations/tops/index.vue
@@ -32,6 +32,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
   />
diff --git a/components/dynamic-page/page-component/templates/others/index.vue b/components/dynamic-page/page-component/templates/others/index.vue
index 8b8fe66..7ce0441 100644
--- a/components/dynamic-page/page-component/templates/others/index.vue
+++ b/components/dynamic-page/page-component/templates/others/index.vue
@@ -30,5 +30,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" />
+  <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" 
+  />
 </template>
diff --git a/components/dynamic-page/page-component/templates/others/stocks/index.vue b/components/dynamic-page/page-component/templates/others/stocks/index.vue
index 7cc4777..cd0ec17 100644
--- a/components/dynamic-page/page-component/templates/others/stocks/index.vue
+++ b/components/dynamic-page/page-component/templates/others/stocks/index.vue
@@ -29,6 +29,9 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicComponent[getCurrentComponent]" v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" />
-</template>
-../stocks/index
\ No newline at end of file
+  <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
+    :is="definedDynamicComponent[getCurrentComponent]" 
+    v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" 
+  />
+</template>
\ No newline at end of file
diff --git a/components/dynamic-page/page-component/templates/others/weathers/index.vue b/components/dynamic-page/page-component/templates/others/weathers/index.vue
index 4e4c4f7..45ffcdc 100644
--- a/components/dynamic-page/page-component/templates/others/weathers/index.vue
+++ b/components/dynamic-page/page-component/templates/others/weathers/index.vue
@@ -32,6 +32,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings, content: _props.content }" 
   />
diff --git a/components/dynamic-page/page-component/templates/sections/articles/index.vue b/components/dynamic-page/page-component/templates/sections/articles/index.vue
index bd78aa1..bac0458 100644
--- a/components/dynamic-page/page-component/templates/sections/articles/index.vue
+++ b/components/dynamic-page/page-component/templates/sections/articles/index.vue
@@ -31,6 +31,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" 
   />
diff --git a/components/dynamic-page/page-component/templates/sections/index.vue b/components/dynamic-page/page-component/templates/sections/index.vue
index e51d391..a3c9a3c 100644
--- a/components/dynamic-page/page-component/templates/sections/index.vue
+++ b/components/dynamic-page/page-component/templates/sections/index.vue
@@ -31,6 +31,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicComponent[getCurrentComponent]"
     :is="definedDynamicComponent[getCurrentComponent]" 
     v-bind="{ ...GET_PROPS(), component: _props.component, settings: _props.settings }" 
   />
diff --git a/components/dynamic-page/page-section/layouts/index.vue b/components/dynamic-page/page-section/layouts/index.vue
index b62926b..72e0a1a 100644
--- a/components/dynamic-page/page-section/layouts/index.vue
+++ b/components/dynamic-page/page-section/layouts/index.vue
@@ -65,6 +65,7 @@ const GET_PROPS = computed(() => {
 <template>
 
   <component
+    v-if="definedDynamicSection[getCurrentSection]"
     :is="definedDynamicSection[getCurrentSection]"
     v-bind="{
       ...GET_PROPS(),
diff --git a/components/dynamic-page/page-section/templates/articles/index.vue b/components/dynamic-page/page-section/templates/articles/index.vue
index 24021ce..91dc7d0 100644
--- a/components/dynamic-page/page-section/templates/articles/index.vue
+++ b/components/dynamic-page/page-section/templates/articles/index.vue
@@ -33,7 +33,11 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicSection[getCurrentSection]" v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }">
+  <component 
+    v-if="definedDynamicSection[getCurrentSection]"
+    :is="definedDynamicSection[getCurrentSection]" 
+    v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }"
+  >
     <slot />
   </component>
 </template>
diff --git a/components/dynamic-page/page-section/templates/category/index.vue b/components/dynamic-page/page-section/templates/category/index.vue
index 1e46707..8909689 100644
--- a/components/dynamic-page/page-section/templates/category/index.vue
+++ b/components/dynamic-page/page-section/templates/category/index.vue
@@ -34,6 +34,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicSection[getCurrentSection]"
     :is="definedDynamicSection[getCurrentSection]" 
     v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }"
   >
diff --git a/components/dynamic-page/page-section/templates/category/misses/index.vue b/components/dynamic-page/page-section/templates/category/misses/index.vue
index f17abf9..8ae4082 100644
--- a/components/dynamic-page/page-section/templates/category/misses/index.vue
+++ b/components/dynamic-page/page-section/templates/category/misses/index.vue
@@ -33,7 +33,11 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicSection[getCurrentSection]" v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }">
+  <component 
+    v-if="definedDynamicSection[getCurrentSection]"
+    :is="definedDynamicSection[getCurrentSection]" 
+    v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }"
+  >
     <slot />
   </component>
 </template>
diff --git a/components/dynamic-page/page-section/templates/index.vue b/components/dynamic-page/page-section/templates/index.vue
index 475cb42..d604b37 100644
--- a/components/dynamic-page/page-section/templates/index.vue
+++ b/components/dynamic-page/page-section/templates/index.vue
@@ -36,7 +36,7 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicSection[getCurrentSection]" v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }">
+  <component v-if="definedDynamicSection[getCurrentSection]" :is="definedDynamicSection[getCurrentSection]" v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }">
     <slot />
   </component>
 </template>
diff --git a/components/dynamic-page/page-section/templates/none/index.vue b/components/dynamic-page/page-section/templates/none/index.vue
index 196b0fa..bf4ec75 100644
--- a/components/dynamic-page/page-section/templates/none/index.vue
+++ b/components/dynamic-page/page-section/templates/none/index.vue
@@ -32,7 +32,11 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicSection[getCurrentSection]" v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }">
+  <component 
+    v-if="definedDynamicSection[getCurrentSection]"
+    :is="definedDynamicSection[getCurrentSection]" 
+    v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }"
+  >
     <slot />
   </component>
 </template>
diff --git a/components/dynamic-page/page-section/templates/sections/index.vue b/components/dynamic-page/page-section/templates/sections/index.vue
index 970e6e3..26773b1 100644
--- a/components/dynamic-page/page-section/templates/sections/index.vue
+++ b/components/dynamic-page/page-section/templates/sections/index.vue
@@ -34,6 +34,7 @@ const GET_PROPS = computed(() => {
 
 <template>
   <component 
+    v-if="definedDynamicSection[getCurrentSection]"
     :is="definedDynamicSection[getCurrentSection]" 
     v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }"
   >
diff --git a/components/dynamic-page/page-section/templates/sections/misses/index.vue b/components/dynamic-page/page-section/templates/sections/misses/index.vue
index be84bd9..3ebb57e 100644
--- a/components/dynamic-page/page-section/templates/sections/misses/index.vue
+++ b/components/dynamic-page/page-section/templates/sections/misses/index.vue
@@ -33,7 +33,11 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-  <component :is="definedDynamicSection[getCurrentSection]" v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }">
+  <component
+    v-if="definedDynamicSection[getCurrentSection]" 
+    :is="definedDynamicSection[getCurrentSection]" 
+    v-bind="{ ...GET_PROPS(), section: _props.section, content: _props.content, settings: _props.settings }"
+  >
     <slot />
   </component>
 </template>
diff --git a/components/dynamic-page/page/layouts/index.vue b/components/dynamic-page/page/layouts/index.vue
index 604a137..60b64c5 100644
--- a/components/dynamic-page/page/layouts/index.vue
+++ b/components/dynamic-page/page/layouts/index.vue
@@ -44,7 +44,11 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-    <component :is="definedDynamicPageLayout[getCurrentLayout]" v-bind="GET_PROPS()">
+    <component 
+        v-if="definedDynamicPageLayout[getCurrentLayout]"
+        :is="definedDynamicPageLayout[getCurrentLayout]" 
+        v-bind="GET_PROPS()"
+    >
         <slot />
     </component>
 </template>
diff --git a/components/dynamic-page/page/templates/index.vue b/components/dynamic-page/page/templates/index.vue
index e8286ba..d72f9b8 100644
--- a/components/dynamic-page/page/templates/index.vue
+++ b/components/dynamic-page/page/templates/index.vue
@@ -32,7 +32,11 @@ const GET_PROPS = computed(() => {
 </script>
 
 <template>
-    <component :is="definedDynamicPage[getCurrentTemplate] || null" v-bind="{...(GET_PROPS()), settings: _props.settings}">
+    <component 
+        v-if="definedDynamicPage[getCurrentTemplate]" 
+        :is="definedDynamicPage[getCurrentTemplate]" 
+        v-bind="{...(GET_PROPS()), settings: _props.settings}"
+    >
         <slot />
     </component>
 </template>
\ No newline at end of file