Merge remote-tracking branch 'origin/dev-yxl' into dev-sws

v1.0.0
sws 2024-10-21 14:09:53 +08:00
commit 0cb39cfbaf
2 changed files with 8 additions and 6 deletions

View File

@ -87,10 +87,10 @@ const state = reactive({
});
// 使toRefs
const { form, new_style } = toRefs(state);
const outer_spacing = computed(() => new_style.value.image_spacing + 'px');
const outer_sx = computed(() => -(new_style.value.image_spacing / 2) + 'px');
const outer_spacing = computed(() => (new_style.value?.image_spacing || 0) + 'px');
const outer_sx = computed(() => -((new_style.value?.image_spacing || 0) / 2) + 'px');
//
const spacing = computed(() => new_style.value.image_spacing / 2 + 'px');
const spacing = computed(() => (new_style.value?.image_spacing || 0) / 2 + 'px');
//
const content_radius = computed(() => radius_computer(new_style.value.data_radius));
//

View File

@ -57,10 +57,12 @@ const state = reactive({
});
// 使toRefs
const { form, new_style } = toRefs(state);
const outer_spacing = computed(() => new_style.value.image_spacing + 'px');
const outer_sx = computed(() => -(new_style.value.image_spacing / 2) + 'px');
const new_style_spacing = computed(() => form.value.style_actived === 10 ? 0 : (new_style.value?.image_spacing || 0));
const outer_spacing = computed(() => new_style_spacing.value + 'px');
const outer_sx = computed(() => -(new_style_spacing.value / 2) + 'px');
//
const spacing = computed(() => new_style.value.image_spacing / 2 + 'px');
const spacing = computed(() => new_style_spacing.value / 2 + 'px');
//
const content_img_radius = computed(() => radius_computer(new_style.value));
//#region