diff --git a/src/components/common/custom-module/model-icon/index.vue b/src/components/common/custom-module/model-icon/index.vue index edc29b24..706ac28c 100644 --- a/src/components/common/custom-module/model-icon/index.vue +++ b/src/components/common/custom-module/model-icon/index.vue @@ -22,15 +22,19 @@ const props = defineProps({ isPercentage: { type: Boolean, default: false + }, + scale: { + type: Number, + default: 1 } }); // 用于页面判断显示 const form = reactive(props.value); const com_style = computed(() => { - let style = `${ set_count() } ${ gradient_handle(form.color_list, form.direction) } ${ radius_computer(form.bg_radius) };transform: rotate(${form.icon_rotate}deg);${ padding_computer(form.icon_padding) };`; + let style = `${ set_count() } ${ gradient_handle(form.color_list, form.direction) } ${ radius_computer(form.bg_radius, props.scale) };transform: rotate(${form.icon_rotate}deg);${ padding_computer(form.icon_padding, props.scale) };`; if (form.border_show == '1') { - style += `border: ${form.border_size}px ${form.border_style} ${form.border_color};box-sizing: border-box;`; + style += `border: ${form.border_size * props.scale}px ${form.border_style} ${form.border_color};box-sizing: border-box;`; } if (form.icon_location == 'center') { style += `justify-content: center;`; diff --git a/src/components/common/custom-module/model-image/index.vue b/src/components/common/custom-module/model-image/index.vue index f5047e5f..b004b9fe 100644 --- a/src/components/common/custom-module/model-image/index.vue +++ b/src/components/common/custom-module/model-image/index.vue @@ -23,6 +23,10 @@ const props = defineProps({ isPercentage: { type: Boolean, default: false + }, + scale: { + type: Number, + default: 1 } }); // 用于页面判断显示 @@ -40,13 +44,13 @@ const img = computed(() => { }); const image_style = computed(() => { - return `${ set_count() };transform: rotate(${form.img_rotate}deg); ${ radius_computer(form.img_radius) };`; + return `${ set_count() };transform: rotate(${form.img_rotate}deg); ${ radius_computer(form.img_radius, props.scale) };`; }); const border_style = computed(() => { let style = ``; if (form.border_show == '1') { - style += `border: ${form.border_size}px ${form.border_style} ${form.border_color}; ${ radius_computer(form.border_radius) };` + style += `border: ${form.border_size * props.scale}px ${form.border_style} ${form.border_color}; ${ radius_computer(form.border_radius, props.scale) };` } return style; }); diff --git a/src/components/common/custom-module/model-lines/index.vue b/src/components/common/custom-module/model-lines/index.vue index 85f1c316..07c99df1 100644 --- a/src/components/common/custom-module/model-lines/index.vue +++ b/src/components/common/custom-module/model-lines/index.vue @@ -13,6 +13,10 @@ const props = defineProps({ isPercentage: { type: Boolean, default: false + }, + scale: { + type: Number, + default: 1 } }); // 用于页面判断显示 @@ -20,9 +24,9 @@ const form = reactive(props.value); const border_style = computed(() => { if (form.line_settings === 'horizontal') { - return `${ set_count() } margin: 5px 0;border-bottom: ${form.line_size }px ${form.line_style} ${form.line_color};`; + return `${ set_count() } margin: 5px 0;border-bottom: ${form.line_size * props.scale }px ${form.line_style} ${form.line_color};`; } else { - return `${ set_count() } margin: 0 5px;border-right: ${form.line_size }px ${form.line_style} ${form.line_color};`; + return `${ set_count() } margin: 0 5px;border-right: ${form.line_size * props.scale }px ${form.line_style} ${form.line_color};`; } }); const set_count = () => { diff --git a/src/components/common/custom-module/model-panel/index.vue b/src/components/common/custom-module/model-panel/index.vue index db2f8087..4b339bb5 100644 --- a/src/components/common/custom-module/model-panel/index.vue +++ b/src/components/common/custom-module/model-panel/index.vue @@ -22,15 +22,19 @@ const props = defineProps({ isPercentage: { type: Boolean, default: false + }, + scale: { + type: Number, + default: 1 } }); // 用于页面判断显示 const form = reactive(props.value); const com_style = computed(() => { - let style = `${ set_count() } ${ gradient_handle(form.color_list, form.direction) } ${ radius_computer(form.bg_radius) }; transform: rotate(${form.panel_rotate}deg);`; + let style = `${ set_count() } ${ gradient_handle(form.color_list, form.direction) } ${ radius_computer(form.bg_radius, props.scale) }; transform: rotate(${form.panel_rotate}deg);`; if (form.border_show == '1') { - style += `border: ${form.border_size}px ${form.border_style} ${form.border_color};`; + style += `border: ${form.border_size * props.scale }px ${form.border_style} ${form.border_color};`; } return style; }); diff --git a/src/components/common/custom-module/model-text/index.vue b/src/components/common/custom-module/model-text/index.vue index 2d2f03b5..a17c8792 100644 --- a/src/components/common/custom-module/model-text/index.vue +++ b/src/components/common/custom-module/model-text/index.vue @@ -30,6 +30,10 @@ const props = defineProps({ isPercentage: { type: Boolean, default: false + }, + scale: { + type: Number, + default: 1 } }); // 用于页面判断显示 @@ -47,7 +51,8 @@ const text_title = computed(() => { }); const text_style = computed(() => { - let style = `font-size: ${ form.text_size }px;line-height: ${ form.text_size }px;color: ${ form.text_color }; text-align: ${ form.text_location }; transform: rotate(${form.text_rotate}deg);text-decoration: ${ form.text_option };${ padding_computer(form.text_padding) };`; + console.log(form.text_size * props.scale); + let style = `font-size: ${ form.text_size * props.scale }px;line-height: ${ form.text_size * props.scale}px;color: ${ form.text_color }; text-align: ${ form.text_location }; transform: rotate(${form.text_rotate}deg);text-decoration: ${ form.text_option };${ padding_computer(form.text_padding, props.scale) };`; if (form.text_weight == 'italic') { style += `font-style: italic`; } else if (form.text_weight == '500') { @@ -57,7 +62,7 @@ const text_style = computed(() => { }); const com_style = computed(() => { - let style = `${ set_count() } ${ gradient_handle(form.color_list, form.direction) } ${ radius_computer(form.bg_radius) }`; + let style = `${ set_count() } ${ gradient_handle(form.color_list, form.direction) } ${ radius_computer(form.bg_radius, props.scale) }`; if (form.border_show == '1') { style += `border: ${form.border_size}px ${form.border_style} ${form.border_color};`; } diff --git a/src/components/model-custom/index.vue b/src/components/model-custom/index.vue index d9e4463f..edf1b2bf 100644 --- a/src/components/model-custom/index.vue +++ b/src/components/model-custom/index.vue @@ -4,19 +4,19 @@