From 02b29f3c30282ce3899d0c507ab1b1dc376743fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 3 Mar 2025 15:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=BB=84=E9=87=8C?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diy/modules/custom/data-group-rendering.vue    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/components/diy/modules/custom/data-group-rendering.vue b/components/diy/modules/custom/data-group-rendering.vue
index 371fdd63..7ed8cfab 100644
--- a/components/diy/modules/custom/data-group-rendering.vue
+++ b/components/diy/modules/custom/data-group-rendering.vue
@@ -1,6 +1,6 @@
 <template>
     <view :class="'wh-auto pr allSignList-' + propIndex + propKey" :style="'height:' + propDataHeight * propScale + 'px;'">
-       <view v-for="(item, index) in new_list" :key="index" :data-id="item.id" :data-location-x="item.location.x" :data-location-y="item.location.y" :class="'sign-' + propIndex + propKey + ' main-content ' + get_animation_class(item.com_data)" :style="'left:' + get_percentage_count(item.location.x, item.com_data.data_follow, 'left') + ';top:' + get_percentage_count(item.location.y, item.com_data.data_follow, 'top') + ';width:' + get_percentage_count(item.com_data.com_width, item.com_data.data_follow, 'width', item.com_data.is_width_auto, item.com_data.max_width) + ';height:' + get_percentage_count(item.com_data.com_height, item.com_data.data_follow, 'height', item.com_data.is_height_auto, item.com_data.max_height) + ';z-index:' + (new_list.length - 1 > 0 ? (new_list.length - 1) - index : 0)">
+       <view v-for="(item, index) in new_list" :key="index" :data-id="item.id" :data-location-x="item.location.x" :data-location-y="item.location.y" :class="'sign-' + propIndex + propKey + ' main-content ' + get_animation_class(item.com_data)" :style="'left:' + get_percentage_count(item.location.x, item.com_data.data_follow, 'left') + ';top:' + get_percentage_count(item.location.y, item.com_data.data_follow, 'top') + ';width:' + get_percentage_count(item.com_data.com_width, item.com_data.data_follow, 'width', item.com_data.is_width_auto, item.com_data.max_width, item.key) + ';height:' + get_percentage_count(item.com_data.com_height, item.com_data.data_follow, 'height', item.com_data.is_height_auto, item.com_data.max_height, item.key) + ';z-index:' + (new_list.length - 1 > 0 ? (new_list.length - 1) - index : 0)">
             <template v-if="item.key == 'text'">
                 <model-text :propKey="propKey" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId" :propTitleParams="propShowData.data_name" @url_event="url_event"></model-text>
             </template>
@@ -117,7 +117,7 @@ export default {
     },
     computed: {
         get_percentage_count() {
-            return (num, data_follow, type, is_auto = '0', max_size = 0) => {
+            return (num, data_follow, type, is_auto = '0', max_size = 0, key = '') => {
                 // 检查类型是否为'left'或'top'，如果是，则根据跟随数据计算样式
                 if (['left', 'top'].includes(type)) {
                     const { id = '', type: follow_type = 'left' } = data_follow || { id: '', type: 'left' };
@@ -142,8 +142,14 @@ export default {
                             }
                         }
                     } else {
-                        // 如果is_auto未设置或条件不满足，则根据比例缩放num并返回
-                        return `${num * this.propScale}px`;
+                        // 微信小程序图片等比缩放对小数点后的内容支持的不是特别的好，需要取向上取整数
+                        if (key == 'img' && ['width', 'height'].includes(type)) {
+                            // 如果is_auto未设置或条件不满足，则根据比例缩放num并返回
+                            return `${ Math.round(num * this.propScale) }px`;
+                        } else {
+                            // 如果is_auto未设置或条件不满足，则根据比例缩放num并返回
+                            return `${num * this.propScale}px`;
+                        }
                     }
                 }
             };