diff --git a/src/components/common/common-styles/index.vue b/src/components/common/common-styles/index.vue index 7214d300..286791f7 100644 --- a/src/components/common/common-styles/index.vue +++ b/src/components/common/common-styles/index.vue @@ -21,6 +21,9 @@ + + + @@ -64,6 +67,7 @@ const props = defineProps({ color_list: [{ color: '', color_percentage: undefined }] as color_list[], background_img_style: '0', floating_up: 0, + is_bottom_up: '0', padding: 0, padding_top: 0, padding_bottom: 0, diff --git a/src/components/common/div-content/index.vue b/src/components/common/div-content/index.vue index 47d36888..0cc67398 100644 --- a/src/components/common/div-content/index.vue +++ b/src/components/common/div-content/index.vue @@ -151,6 +151,7 @@ interface com_data { style: { offset_number_percentage: string, common_style: { + is_bottom_up: string; floating_up: number; }; }; @@ -178,9 +179,11 @@ const model_style = computed(() => { bottom = container_height - 60 + height; } } - let z_index = ''; + // 默认组件z-index为1 + let z_index = 'z-index: 1'; + // 如果开通上浮显示的时候,会改变他的z-index值 if (item.com_data.style.common_style?.floating_up != 0) { - z_index = `z-index: 1`; + z_index = `z-index: ${ item.com_data.style.common_style?.is_bottom_up == '1' ? '0' : '1'}`; } item.com_data.style.offset_number_percentage = (bottom / window.innerHeight).toFixed(4); return item.key == 'float-window' ? `bottom: ${((bottom / window.innerHeight) * 100).toFixed(4) + '%'};` : `margin-top: -${item.com_data.style.common_style?.floating_up || 0}px;${z_index};`; diff --git a/src/config/const/index.ts b/src/config/const/index.ts index 903d0f1f..14c49433 100644 --- a/src/config/const/index.ts +++ b/src/config/const/index.ts @@ -3,6 +3,7 @@ const defaultCommon: componentsCommonCommonStyle = { color_list: [{ color: '', color_percentage: undefined }], background_img_style: '0', floating_up: 0, + is_bottom_up: '0', padding_top_safe_value: 0, // 安全距离值,在顶部时,需要加上安全距离,防止遮挡 padding: 0, padding_top: 0, diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 58517664..c4ab4072 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -88,6 +88,7 @@ declare global { direction: string; background_img_style: string; floating_up: number; + is_bottom_up: string; padding_top_safe_value: number; padding: number; padding_top: number;