sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

沉浸模式下的处理

v1.2.0
于肖磊 2025-02-11 14:40:46 +08:00
parent efd15ad94d
commit b402a21bdb
3 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/page-settings/page-styles.vue
View File

@ -38,8 +38,8 @@
</el-form-item>
<el-form-item v-if="form.header_background_type == 'transparent' && form.immersive_style === '1'" label="安全距离">
<div class="flex-row align-c gap-10">
<el-switch v-model="form.general_safe_distance_value" active-value="1" inactive-value="0" :disabled="is_tabs_0_up"></el-switch>
<el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>1.第一个组件包含选项卡置顶,并开启置顶,则强制开启安全距离。<br/>2.开启后第一个组件上内边距将增加顶部安全距离+导航高度</span>" raw-content placement="top">
<el-switch v-model="form.general_safe_distance_value" active-value="1" inactive-value="0"></el-switch>
<el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>开启后第一个组件上内边距将增加顶部安全距离+导航高度</span>" raw-content placement="top">
<icon name="miaosha-hdgz" size="12" color="#999"></icon>
</el-tooltip>
</div>
@ -196,8 +196,6 @@ const location_mult_color_picker_event = (arry: color_list[], type: number) => {
form.value.location_color_list = arry;
form.value.location_direction = type.toString();
};
const is_tabs_0_up = computed(() => common_store.is_tabs_0_up );
const change_immersive_style = (val: string | number | boolean) => {
if (val === '0') {
// 沉浸模式关闭的时候，安全距离关闭
@ -205,19 +203,11 @@ const change_immersive_style = (val: string | number | boolean) => {
// common_store.set_is_immersion_model(false);
return;
} else {
// 沉浸模式开启的时候，并且第一个是选项卡置顶，安全距离打开
if (is_tabs_0_up.value) {
// 沉浸模式开启的时候，安全距离打开
form.value.general_safe_distance_value = '1';
}
}
// common_store.set_is_immersion_model(true);
};
// 监听tabs是否置顶
watchEffect(() => {
if (is_tabs_0_up.value) {
form.value.general_safe_distance_value = '1';
}
});
</script>
<style lang="scss" scoped>
.styles {

24
src/views/layout/components/main/index.vue
View File

@ -323,30 +323,6 @@ const draggable_click = (item: componentsData) => {
}
}
};
// 定义常量
const TABS_TOP_UP_ENABLED = '1';
const DEFAULT_TABS_TOP_UP = '0';
// 判断是否是选项卡
watchEffect(() => {
if (tabs_data.value.length > 0) {
const tabs_top_up = tabs_data.value[0]?.com_data?.content?.tabs_top_up || DEFAULT_TABS_TOP_UP;
if (tabs_top_up == TABS_TOP_UP_ENABLED) {
common_store.set_is_tabs_0_up(true);
} else {
common_store.set_is_tabs_0_up(false);
}
} else if (diy_data.value.length > 0) {
const tabs_top_up = diy_data.value[0]?.com_data?.content?.tabs_top_up || DEFAULT_TABS_TOP_UP;
if (tabs_top_up == TABS_TOP_UP_ENABLED) {
common_store.set_is_tabs_0_up(true);
} else {
common_store.set_is_tabs_0_up(false);
}
} else {
common_store.set_is_tabs_0_up(false);
}
});
// 复制
const clone_item_com_data = (item: commonComponentData) => {
return {

10
src/views/layout/index.vue
View File

@ -125,7 +125,7 @@ const clear_data_event = () => {
form.value.tabs_data = [];
form.value.diy_data = [];
// 数据清空之后，将公共沉浸模式判断为false
common_store.set_is_immersion_model(false);
// common_store.set_is_immersion_model(false);
diy_data_item.value = new_tem_form.header;
};
//#region 页面初始化数据 ---------------------start
@ -146,10 +146,10 @@ const init = () => {
data.diy_data = data_merge(data.diy_data);
data.tabs_data = data_merge(data.tabs_data);
// 判断默认数据是否开启沉浸式
if (data.header.com_data.style.immersive_style === '1') {
common_store.set_is_immersion_model(true);
}
// // 判断默认数据是否开启沉浸式
// if (data.header.com_data.style.immersive_style === '1') {
// common_store.set_is_immersion_model(true);
// }
form.value = data;
} else {
is_empty.value = true;