From f17e28472c91ff28e6b363d95e6e5d438b50855a Mon Sep 17 00:00:00 2001 From: MoreStrive Date: Mon, 17 Jun 2024 13:20:31 +0700 Subject: [PATCH] minhnt-dev: navigation --- .../page-component/AssignComponent.vue | 5 +- .../page-component/templates/index.ts | 1 - .../page-component/templates/index.vue | 2 +- .../components/RecusiveNavItem.vue | 70 +++----- .../components/RecusiveTopChild.vue | 160 ------------------ .../templates/navigations/layouts/Top.vue | 89 ++-------- utils/recusive.ts | 2 +- 7 files changed, 38 insertions(+), 291 deletions(-) delete mode 100644 components/dynamic-page/page-component/templates/navigations/components/RecusiveTopChild.vue diff --git a/components/dynamic-page/page-component/AssignComponent.vue b/components/dynamic-page/page-component/AssignComponent.vue index 8fef91a..2085687 100644 --- a/components/dynamic-page/page-component/AssignComponent.vue +++ b/components/dynamic-page/page-component/AssignComponent.vue @@ -27,6 +27,7 @@ const findDataPosition = computed(() => { result = currentPage.value.components && currentPage.value.components.find((component: any) => { return component.settings?.template === enumPageComponentTemplates.NAVIGATION && component.settings?.layout === defineTypeRecusive.TOP_NAVIGATION }); + console.log(result) break; case defineTypeRecusive.BOTTOM_NAVIGATION: result = currentPage.value.components && currentPage.value.components.find((component: any) => { @@ -37,13 +38,9 @@ const findDataPosition = computed(() => { result = {}; break; } - console.log(result) return result; }); -// const selectComponent = (data: any) => { -// store.page.selectComponent(data) -// } console.log(findDataPosition, 'findDataPosition') diff --git a/components/dynamic-page/page-component/templates/index.ts b/components/dynamic-page/page-component/templates/index.ts index 522f80b..3ff61f2 100644 --- a/components/dynamic-page/page-component/templates/index.ts +++ b/components/dynamic-page/page-component/templates/index.ts @@ -3,7 +3,6 @@ export { default as BasicCategories } from './categories/BasicCategories.vue' export { default as CollectionPaging } from './pageCategories/collection_page.vue' - export { default as Dynamic_Other } from './other/index.vue' export { default as Dynamic_Section } from './sections/index.vue'; export { default as Dynamic_Advertising } from './advertising/index.vue' diff --git a/components/dynamic-page/page-component/templates/index.vue b/components/dynamic-page/page-component/templates/index.vue index af352d3..55738da 100644 --- a/components/dynamic-page/page-component/templates/index.vue +++ b/components/dynamic-page/page-component/templates/index.vue @@ -13,7 +13,7 @@ const definedDynamicComponent: Record = { [enumPageComponentTemplates.SECTION]: Dynamic_Section, [enumPageComponentTemplates.OTHER]: Dynamic_Other, [enumPageComponentTemplates.ADVERTISING]: Dynamic_Advertising, - [enumPageComponentTemplates.NONE]: Dynamic_Navigation, + [enumPageComponentTemplates.NAVIGATION]: Dynamic_Navigation, }; // console.log(_props.settings.template, 'template') const getCurrentComponent = computed(() => `${_props.settings.template}`); diff --git a/components/dynamic-page/page-component/templates/navigations/components/RecusiveNavItem.vue b/components/dynamic-page/page-component/templates/navigations/components/RecusiveNavItem.vue index e854f9f..fe07177 100644 --- a/components/dynamic-page/page-component/templates/navigations/components/RecusiveNavItem.vue +++ b/components/dynamic-page/page-component/templates/navigations/components/RecusiveNavItem.vue @@ -1,44 +1,27 @@ diff --git a/components/dynamic-page/page-component/templates/navigations/layouts/Top.vue b/components/dynamic-page/page-component/templates/navigations/layouts/Top.vue index c72a954..5ec5ec7 100644 --- a/components/dynamic-page/page-component/templates/navigations/layouts/Top.vue +++ b/components/dynamic-page/page-component/templates/navigations/layouts/Top.vue @@ -1,86 +1,19 @@ - diff --git a/utils/recusive.ts b/utils/recusive.ts index 97d7dfc..9c92091 100644 --- a/utils/recusive.ts +++ b/utils/recusive.ts @@ -14,7 +14,7 @@ export function buildTree(data: any) { } }); - return _array.filter(item => !item.parentId); + return _array.filter((item : any) => !item.parentId); } else { return [] }