From 9b8e3e4767af6c63b7815ea4eb9d3e0edd5f9f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 23 Oct 2025 11:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form-input/modules/components-combination.vue  |  6 +++---
 .../form-input/modules/subform-component-show.vue  |  6 +++---
 pages/form-input/components/form-input/phone.vue   |  4 ++--
 pages/form-input/components/form-input/subform.vue | 14 ++++++++------
 pages/form-input/components/form-input/upload.vue  |  4 ++--
 pages/form-input/form-preview.vue                  |  2 +-
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pages/form-input/components/form-input/modules/components-combination.vue b/pages/form-input/components/form-input/modules/components-combination.vue
index 668afbc1..c26d5829 100644
--- a/pages/form-input/components/form-input/modules/components-combination.vue
+++ b/pages/form-input/components/form-input/modules/components-combination.vue
@@ -66,7 +66,7 @@
         </view>
         <!-- 上传视频或图片 -->
         <view v-else-if="['upload-img', 'upload-video'].includes(data_item.key)" :class="propDirection == 'row' ? 'padding-vertical-sm' : ''">
-            <component-upload :propValue="data_item.com_data" :propType="data_item.key == 'upload-img' ? 'img' : ( data_item.key == 'upload-video' ? 'video' : 'file')" :propKey="propKey" :propDataFormId="propDataFormId" :propDataId="data_item.id" :propMobile="propMobile" :propStyle="propComponentStyle" :propDirection="propDirection" @dataCheck="data_check"></component-upload>
+            <component-upload :propValue="data_item.com_data" :propType="data_item.key == 'upload-img' ? 'img' : ( data_item.key == 'upload-video' ? 'video' : 'file')" :propKey="propKey" :propFormInputId="propFormInputId" :propDataId="data_item.id" :propMobile="propMobile" :propStyle="propComponentStyle" :propDirection="propDirection" @dataCheck="data_check"></component-upload>
         </view>
         <!-- 定位 -->
         <view v-else-if="data_item.key == 'position'">
@@ -75,7 +75,7 @@
         <!-- #ifdef H5 || MP-WEIXIN || MP-QQ -->
         <!-- 上传文件 -->
         <view v-else-if="data_item.key == 'upload-attachments'">
-            <component-upload :propValue="data_item.com_data" propType="file" :propKey="propKey" :propDataFormId="propDataFormId" :propDataId="data_item.id" :propMobile="propMobile" :propStyle="propComponentStyle" :propDirection="propDirection" @dataCheck="data_check"></component-upload>
+            <component-upload :propValue="data_item.com_data" propType="file" :propKey="propKey" :propFormInputId="propFormInputId" :propDataId="data_item.id" :propMobile="propMobile" :propStyle="propComponentStyle" :propDirection="propDirection" @dataCheck="data_check"></component-upload>
         </view>
         <!-- #endif -->
     </view>
@@ -138,7 +138,7 @@ export default {
             type: Object,
             default: () => {},
         },
