1.head解决抖动问题

2.解决head颜色没有盖全的问题
v1.0.0
sws 2024-10-12 11:51:30 +08:00
parent 32b697d1e4
commit 399063d3b0
4 changed files with 37 additions and 24 deletions

View File

@ -3,7 +3,7 @@
<div v-if="item.show_tabs == '1'" class="plug-in-right" chosenClass="close"> <div v-if="item.show_tabs == '1'" class="plug-in-right" chosenClass="close">
<el-icon :class="`iconfont ${item.is_enable == '1' ? 'icon-eye' : 'icon-eye-close'}`" @click.stop="set_enable(index)" /> <el-icon :class="`iconfont ${item.is_enable == '1' ? 'icon-eye' : 'icon-eye-close'}`" @click.stop="set_enable(index)" />
<el-icon class="iconfont icon-del" @click.stop="del(index)" /> <el-icon class="iconfont icon-del" @click.stop="del(index)" />
<el-icon :class="['iconfont icon-copy', {'disabled': props.isTabs }] " @click.stop="copy(index)" /> <el-icon :class="['iconfont icon-copy', { disabled: props.isTabs }]" @click.stop="copy(index)" />
<el-icon :class="['iconfont', 'icon-arrow-top', icon_arrow_disable(item.key, index, 'moveUp')]" @click.stop="moveUp(index, arrow_disable_method(item.key, index, 'moveUp'))" /> <el-icon :class="['iconfont', 'icon-arrow-top', icon_arrow_disable(item.key, index, 'moveUp')]" @click.stop="moveUp(index, arrow_disable_method(item.key, index, 'moveUp'))" />
<el-icon :class="['iconfont', 'icon-arrow-bottom', icon_arrow_disable(item.key, index, 'moveDown')]" @click.stop="moveDown(index, arrow_disable_method(item.key, index, 'moveDown'))" /> <el-icon :class="['iconfont', 'icon-arrow-bottom', icon_arrow_disable(item.key, index, 'moveDown')]" @click.stop="moveDown(index, arrow_disable_method(item.key, index, 'moveDown'))" />
</div> </div>
@ -118,13 +118,17 @@ const props = withDefaults(defineProps<Props>(), {
diyData: () => [], diyData: () => [],
showModelBorder: false, showModelBorder: false,
isTabs: false, isTabs: false,
mainContentStyle: '' mainContentStyle: '',
}); });
const diy_data = ref(props.diyData); const diy_data = ref(props.diyData);
watch(() => props.diyData, (val) => { watch(
diy_data.value = val; () => props.diyData,
}, {immediate: true, deep: true}); (val) => {
diy_data.value = val;
},
{ immediate: true, deep: true }
);
// class // class
const model_class = computed(() => { const model_class = computed(() => {
@ -137,11 +141,11 @@ interface com_data {
style: { style: {
common_style: { common_style: {
floating_up: number; floating_up: number;
} };
} };
} }
const model_style = computed(() => { const model_style = computed(() => {
return (item: { id: string; key: string, com_data: com_data }) => { return (item: { id: string; key: string; com_data: com_data }) => {
// 40 60 // 40 60
const container_height = window.innerHeight - 100; const container_height = window.innerHeight - 100;
let bottom = 0; let bottom = 0;
@ -167,7 +171,7 @@ const model_style = computed(() => {
if (item.com_data.style.common_style?.floating_up != 0) { if (item.com_data.style.common_style?.floating_up != 0) {
z_index = `z-index: 1`; z_index = `z-index: 1`;
} }
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 };`; 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};`;
}; };
}); });
@ -278,11 +282,10 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri
.plug-in-border::before { .plug-in-border::before {
content: ''; content: '';
width: calc(100% + 0.4rem); width: calc(100% + 0.4rem);
height: calc(100% + 0.4rem); height: 100%;
position: absolute; position: absolute;
top: -0.2rem; top: 0;
left: -0.2rem; left: -0.2rem;
// z-index: 1;
border: 0.2rem solid $cr-main; border: 0.2rem solid $cr-main;
} }
.plug-in-animation { .plug-in-animation {

View File

@ -128,7 +128,7 @@ const position_class = computed(() => (form.value?.indicator_location == 'center
transform: translateX(-50%); transform: translateX(-50%);
width: 39rem; width: 39rem;
.roll { .roll {
padding-bottom: 0.9rem; padding-bottom: 1rem;
margin: 0 auto; margin: 0 auto;
cursor: pointer; cursor: pointer;
z-index: 1; z-index: 1;
@ -154,11 +154,18 @@ const position_class = computed(() => (form.value?.indicator_location == 'center
} }
} }
.page-settings-border { .page-settings-border {
// border: 0.2rem solid $cr-main;
position: relative; position: relative;
box-shadow: 0px 0 0px 0.2rem $cr-main !important;
z-index: 3; z-index: 3;
box-sizing: border-box; box-sizing: border-box;
&::before {
content: '';
height: 100%;
width: calc(100% + 0.4rem);
position: absolute;
left: -0.2rem;
right: -0.2rem;
border: 0.2rem solid $cr-main;
}
} }
.logo-outer-style { .logo-outer-style {
height: 2.8rem; height: 2.8rem;

View File

@ -89,7 +89,7 @@
.model-drag { .model-drag {
overflow-y: auto; overflow-y: auto;
padding-top: 0.2rem; // padding-top: 0.2rem;
max-height: 84.4rem; max-height: 84.4rem;
height: 100%; height: 100%;
&::-webkit-scrollbar { &::-webkit-scrollbar {
@ -194,7 +194,8 @@
transform: translateY(-50%); transform: translateY(-50%);
left: 0; left: 0;
z-index: 3; z-index: 3;
.layout-toggle-bar-top, .layout-toggle-bar-bottom { .layout-toggle-bar-top,
.layout-toggle-bar-bottom {
position: absolute; position: absolute;
width: 0.2rem; width: 0.2rem;
border-radius: 0.2rem; border-radius: 0.2rem;
@ -208,7 +209,8 @@
} }
} }
.layout-toggle-bar-close:hover { .layout-toggle-bar-close:hover {
.layout-toggle-bar-top, .layout-toggle-bar-bottom { .layout-toggle-bar-top,
.layout-toggle-bar-bottom {
background: $cr-main; background: $cr-main;
transition: 1s ease; transition: 1s ease;
} }
@ -221,7 +223,8 @@
} }
.layout-toggle-bar-open:hover { .layout-toggle-bar-open:hover {
.layout-toggle-bar-top, .layout-toggle-bar-bottom { .layout-toggle-bar-top,
.layout-toggle-bar-bottom {
background: $cr-main; background: $cr-main;
transition: 1s ease; transition: 1s ease;
} }

View File

@ -166,7 +166,7 @@ watchEffect(() => {
const { immersive_style, up_slide_display } = new_style; const { immersive_style, up_slide_display } = new_style;
// //
if (immersive_style == '1' || up_slide_display != '1') { if (immersive_style == '1' || up_slide_display != '1') {
top_padding.value = 2; top_padding.value = 0;
} else { } else {
top_padding.value = 90; top_padding.value = 90;
} }
@ -432,7 +432,7 @@ const scroll = () => {
const scoll_top = ref(0); const scoll_top = ref(0);
const on_scroll_event = (e: any) => { const on_scroll_event = (e: any) => {
scoll_top.value = e.target.scrollTop; scoll_top.value = e.target.scrollTop;
} };
//#endregion //#endregion
//#region //#region
// //