From 9bf7136e1ac1df9d9df4a452f48f2164afb15f46 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, 14 Jul 2025 11:04:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=90=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=9C=A8=E6=89=8B=E6=9C=BA=E7=AB=AF=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/common/common.js                    |  8 ++---
 .../modules/components-combination/index.vue  |  2 +-
 .../components/form-input/select-multi.vue    |  2 +-
 .../components/form-input/select.vue          |  2 +-
 .../components/form-input/subform.vue         | 33 ++++++++++---------
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/common/js/common/common.js b/common/js/common/common.js
index 45647e43..2cca9eb6 100644
--- a/common/js/common/common.js
+++ b/common/js/common/common.js
@@ -874,20 +874,20 @@ export const get_color_style = (config) => {
     let size = '24';
     switch (config.filed_title_size_type) {
         case 'big':
-            size = '32';
+            // size = '32';
             padding = '22rpx 24rpx';
             break;
         case 'middle':
-            size = '28';
+            // size = '28';
             padding = '10rpx 12rpx';
             break;
         default:
-            size = '24';
+            // size = '24';
             padding = '0 12rpx';
             break;
     }
     // 根据文件标题字体大小决定图标尺寸
-    return `padding:${padding};line-height:44rpx;font-size:${size}rpx;`;
+    return `padding:${padding};line-height:44rpx;`;
 };
 
 // 定义一组预定义的颜色数组，用于在各种场景中轻松引用这些颜色
diff --git a/pages/form-input/components/form-input/modules/components-combination/index.vue b/pages/form-input/components/form-input/modules/components-combination/index.vue
index ff5ae12d..9549780d 100644
--- a/pages/form-input/components/form-input/modules/components-combination/index.vue
+++ b/pages/form-input/components/form-input/modules/components-combination/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="flex-1 wh-auto flex-col gap-5 oh">
+    <view class="wh-auto flex-col gap-5 oh">
         <!-- 输入框 -->
         <view v-if="['single-text', 'radio-btns', 'select'].includes(data_item.key) && data_item.com_data.type == 'single-text'" :style="data_item.com_data.common_style">
             <component-input :propValue="data_item.com_data" :propKey="propKey" :propDataId="data_item.id" :propStyle="propComponentStyle" @dataCheck="data_check" @dataChange="data_change"></component-input>
diff --git a/pages/form-input/components/form-input/select-multi.vue b/pages/form-input/components/form-input/select-multi.vue
index f82d0ad6..622cc73d 100644
--- a/pages/form-input/components/form-input/select-multi.vue
+++ b/pages/form-input/components/form-input/select-multi.vue
@@ -5,7 +5,7 @@
                 <template v-if="isEmpty(form_value_data)"><view class="placeholder cr-gray text-line-1">{{ placeholder }}</view></template>
                 <template v-else>
                     <view :class="'flex-row align-c' + (is_multicolour == '1' ? ' gap-10' : '')">
-                        <view class="text-size-sm nowrap" v-for="(item, index) in form_value_data" :key="index" :style="is_multicolour == '1' ? 'background:' + item.color + ';color:' + (item.is_other == '1' ? '#141E31' : '#fff') + ';border-radius:8rpx;' + color_style : color_style + 'padding-left:0rpx;padding-right:0rpx;'">{{ item.name || item.value  }}{{ index != form_value_data.length - 1 && is_multicolour !== '1' ? ',' : ''}}</view>
+                        <view class="nowrap" v-for="(item, index) in form_value_data" :key="index" :style="is_multicolour == '1' ? 'background:' + item.color + ';color:' + (item.is_other == '1' ? '#141E31' : '#fff') + ';border-radius:8rpx;' + color_style : color_style + 'padding-left:0rpx;padding-right:0rpx;'">{{ item.name || item.value  }}{{ index != form_value_data.length - 1 && is_multicolour !== '1' ? ',' : ''}}</view>
                     </view>
                 </template>
             </view>
diff --git a/pages/form-input/components/form-input/select.vue b/pages/form-input/components/form-input/select.vue
index b0a74e3a..3393fb2e 100644
--- a/pages/form-input/components/form-input/select.vue
+++ b/pages/form-input/components/form-input/select.vue
@@ -5,7 +5,7 @@
                 <template v-if="isEmpty(form_value)"><view class="placeholder cr-gray text-line-1">{{ placeholder }}</view></template>
                 <template v-else>
                     <view class="flex-row align-c">
-                        <view class="text-size-sm" :style="is_multicolour == '1' ? 'background:' + form_value_data.color + ';color:' + (form_value_data.is_other == '1' ? '#141E31' : '#fff') + ';border-radius:8rpx;' + color_style : color_style + 'padding-left:0rpx;padding-right:0rpx;'">{{ form_value_data.name || form_value  }}</view>
+                        <view :style="is_multicolour == '1' ? 'background:' + form_value_data.color + ';color:' + (form_value_data.is_other == '1' ? '#141E31' : '#fff') + ';border-radius:8rpx;' + color_style : color_style + 'padding-left:0rpx;padding-right:0rpx;'">{{ form_value_data.name || form_value  }}</view>
                     </view>
                 </template>
             </view>
diff --git a/pages/form-input/components/form-input/subform.vue b/pages/form-input/components/form-input/subform.vue
index f17d7198..f973be44 100644
--- a/pages/form-input/components/form-input/subform.vue
+++ b/pages/form-input/components/form-input/subform.vue
@@ -99,21 +99,24 @@
                                     <view class="flex-row align-c">
                                         <view v-for="children_item in filteredDiyDataItem(item.data_list, 'table')" :key="children_item.id" :class="['cell pr flex-row align-c jc-c shrink', { 'item-row-error': children_item.com_data.common_config.is_error == '1' }]" :style="'width:' + children_item.com_data.com_width  + 'px;' + (!isEmpty(children_item.com_data) && !isEmpty(children_item.com_data.sticky_style) ? (children_item.com_data.sticky_style + (children_item.id == z_index_id && index == z_index ? 'z-index: 999;' : '')) : '')">
                                             <template v-if="show_row(index, children_item.id)">
-                                                <components-combination
-                                                    :propData="children_item"
-                                                    :propDataFormId="propDataFormId"
-                                                    :propKey="propKey"
-                                                    :propIndex="index"
-                                                    :propDirection="propDirection" 
-                                                    :propMobile="propMobile" 
-                                                    :propComponentStyle="propStyle"
-                                                    @dataChange="data_change"
-                                                    @dataCheck="data_check"
-                                                    @dataOptionChange="data_option_change"
-                                                    @openRegion="open_region"
-                                                    @regionEvent="region_event"
-                                                    @zIndexChange="table_z_index_change"
-                                                />
+                                                <view class="flex-1 wh-auto">
+                                                    <components-combination
+                                                        :propData="children_item"
+                                                        :propDataFormId="propDataFormId"
+                                                        :propKey="propKey"
+                                                        :propIndex="index"
+                                                        :propDirection="propDirection" 
+                                                        :propMobile="propMobile" 
+                                                        :propComponentStyle="propStyle"
+                                                        @dataChange="data_change"
+                                                        @dataCheck="data_check"
+                                                        @dataOptionChange="data_option_change"
+                                                        @openRegion="open_region"
+                                                        @regionEvent="region_event"
+                                                        @zIndexChange="table_z_index_change"
+                                                    />
+                                                </view>
+                                                
                                             </template>
                                         </view>
                                     </view>