diff --git a/common/js/common/common.js b/common/js/common/common.js
index 2cca9eb6..2663dd88 100644
--- a/common/js/common/common.js
+++ b/common/js/common/common.js
@@ -829,7 +829,7 @@ export const get_format_checks_v2 = (common_config, value) => {
         // 根据通用配置中的格式，从类型配置映射中获取对应的格式检查项
         const item = typeConfigMap.get(common_config.format);
         // 如果找不到对应的格式检查项，则不进行后续操作
-        if (!item) return;
+        if (!item) return [{ is_error, error_text }];
 
         // 初始化验证状态为不通过
         let isValid = false;
@@ -918,9 +918,10 @@ export const color_change = (length) => {
  * @returns 格式化后的数字字符串
  */
 export const formatNumber = (num, is_convert) => {
+    let new_num = num.replace(/[^0-9.,]/g, '');
     if (is_convert) {
         // 将输入转换为字符串形式以便处理
-        const number = num.toString();
+        const number = new_num.toString();
         // 使用正则表达式将整数部分每三位用逗号分隔
         const integerPart = number.split('.')[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
         // 避免小数为空的时候也处理
@@ -929,7 +930,7 @@ export const formatNumber = (num, is_convert) => {
         return integerPart + decimalPart;
     } else {
         // 如果不需要转换，移除所有逗号并返回
-        return num.toString().replace(/,/g, '');
+        return new_num.toString().replace(/,/g, '');
     }
 };
 
diff --git a/pages/form-input/components/form-input/address.vue b/pages/form-input/components/form-input/address.vue
index 499cd8be..effb2e93 100644
--- a/pages/form-input/components/form-input/address.vue
+++ b/pages/form-input/components/form-input/address.vue
@@ -165,7 +165,7 @@
                 if (e == '') {
                     setTimeout(() => {
                         this.$emit('zIndexChange', e);
-                    }, 200)
+                    }, 400)
                 } else {
                     this.$emit('zIndexChange', e);
                 }
diff --git a/pages/form-input/components/form-input/checkbox.vue b/pages/form-input/components/form-input/checkbox.vue
index 859b54a5..d7c41647 100644
--- a/pages/form-input/components/form-input/checkbox.vue
+++ b/pages/form-input/components/form-input/checkbox.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="flex-col gap-5">
-        <checkbox-group @change="data_change" class="flex-row gap-10 flex-wrap">
+        <checkbox-group @change="data_change" :class="(com_data.arrangement == 'horizontal' ? 'flex-row flex-wrap' : 'flex-col') + ' gap-10'">
             <label v-for="item in option_list" :key="item.value" class="flex-row align-c margin-right-xxl">
                 <view>
                     <checkbox :value="item.value" :checked="!isEmpty(form_value) && form_value.includes(item.value)" class="flex-row align-c" style="transform:scale(0.7)" />
@@ -96,7 +96,7 @@
                     const data = {
                         name: val,
                         value: value,
-                        color: color_change(this.option_list.length - 1),
+                        color: color_change(this.option_list.length),
                     };
                     const custom_option_list = [...this.custom_option_list, data];
                     this.setData({
diff --git a/pages/form-input/components/form-input/form-input-base.vue b/pages/form-input/components/form-input/form-input-base.vue
index 3b1834e2..c9b418fb 100644
--- a/pages/form-input/components/form-input/form-input-base.vue
+++ b/pages/form-input/components/form-input/form-input-base.vue
@@ -3,7 +3,7 @@
         <view v-for="(item, index) in filteredDiyData" :key="index" :class="(is_custom ? 'pa ' : (flex_direction == 'row' ? 'row-item ' : 'column-item mb-10 ')) + (item.com_data.common_config.is_error == '1' ? ' item_error' : '')" :data-id="item.id" :data-location-x="item.location.x" :data-location-y="item.location.y" :style="(item.key == 'auxiliary-line' ? 'border-bottom: 0rpx; ' : '') + (is_custom ? ('left:' + item.location.x + 'px;top:' + item.location.y + 'px;width:' + item.com_data.com_width + 'px;height:' + item.com_data.com_height + 'px;z-index:' + (z_index_id == item.id ? '999999' : (item.is_enable == '1' ? (data_list.length - 1 > 0 ? (data_list.length - 1) - index : 0) : -999)) + ';') : '')">
             <view :class="'wh-auto ht-auto ' + (flex_direction == 'row' ? (['video', 'img', 'upload-img', 'upload-video', 'multi-text'].includes(item.key) ? 'flex-row align-s gap-10' : 'flex-row align-b gap-10')  : 'flex-col gap-10')">
                 <view v-if="(!is_custom && !['auxiliary-line', 'subform'].includes(item.key)) || (is_custom && !['img', 'video', 'auxiliary-line', 'rect', 'round', 'subform'].includes(item.key))" class="field-label flex-row align-c gap-10" :style="field_label_style + (flex_direction == 'row' && ['upload-img', 'upload-video'].includes(item.key) ? 'padding-top: 12rpx;line-height: 120rpx;' : '') + (flex_direction == 'row' && ['multi-text'].includes(item.key) ? 'padding-top: 18rpx;' : '')">
-                    <view class="flex-row align-c" :style="title_style">{{ item.com_data.title }}<view v-if="item.com_data.is_required == '1'" class="required">*</view></view>
+                    <view class="flex-row align-c" :style="title_style">{{ item.com_data.title }}<view v-if="item.com_data.is_required && item.com_data.is_required == '1'" class="required">*</view></view>
                     <view v-if="item.com_data.common_config.help_is_show == '1' && !isEmpty(item.com_data.common_config.help_explain)" :data-value="item.com_data.common_config.help_explain" @tap="help_icon_event">
                         <iconfont name="icon-miaosha-hdgz" :size="help_icon_style" color="#999"></iconfont>
                     </view>
@@ -247,12 +247,6 @@ export default {
         }
     },
     watch: {
-        propValue: {
-            handler(newVal) {
-                this.init();
-            },
-            deep: true
-        },
         propKey(val) {
            this.init();
         }
@@ -265,9 +259,9 @@ export default {
         init() {
             const data = this.propValue;
             // 公共配置信息
-            const overall_config = data.config?.overall_config || {};
+            const overall_config = data?.overall_config || {};
             const mobile = overall_config?.style_settings?.mobile || {};
-            let diy_data = data.config.diy_data || [];
+            let diy_data = data.diy_data || [];
             // #ifndef H5 || MP-WEIXIN || MP-QQ
                 // 上传文件只支持H5 微信小程序， qq小程序，其余的需要端需要过滤掉数据
                 diy_data = diy_data.filter(item => item.key !== 'upload-attachments');
@@ -515,6 +509,9 @@ export default {
                             if (com_data.is_sms_verification == '1') {
                                 submit_data[`${ name }_verify`] = com_data?.form_value_code || '';
                             }
+                        } else if (item.key ==='date-group') {
+                            submit_data[`${ name }_start`] = value[0] || '';
+                            submit_data[`${ name }_end`] = value[1] || '';
                         } else if (item.key == 'address') {
                             submit_data[`${ name }_province_id`] = value[0] || '';
                             submit_data[`${ name }_city_id`] = value[1] || '';
@@ -557,7 +554,7 @@ export default {
                 'select-multi': { is_format: true, type: 'checkbox' },
                 'date': { is_format: false, type: 'time' },
                 'date-group': { is_format: false, type: 'time' },
-                'single-text': { is_format: false, type: '' },
+                'single-text': { is_format: true, type: '' },
                 'multi-text': { is_format: false, type: '' },
                 'rich-text': { is_format: false, type: '' },
                 'radio-btns': { is_format: false, type: 'radio' },
@@ -582,7 +579,11 @@ export default {
                     } 
                     // 其他字段的格式验证
                     else if (fieldCheckMap[item.key]) {
-                        const { is_format, type } = fieldCheckMap[item.key];
+                        let field_data = fieldCheckMap[data_item.key];
+                        if (['single-text', 'select', 'radio-btns'].includes(data_item.key)) {
+                            field_data = fieldCheckMap[data_item.com_data.type];
+                        }
+                        const { is_format, type } = field_data;
                         const { is_error = '0', error_text = '' } = get_format_checks(com_data, com_data.form_value, is_format, type);
                         com_data.common_config.is_error = is_error;
                         com_data.common_config.error_text = error_text;
@@ -620,10 +621,14 @@ export default {
                                         const { is_error = '0', error_text = '' } = this.handlePhoneValidation(data_item);
                                         data_item.com_data.common_config.is_error = is_error;
                                         data_item.com_data.common_config.error_text = error_text;
-                                    } 
+                                    }
                                     // 其他字段的格式验证
                                     else if (fieldCheckMap[data_item.key]) {
-                                        const { is_format, type } = fieldCheckMap[data_item.key];
+                                        let field_data = fieldCheckMap[data_item.key];
+                                        if (['single-text', 'select', 'radio-btns'].includes(data_item.key)) {
+                                           field_data = fieldCheckMap[data_item.com_data.type];
+                                        }
+                                        const { is_format, type } = field_data;
                                         const { is_error = '0', error_text = '' } = get_format_checks(data_item.com_data, data_item.com_data.form_value, is_format, type);
                                         data_item.com_data.common_config.is_error = is_error;
                                         data_item.com_data.common_config.error_text = error_text;
@@ -644,7 +649,7 @@ export default {
                 return;
             }
             com_data.common_config.format = com_data.is_telephone === '1' ? 'telephone-number' : 'phone-number';
-            return get_format_checks(com_data, com_data.form_value_code, true);
+            return get_format_checks(com_data, com_data.form_value, true);
         },
         // 子表单显隐规则数据处理
         filtered_Data(children) { 
diff --git a/pages/form-input/components/form-input/form-input.vue b/pages/form-input/components/form-input/form-input.vue
index 9c616a57..c828f18b 100644
--- a/pages/form-input/components/form-input/form-input.vue
+++ b/pages/form-input/components/form-input/form-input.vue
@@ -9,7 +9,7 @@
             <view v-if="is_show_heading_title == '1'" class="head-title flex-row bg-white" :style="heading_title_style + (overall_config.type_value == 'default' ? '' : ('width:' + overall_config.custom_width * 2 + 'rpx;'))">{{ form_name }}</view>
             <view class="data-list bg-white" :style="overall_config.type_value == 'default' ? '' : ('width:' + overall_config.custom_width * 2 + 'rpx;height:' + overall_config.custom_height * 2 + 'rpx')">
                 <!-- form表单子组件显示 -->
-                <form-input-base ref="componentForm" :propValue="propValue" :propDataFormId="propDataFormId" @submitData="submit_data" />
+                <form-input-base ref="componentForm" :propValue="propValue.config" :propDataFormId="propDataFormId" @submitData="submit_data" />
             </view>
         </view>
         <!-- 支付宝小程序 不支持同时上下左右滑动-->
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 42adfe5c..16e577e3 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
@@ -3,7 +3,7 @@
         <view v-for="(item, index) in data_list" :key="index" :class="(propDirection == 'row' ? 'row-item ' : 'column-item mb-10 ') + (item.com_data.common_config.is_error == '1' ? ' item_error' : '')" :data-id="item.id" :data-location-x="item.location.x" :data-location-y="item.location.y" :style="(item.key == 'auxiliary-line' ? 'border-bottom: 0rpx; ' : '')">
             <view :class="'wh-auto ht-auto ' + (propDirection == 'row' ? (['video', 'img', 'upload-img', 'upload-video', 'multi-text'].includes(item.key) ? 'flex-row align-s gap-10' : 'flex-row align-b gap-10')  : 'flex-col gap-10')">
                 <view v-if="!['auxiliary-line', 'upload-attachments', 'subform'].includes(item.key)" class="field-label flex-row align-c gap-10" :style="propFieldLabelStyle + (propDirection == 'row' && ['upload-img', 'upload-video'].includes(item.key) ? 'padding-top: 12rpx;line-height: 120rpx;' : '') + (propDirection == 'row' && ['multi-text'].includes(item.key) ? 'padding-top: 18rpx;' : '')">
-                    <view class="flex-row align-c" :style="propTitleStyle">{{ item.com_data.title }}<view v-if="item.com_data.is_required == '1'" class="required">*</view></view>
+                    <view class="flex-row align-c" :style="propTitleStyle">{{ item.com_data.title }}<view v-if="item.com_data.is_required && item.com_data.is_required == '1'" class="required">*</view></view>
                     <view v-if="item.com_data.common_config.help_is_show == '1' && !isEmpty(item.com_data.common_config.help_explain)" :data-value="item.com_data.common_config.help_explain" @tap="help_icon_event">
                         <iconfont name="icon-miaosha-hdgz" :size="propHelpIconStyle" color="#999"></iconfont>
                     </view>
diff --git a/pages/form-input/components/form-input/number.vue b/pages/form-input/components/form-input/number.vue
index 531e29e4..de11b418 100644
--- a/pages/form-input/components/form-input/number.vue
+++ b/pages/form-input/components/form-input/number.vue
@@ -82,10 +82,11 @@
                 });
             },
             blur_input(e){
+                let num = '';
                 if (!isEmpty(e.detail.value)) {
                     let all_list = e.detail.value.replace(/[^0-9.]/g, '');
                     // 去除不是数字和.的值
-                    let num = Number(formatNumber(all_list, false)).toFixed(this.decimal_num);
+                    num = Number(formatNumber(all_list, false)).toFixed(this.decimal_num);
                     // 为数字并且时千分位的是你
                     if (this.format == 'num' && this.is_thousandths_symbol == '1') {
                         // 如果有多个.的话，去除多个.
@@ -96,16 +97,13 @@
                         }
                         num = formatNumber(Number(formatNumber(all_list, false)).toFixed(this.decimal_num).toString(), true)
                     }
-                    this.data_check(num);
-                    this.setData({ 
-                        form_value: num,
-                    });
-                } else {
-                    this.setData({ 
-                        form_value: '',
-                    });
-                    this.data_check('');
+                    
                 }
+                this.data_check(num);
+                this.setData({ 
+                    form_value: num,
+                });
+                this.$emit('dataChange', { value: num, id: this.propDataId });
             },
             data_check(val) {
                 const { is_error = '0', error_text = '' } = get_format_checks(this.com_data, val, true, 'number');
diff --git a/pages/form-input/components/form-input/radio.vue b/pages/form-input/components/form-input/radio.vue
index fe74bb7f..abd5e8d7 100644
--- a/pages/form-input/components/form-input/radio.vue
+++ b/pages/form-input/components/form-input/radio.vue
@@ -1,5 +1,5 @@
 <template>
-    <radio-group @change="data_change" class="flex-row gap-10 flex-wrap">
+    <radio-group @change="data_change" :class="(com_data.arrangement == 'horizontal' ? 'flex-row flex-wrap' : 'flex-col') + ' gap-10'">
         <label v-for="item in option_list" :key="item.value" class="flex-row align-c margin-right-xxl">
             <view>
                 <radio :value="item.value" :checked="!isEmpty(form_value) && form_value.includes(item.value)" style="transform:scale(0.7)"/>
diff --git a/pages/form-input/components/form-input/select-multi.vue b/pages/form-input/components/form-input/select-multi.vue
index 9cd181ea..8de6bb33 100644
--- a/pages/form-input/components/form-input/select-multi.vue
+++ b/pages/form-input/components/form-input/select-multi.vue
@@ -188,7 +188,7 @@
                     const data = {
                         name: val,
                         value: value,
-                        color: color_change(this.option_list.length - 1),
+                        color: color_change(this.option_list.length),
                     };
                     const custom_option_list = [...this.custom_option_list, data];
                     this.setData({