From 657bb1ee6031629c1a0e152e74d3dddf180bc348 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 09:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E5=AD=90=E8=A1=A8=E5=8D=95=E5=A4=9A=E7=AB=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/form-input/components/form-input/form-input.vue |  2 +-
 pages/form-input/components/form-input/subform.vue    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/form-input/components/form-input/form-input.vue b/pages/form-input/components/form-input/form-input.vue
index 53b54777..abeeea66 100644
--- a/pages/form-input/components/form-input/form-input.vue
+++ b/pages/form-input/components/form-input/form-input.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="pr oh wh-auto ht-auto">
-        <scroll-view :scroll-top="scrollTop" :scroll-y="true" :scroll-x="overall_config.type_value == 'default' || z_index_id !== '' ? false : true" class="scroll-box" lower-threshold="60" scroll-with-animation> 
+        <scroll-view :scroll-top="scrollTop" :scroll-y="true" :scroll-x="overall_config.type_value == 'default' || z_index_id !== '' ? false : true" :class="overall_config.is_show_save_draft == '1' || overall_config.is_show_submit == '1' ? 'scroll-box' : 'ht-auto'" lower-threshold="60" scroll-with-animation> 
             <view :style="content_style + (overall_config.type_value == 'default' ? '' : ('width:' + overall_config.custom_width * 2 + 'rpx;'))">
                 <template v-if="!isEmpty(img_url)">
                     <image :src="img_url" mode="aspectFit" />
diff --git a/pages/form-input/components/form-input/subform.vue b/pages/form-input/components/form-input/subform.vue
index 3550bbe1..f17d7198 100644
--- a/pages/form-input/components/form-input/subform.vue
+++ b/pages/form-input/components/form-input/subform.vue
@@ -451,7 +451,13 @@
                     custom_height = (com_data.com_height - 30 - text_height) * 2 + 'rpx;';
                 }
                 // 子表单数据
-                const children_list = JSON.parse(JSON.stringify(com_data?.children || []));
+                let children_list = JSON.parse(JSON.stringify(com_data?.children || []));
+                let data_list = com_data?.data_list || [];
+                // #ifndef H5 || MP-WEIXIN || MP-QQ
+                    // 上传文件只支持H5 微信小程序， qq小程序，其余的需要端需要过滤掉数据
+                    children_list = children_list.filter(item => item.com_type != 'upload-attachments');
+                    data_list = data_list.filter(item => item.com_type != 'upload-attachments');
+                // #endif
                 children_list.forEach(item => {
                     item.com_data.common_style = this.get_form_border_style(item.com_data.common_config,  mobile.arrange == 'direction' ? this.propDirection : 'column');
                 })
@@ -460,7 +466,7 @@
                     custom_height: custom_height,
                     direction_fixed: mobile.direction_fixed,
                     briefing_field: mobile?.briefing_field || [],
-                    data_list: com_data?.data_list || [],
+                    data_list: data_list,
                     mobile: mobile,
                     form_value: com_data?.form_value || [],
                     children_list: children_list,