-        propDataFormId: {
+        propFormInputId: {
             type: [String, Number],
             default: '',
         },
diff --git a/pages/form-input/components/form-input/modules/subform-component-show.vue b/pages/form-input/components/form-input/modules/subform-component-show.vue
index a558da94..38459899 100644
--- a/pages/form-input/components/form-input/modules/subform-component-show.vue
+++ b/pages/form-input/components/form-input/modules/subform-component-show.vue
@@ -83,7 +83,7 @@
                     </view>
                     <!-- 上传视频或图片 -->
                     <view v-else-if="['upload-img', 'upload-video'].includes(item.key)" :class="propDirection == 'row' ? 'padding-vertical-sm' : ''">
-                        <component-upload :propValue="item.com_data" :propType="item.key == 'upload-img' ? 'img' : ( item.key == 'upload-video' ? 'video' : 'file')" :propKey="propKey" :propDataFormId="propDataFormId" :propDataId="item.id" :propMobile="propMobile" :propStyle="propComponentStyle" :propDirection="propDirection" @dataCheck="data_check"></component-upload>
+                        <component-upload :propValue="item.com_data" :propType="item.key == 'upload-img' ? 'img' : ( item.key == 'upload-video' ? 'video' : 'file')" :propKey="propKey" :propFormInputId="propFormInputId" :propDataId="item.id" :propMobile="propMobile" :propStyle="propComponentStyle" :propDirection="propDirection" @dataCheck="data_check"></component-upload>
                     </view>
                     <!-- 定位 -->
                     <view v-else-if="item.key == 'position'">
@@ -92,7 +92,7 @@
                     <!-- #ifdef H5 || MP-WEIXIN || MP-QQ -->
                     <!-- 上传文件 -->
                     <view v-else-if="item.key == 'upload-attachments'">
-                        <component-upload :propValue="item.com_data" propType="file" :propKey="propKey" :propDataFormId="propDataFormId" :propDataId="item.id" :propMobile="propMobile" :propStyle="propComponentStyle" :propDirection="propDirection" @dataCheck="data_check"></component-upload>
+                        <component-upload :propValue="item.com_data" propType="file" :propKey="propKey" :propFormInputId="propFormInputId" :propDataId="item.id" :propMobile="propMobile" :propStyle="propComponentStyle" :propDirection="propDirection" @dataCheck="data_check"></component-upload>
                     </view>
                     <!-- #endif -->
                     <view v-if="!isEmpty(item.com_data.common_config.error_text)" class="field-invalid-info">{{ item.com_data.common_config.error_text }}</view>
@@ -171,7 +171,7 @@ export default {
             type: String,
             default: '',
         },
-        propDataFormId: {
+        propFormInputId: {
             type: [String, Number],
             default: '',
         },
diff --git a/pages/form-input/components/form-input/phone.vue b/pages/form-input/components/form-input/phone.vue
index fb57c9a4..e64c22fc 100644
--- a/pages/form-input/components/form-input/phone.vue
+++ b/pages/form-input/components/form-input/phone.vue
@@ -50,7 +50,7 @@
                 type: [String, Number],
                 default: 0,
             },
-            propDataFormId: {
+            propFormInputId: {
                 type: [String, Number],
                 default: '',
             },
@@ -191,7 +191,7 @@
             },
             verify_send_handle() {
                 const post_data = {
-                    forminput_id: this.propDataFormId,
+                    forminput_id: this.propFormInputId,
                     forminput_item_id: this.propDataId,
                     accounts: this.form_value, 
                     type: 'sms', 
diff --git a/pages/form-input/components/form-input/subform.vue b/pages/form-input/components/form-input/subform.vue
index bca36c66..d959aacc 100644
--- a/pages/form-input/components/form-input/subform.vue
+++ b/pages/form-input/components/form-input/subform.vue
@@ -47,7 +47,7 @@
                                     :propFieldLabelStyle="propFieldLabelStyle"
                                     :propTitleStyle="propTitleStyle"
                                     :propHelpIconStyle="propHelpIconStyle"
-                                    :propDataFormId="propDataFormId"
+                                    :propFormInputId="propFormInputId"
                                     :propKey="propKey"
                                     :propIndex="index"
                                     :propDirection="propDirection" 
@@ -101,7 +101,7 @@
                                                 <view class="flex-1 wh-auto">
                                                     <components-combination
                                                         :propData="children_item"
-                                                        :propDataFormId="propDataFormId"
+                                                        :propFormInputId="propFormInputId"
                                                         :propKey="propKey"
                                                         :propIndex="index"
                                                         :propDirection="propDirection" 
@@ -147,7 +147,7 @@
                         :propFieldLabelStyle="propFieldLabelStyle"
                         :propTitleStyle="propTitleStyle"
                         :propHelpIconStyle="propHelpIconStyle"
-                        :propDataFormId="propDataFormId"
+                        :propFormInputId="propFormInputId"
                         :propKey="propKey"
                         :propIndex="table_more_index"
                         :propDirection="propDirection" 
@@ -240,7 +240,7 @@
                 type: String,
                 default: '20rpx',
             },
-            propDataFormId: {
+            propFormInputId: {
                 type: [String, Number],
                 default: '',
             },
@@ -661,7 +661,8 @@
                     data_list: JSON.parse(JSON.stringify(this.children_list))
                 });
                 this.setData({ data_list: data });
-                this.$emit('subformDataChange', data, this.propDataId);
+                // 数据发生变化时通知父级
+                this.$emit('subformDataCheck', data, this.propDataId);
             },
             expand_all(e) {
                 const { value } = e.currentTarget.dataset;
@@ -700,7 +701,8 @@
                 this.setData({
                     data_list: data
                 })
-                this.$emit('subformDataChange', data, this.propDataId);
+                // 执行一下校验事件
+                this.$emit('subformDataCheck', data, this.propDataId);
             },
             // 获取选择的中文名称 empty_conversion 是用来区分有没有值,有值和没有值的颜色不一致
             data_conversion(item) {
diff --git a/pages/form-input/components/form-input/upload.vue b/pages/form-input/components/form-input/upload.vue
index 5029d970..e4c2939d 100644
--- a/pages/form-input/components/form-input/upload.vue
+++ b/pages/form-input/components/form-input/upload.vue
@@ -22,7 +22,7 @@
                 type: [String, Number],
                 default: 0,
             },
-            propDataFormId: {
+            propFormInputId: {
                 type: [String, Number],
                 default: '',
             },
@@ -71,7 +71,7 @@
                 this.setData({
                     com_data: com_data,
                     max_num: com_data.is_limit_num == '1' ? com_data.limit : 1000,
-                    pathType: `forminputdata-${this.propDataFormId}`,
+                    pathType: `forminputdata-${this.propFormInputId}`,
                     form_value: com_data.form_value || [],
                     border_style: common_form_styles_computer(com_data.common_config)
                 });
diff --git a/pages/form-input/form-preview.vue b/pages/form-input/form-preview.vue
index 52592ddd..450d7862 100644
--- a/pages/form-input/form-preview.vue
+++ b/pages/form-input/form-preview.vue
@@ -2,7 +2,7 @@
     <view :class="theme_view">
         <block v-if="(data || null) != null && (data.config || null) != null">
             <!-- diy模块 -->
-            <component-form-input :propValue="data" :propDataFormId="data.id" :propKey="random_value" propIsMask @onLocationBack="user_back_choice_location">
+            <component-form-input :propValue="data" :propFormInputId="data.id" :propKey="random_value" propIsMask @onLocationBack="user_back_choice_location">
                 <!-- 底部内容 -->
                 <template slot="diy-bottom-content">
                     <!-- 结尾 -->