修改上浮显示逻辑

master
于肖磊 2025-06-03 13:41:49 +08:00
parent c176434f68
commit fba582ba2c
1 changed files with 33 additions and 30 deletions

View File

@ -464,35 +464,6 @@
}
});
}
//
const newMarginTopList = new_diy_data.filter((item) => {
const style = item.com_data?.style?.common_style;
return style && style.floating_up > 0;
});
const newMarginTopMap = new Set(newMarginTopList.map(item => item.id));
//
const scaleComponents = new Set(this.scale_component_list);
const subset_scale_component_list = new Set(this.subset_scale_component_list);
//
let scale = sys_width / 390;
// 2
// if (sys_width <= 800) {
// scale = scale > 2 ? 2 : scale;
// } else {
// scale = scale;
// }
//
new_diy_data.forEach((item, index) => {
//
const style = item.com_data?.style?.common_style;
if (style && newMarginTopMap.has(item.id) && scaleComponents.has(diy_data[index - 1].key) && !subset_scale_component_list.has(item.key)) {
item.floating_up = '-' + (style?.floating_up || 0) * scale + 'px;';
} else {
item.floating_up = '-' + (style?.floating_up || 0) * 2 + 'rpx;';
}
});
const { padding_right = 0, padding_left = 0 } = header_style.common_style;
const new_is_search_alone_row = header.com_data.content.data_alone_row_value.length > 0 ? true : false;
const new_data_alone_row_space = parseInt(header_style.data_alone_row_space || 0);
@ -500,7 +471,7 @@
this.setData({
header_data: header,
footer_data: this.propValue.footer,
diy_data: new_diy_data,
diy_data: this.set_diy_data_floating_up(new_diy_data),
tabs_data: new_tabs_data,
page_style: common_styles_computer(header_style.common_style),
page_img_style: background_computer(header_style.common_style),
@ -539,6 +510,38 @@
}
return item;
},
set_diy_data_floating_up(diy_data_list) {
//
const newMarginTopList = diy_data_list.filter((item) => {
const style = item.com_data?.style?.common_style;
return style && style.floating_up > 0;
});
const newMarginTopMap = new Set(newMarginTopList.map(item => item.id));
//
const scaleComponents = new Set(this.scale_component_list);
const subset_scale_component_list = new Set(this.subset_scale_component_list);
//
let scale = sys_width / 390;
// 2
// if (sys_width <= 800) {
// scale = scale > 2 ? 2 : scale;
// } else {
// scale = scale;
// }
//
diy_data_list.forEach((item, index) => {
//
const style = item.com_data?.style?.common_style;
if (style && newMarginTopMap.has(item.id) && scaleComponents.has(diy_data_list[index - 1].key) && !subset_scale_component_list.has(item.key)) {
item.floating_up = '-' + (style?.floating_up || 0) * scale + 'px;';
} else {
item.floating_up = '-' + (style?.floating_up || 0) * 2 + 'rpx;';
}
});
return diy_data_list;
},
//
tabs_click_event(tabs_id, bool, params = {}) {
let new_data = [];