From 5889e9af0ec219713dca321fd2c74e5a9e3d09b6 Mon Sep 17 00:00:00 2001 From: nguyen van thai Date: Fri, 5 Jul 2024 10:39:07 +0700 Subject: [PATCH] thainv-dev --- .../page-component/AssignComponent.vue | 2 +- .../templates/articles/details/Image.vue | 2 +- .../categories/categories/Default.vue | 2 +- .../categories/categories/Vertical.vue | 2 +- .../templates/collections/articles/Audio.vue | 2 +- .../collections/articles/Default.vue | 2 +- .../templates/collections/categories/index.ts | 1 + .../collections/categories/index.vue | 36 ++++ .../collections/categories/misses/Default.vue | 182 ++++++++++++++++++ .../templates/collections/index.ts | 1 + .../templates/collections/index.vue | 3 +- .../templates/navigations/bottoms/Default.vue | 2 +- .../navigations/directions/Default.vue | 2 +- .../templates/navigations/tops/Default.vue | 2 +- .../templates/sections/articles/Default.vue | 2 +- .../page-section/layouts/none/Default.vue | 59 +++++- 16 files changed, 289 insertions(+), 13 deletions(-) create mode 100644 components/dynamic-page/page-component/templates/collections/categories/index.ts create mode 100644 components/dynamic-page/page-component/templates/collections/categories/index.vue create mode 100644 components/dynamic-page/page-component/templates/collections/categories/misses/Default.vue diff --git a/components/dynamic-page/page-component/AssignComponent.vue b/components/dynamic-page/page-component/AssignComponent.vue index 53a83c0..d0f39bb 100644 --- a/components/dynamic-page/page-component/AssignComponent.vue +++ b/components/dynamic-page/page-component/AssignComponent.vue @@ -4,7 +4,7 @@ import DynamicComponent from "~/components/dynamic-page/page-component/templates import { useDynamicPageStore } from '~/stores/dynamic-page'; const { currentPage } = storeToRefs(useDynamicPageStore()); const props = defineProps<{ - type?: string; // [TOP_NAVIGATION, BOTTOM_NAVIGATION] + type?: any; // [TOP_NAVIGATION, BOTTOM_NAVIGATION] }>(); const defineTypeRecusive = { diff --git a/components/dynamic-page/page-component/templates/articles/details/Image.vue b/components/dynamic-page/page-component/templates/articles/details/Image.vue index 5561dca..2abeaa0 100644 --- a/components/dynamic-page/page-component/templates/articles/details/Image.vue +++ b/components/dynamic-page/page-component/templates/articles/details/Image.vue @@ -2,7 +2,7 @@ import { isEmpty } from "@/utils/lodash"; const _props = defineProps<{ - dataResult?: any[]; + dataResult?: any; }>(); const SETTING_OPTIONS = { BREADCRUMB_MAX_ELEMENT: 3, diff --git a/components/dynamic-page/page-component/templates/categories/categories/Default.vue b/components/dynamic-page/page-component/templates/categories/categories/Default.vue index e07f4b4..08d3afa 100644 --- a/components/dynamic-page/page-component/templates/categories/categories/Default.vue +++ b/components/dynamic-page/page-component/templates/categories/categories/Default.vue @@ -3,7 +3,7 @@ import { isEmpty } from "@/utils/lodash"; import { COLLECTION_QUERY_DROP, getValueStringWithKeyAndColon, getInputValue } from "@/utils/parseSQL"; const _props = defineProps<{ - dataResult?: any[]; + dataResult?: any; dataQuery?: string; label?: any; }>(); diff --git a/components/dynamic-page/page-component/templates/categories/categories/Vertical.vue b/components/dynamic-page/page-component/templates/categories/categories/Vertical.vue index b2c7674..db2696a 100644 --- a/components/dynamic-page/page-component/templates/categories/categories/Vertical.vue +++ b/components/dynamic-page/page-component/templates/categories/categories/Vertical.vue @@ -3,7 +3,7 @@ import { isEmpty } from "@/utils/lodash"; import { COLLECTION_QUERY_DROP, getValueStringWithKeyAndColon, getInputValue } from "@/utils/parseSQL"; const _props = defineProps<{ - dataResult?: any[]; + dataResult?: any; dataQuery?: string; label?: any; }>(); diff --git a/components/dynamic-page/page-component/templates/collections/articles/Audio.vue b/components/dynamic-page/page-component/templates/collections/articles/Audio.vue index d36079a..2c31159 100644 --- a/components/dynamic-page/page-component/templates/collections/articles/Audio.vue +++ b/components/dynamic-page/page-component/templates/collections/articles/Audio.vue @@ -5,7 +5,7 @@ import { isEmpty } from "@/utils/lodash"; import { enumPageComponentTemplates } from "@/definitions/enum"; const _props = defineProps<{ - dataResult?: any[]; + dataResult?: any; dataQuery?: string; layout?: string; label?: any; diff --git a/components/dynamic-page/page-component/templates/collections/articles/Default.vue b/components/dynamic-page/page-component/templates/collections/articles/Default.vue index c70b2a4..d6b79dc 100644 --- a/components/dynamic-page/page-component/templates/collections/articles/Default.vue +++ b/components/dynamic-page/page-component/templates/collections/articles/Default.vue @@ -5,7 +5,7 @@ import { isEmpty } from "@/utils/lodash"; import { enumPageComponentTemplates } from "@/definitions/enum"; const _props = defineProps<{ - dataResult?: any[]; + dataResult?: any; dataQuery?: string; layout?: string; label?: any; diff --git a/components/dynamic-page/page-component/templates/collections/categories/index.ts b/components/dynamic-page/page-component/templates/collections/categories/index.ts new file mode 100644 index 0000000..638fef7 --- /dev/null +++ b/components/dynamic-page/page-component/templates/collections/categories/index.ts @@ -0,0 +1 @@ +export { default as Misses_Default } from './misses/Default.vue' diff --git a/components/dynamic-page/page-component/templates/collections/categories/index.vue b/components/dynamic-page/page-component/templates/collections/categories/index.vue new file mode 100644 index 0000000..67ba740 --- /dev/null +++ b/components/dynamic-page/page-component/templates/collections/categories/index.vue @@ -0,0 +1,36 @@ + + + diff --git a/components/dynamic-page/page-component/templates/collections/categories/misses/Default.vue b/components/dynamic-page/page-component/templates/collections/categories/misses/Default.vue new file mode 100644 index 0000000..cbddb05 --- /dev/null +++ b/components/dynamic-page/page-component/templates/collections/categories/misses/Default.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/components/dynamic-page/page-component/templates/collections/index.ts b/components/dynamic-page/page-component/templates/collections/index.ts index cdab5ad..172664e 100644 --- a/components/dynamic-page/page-component/templates/collections/index.ts +++ b/components/dynamic-page/page-component/templates/collections/index.ts @@ -1 +1,2 @@ export { default as Article_Collection } from './articles/index.vue' +export { default as Category_Collection } from './categories/index.vue' diff --git a/components/dynamic-page/page-component/templates/collections/index.vue b/components/dynamic-page/page-component/templates/collections/index.vue index 116500c..3c461fb 100644 --- a/components/dynamic-page/page-component/templates/collections/index.vue +++ b/components/dynamic-page/page-component/templates/collections/index.vue @@ -1,6 +1,6 @@ diff --git a/components/dynamic-page/page-component/templates/navigations/directions/Default.vue b/components/dynamic-page/page-component/templates/navigations/directions/Default.vue index e52c635..a10b7d8 100644 --- a/components/dynamic-page/page-component/templates/navigations/directions/Default.vue +++ b/components/dynamic-page/page-component/templates/navigations/directions/Default.vue @@ -4,7 +4,7 @@ import DynamicComponent from "~/components/dynamic-page/page-component/templates import { getInputValue } from "@/utils/parseSQL"; const _props = defineProps<{ - dataResult?: any[]; + dataResult?: any; dataQuery?: string; component?: any; }>(); diff --git a/components/dynamic-page/page-component/templates/navigations/tops/Default.vue b/components/dynamic-page/page-component/templates/navigations/tops/Default.vue index 423395f..eb17047 100644 --- a/components/dynamic-page/page-component/templates/navigations/tops/Default.vue +++ b/components/dynamic-page/page-component/templates/navigations/tops/Default.vue @@ -3,7 +3,7 @@ import { buildTree } from "@/utils/recusive"; import RecusiveNavItem from "@/components/dynamic-page/page-component/templates/navigations/components/RecusiveNavItem.vue"; const _props = defineProps<{ - content?: any[]; + content?: any; component?: any; }>(); diff --git a/components/dynamic-page/page-component/templates/sections/articles/Default.vue b/components/dynamic-page/page-component/templates/sections/articles/Default.vue index 1a2ac60..277ac7a 100644 --- a/components/dynamic-page/page-component/templates/sections/articles/Default.vue +++ b/components/dynamic-page/page-component/templates/sections/articles/Default.vue @@ -10,7 +10,7 @@ const store = reactive({ }); const _props = defineProps<{ - dataResult?: any[]; + dataResult?: any; dataQuery?: string; component?: any; label?: any; diff --git a/components/dynamic-page/page-section/layouts/none/Default.vue b/components/dynamic-page/page-section/layouts/none/Default.vue index 8938287..bb0e483 100644 --- a/components/dynamic-page/page-section/layouts/none/Default.vue +++ b/components/dynamic-page/page-section/layouts/none/Default.vue @@ -150,7 +150,6 @@ const SETTING_OPTIONS = computed(() => { return _setting_options; }); - const CLASS_FOR_SECTION = computed(() => { let _classForSection = {}; switch (props.layout) { @@ -278,7 +277,7 @@ const mapActivesToItems = (index: number) => {
{ } .section_layout { display: grid; + position: relative; + + .section_child { + z-index: 1; + } + .attributeBackground { + position: absolute; + height: 100%; + z-index: 0; + display: none; + left: -50vw; + width: 150vw; + } + &.smartphone_layout { grid-template-columns: repeat(1, minmax(0, 1fr)) !important; } @@ -321,6 +334,24 @@ const mapActivesToItems = (index: number) => { &.six_col_layout { grid-template-columns: repeat(6, minmax(0, 1fr)); } + &.seven_col_layout { + grid-template-columns: repeat(7, minmax(0, 1fr)); + } + &.eight_col_layout { + grid-template-columns: repeat(8, minmax(0, 1fr)); + } + &.nine_col_layout { + grid-template-columns: repeat(9, minmax(0, 1fr)); + } + &.ten_col_layout { + grid-template-columns: repeat(10, minmax(0, 1fr)); + } + &.eleven_col_layout { + grid-template-columns: repeat(11, minmax(0, 1fr)); + } + &.twelve_col_layout { + grid-template-columns: repeat(12, minmax(0, 1fr)); + } .col-span-2 { grid-column: span 2 / span 2; } @@ -330,6 +361,30 @@ const mapActivesToItems = (index: number) => { .col-span-4 { grid-column: span 4 / span 4; } + .col-span-5 { + grid-column: span 5 / span 5; + } + .col-span-6 { + grid-column: span 6 / span 6; + } + .col-span-7 { + grid-column: span 7 / span 7; + } + .col-span-8 { + grid-column: span 8 / span 8; + } + .col-span-9 { + grid-column: span 9 / span 9; + } + .col-span-10 { + grid-column: span 10 / span 10; + } + .col-span-11 { + grid-column: span 11 / span 11; + } + .col-span-12 { + grid-column: span 12 / span 12; + } .border-custom { border-color: #e5e5e5 !important; }