From 239f7cb38c3320b3256dd1d28584042c8c8c9db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 30 Jul 2025 18:33:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E5=92=8C=E5=BC=B9=E5=87=BA=E6=A1=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/plugins.css                        | 26 +++++++++++++------
 .../components/form-input/checkbox.vue        |  4 +--
 .../components/form-input/date-group.vue      | 13 ++++++++++
 .../form-input/components/form-input/date.vue | 13 ++++++++++
 .../components/form-input/form-input-base.vue |  8 +++---
 .../modules/components-combination.vue        |  2 +-
 .../form-input/modules/my-datetime.vue        |  2 +-
 .../modules/subform-component-show.vue        |  2 +-
 .../components/form-input/modules/uploads.vue |  2 +-
 .../components/form-input/select-multi.vue    |  6 ++---
 .../components/form-input/select.vue          |  2 +-
 .../components/form-input/subform.vue         |  8 +++---
 .../components/uni-datetime-picker/util.js    |  4 +++
 13 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/common/css/plugins.css b/common/css/plugins.css
index f8f16edb..f9b62076 100644
--- a/common/css/plugins.css
+++ b/common/css/plugins.css
@@ -189,7 +189,7 @@
     margin-left: 10rpx;
 }
 .plugins-blog-grid-list .item .blog-img {
-    width: 100%;
+    width: 100%;
     height: 220rpx !important;
 }
 
@@ -198,12 +198,12 @@
 */
 .plugins-realstore-data-list .item .address-content {
     width: calc(100% - 150rpx);
-}
+}
 
-.plugins-realstore-data-list .item .address-distance {
-    right: 20rpx;
-    bottom: 18rpx;
-}
+.plugins-realstore-data-list .item .address-distance {
+    right: 20rpx;
+    bottom: 18rpx;
+}
 
 .plugins-realstore-data-list .item .icon-list {
     right: 24rpx;
@@ -211,7 +211,7 @@
 }
 .plugins-realstore-data-list .item .icon-list .icon-item {
     width: 46rpx;
-    height: 46rpx;
+    height: 46rpx;
     line-height: 46rpx;
 }
 .plugins-realstore-data-list .item .icon-item .badge-icon {
@@ -262,4 +262,14 @@
 .plugins-shop-data-list .item .desc {
     min-height: 72rpx;
     line-height: 36rpx;
-}
\ No newline at end of file
+}
+/* #ifdef H5 */
+.forminput-popup {
+    [name="content"], [name="mask"]{
+        max-width: 1600rpx;
+        width: 100%;
+        left: 50% !important;
+        transform: translateX(-50%) !important;    
+    }   
+}
+/* #endif */
\ No newline at end of file
diff --git a/pages/form-input/components/form-input/checkbox.vue b/pages/form-input/components/form-input/checkbox.vue
index d7c41647..42d632af 100644
--- a/pages/form-input/components/form-input/checkbox.vue
+++ b/pages/form-input/components/form-input/checkbox.vue
@@ -13,11 +13,11 @@
             <view class="size-14 cr-blue">添加选项</view>
         </view>
         <!-- 选项弹出框 -->
-        <uni-popup ref="inputDialog" type="dialog">
+        <uni-popup ref="inputDialog" type="dialog" class="forminput-popup" >
             <uni-popup-dialog ref="inputClose" mode="input" title="输入内容" :value="dialog_value" before-close placeholder="请输入内容" @close="dialog_input_close" @confirm="dialog_input_confirm"></uni-popup-dialog>
         </uni-popup>
         <!-- 失败提示 -->
-        <uni-popup ref="message" type="message">
+        <uni-popup ref="message" type="message" class="forminput-popup">
             <uni-popup-message type="error" message="选项名称不能为空" :duration="2000"></uni-popup-message>
         </uni-popup>
     </view>
diff --git a/pages/form-input/components/form-input/date-group.vue b/pages/form-input/components/form-input/date-group.vue
index 8d680e8b..d3b3fc1e 100644
--- a/pages/form-input/components/form-input/date-group.vue
+++ b/pages/form-input/components/form-input/date-group.vue
@@ -197,12 +197,25 @@
 ::v-deep .uniui-calendar::before {
     content: '',
 }
+/* #ifdef H5 */
+.datetime-picker {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 0;
+    ::v-deep .uni-date-editor {
+        visibility: hidden;
+    }
+}
+/* #endif */
+/* #ifndef H5 */
 .datetime-picker {
     position: absolute;
     top: 160rpx;
     left: 0;
     width: 0;
 }
+/* #endif */
 .datetime-value {
     color: #606266;
     line-height: 1.5;
diff --git a/pages/form-input/components/form-input/date.vue b/pages/form-input/components/form-input/date.vue
index bc8f3af1..3f368418 100644
--- a/pages/form-input/components/form-input/date.vue
+++ b/pages/form-input/components/form-input/date.vue
@@ -136,12 +136,25 @@
 ::v-deep .uniui-calendar::before {
     content: '',
 }
+/* #ifdef H5 */
+.datetime-picker {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 0;
+    ::v-deep .uni-date-editor {
+        visibility: hidden;
+    }
+}
+/* #endif */
+/* #ifndef H5 */
 .datetime-picker {
     position: absolute;
     top: 160rpx;
     left: 0;
     width: 0;
 }
+/* #endif */
 .datetime-placeholder {
     color: #606266;
     opacity: 0.6;
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 c9b418fb..160296dc 100644
--- a/pages/form-input/components/form-input/form-input-base.vue
+++ b/pages/form-input/components/form-input/form-input-base.vue
@@ -8,7 +8,7 @@
                         <iconfont name="icon-miaosha-hdgz" :size="help_icon_style" color="#999"></iconfont>
                     </view>
                 </view>
-                <view class="flex-1 wh-auto ht-auto flex-col gap-5 oh">
+                <view :class="'flex-1 wh-auto ht-auto flex-col gap-5 '+ (['date', 'date-group'].includes(item.key) ? '' : 'oh')">
                     <!-- 输入框 -->
                     <view v-if="['single-text', 'radio-btns', 'select'].includes(item.key) && item.com_data.type == 'single-text'" :style="item.com_data.common_style">
                         <component-input :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change"></component-input>
@@ -38,11 +38,11 @@
                         <component-number :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change"></component-number>
                     </view>
                     <!-- 时间选择器 -->
-                    <view v-else-if="item.key == 'date'" :style="item.com_data.common_style">
+                    <view v-else-if="item.key == 'date'" :style="item.com_data.common_style + 'overflow: none;'">
                         <component-date :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change" @zIndexChange="z_index_change"></component-date>
                     </view>
                     <!-- 时间选择器组 -->
-                    <view v-else-if="item.key == 'date-group'" :style="item.com_data.common_style">
+                    <view v-else-if="item.key == 'date-group'" :style="item.com_data.common_style + 'overflow: none;'">
                         <component-date-group :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change" @zIndexChange="z_index_change"></component-date-group>
                     </view>
                     <!-- 地址 -->
@@ -129,7 +129,7 @@
             </view>
         </view>
         <view class="z-i-deep-must">
-            <uni-popup ref="popup" type="center" border-radius="20rpx">
+            <uni-popup ref="popup" type="center" border-radius="20rpx" class="forminput-popup">
                 <view class="popup-content">{{ popup_help_content }}</view>
             </uni-popup>
         </view>
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 9549780d..48eb4c81 100644
--- a/pages/form-input/components/form-input/modules/components-combination.vue
+++ b/pages/form-input/components/form-input/modules/components-combination.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="wh-auto flex-col gap-5 oh">
+    <view :class="'wh-auto flex-col gap-5 ' + (['date', 'date-group'].includes(data_item.key) ? '' : '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/modules/my-datetime.vue b/pages/form-input/components/form-input/modules/my-datetime.vue
index d9857548..5fde84b5 100644
--- a/pages/form-input/components/form-input/modules/my-datetime.vue
+++ b/pages/form-input/components/form-input/modules/my-datetime.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-popup ref="popup" type="bottom" background-color="#fff" :animation="true" @maskClick="maskClick">
+		<uni-popup ref="popup" type="bottom" background-color="#fff" class="forminput-popup" :animation="true" @maskClick="maskClick">
 			<view class="popup-content">
 				<view >
 				  <view class="headBox padding-main">
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 16e577e3..ed2169f4 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
@@ -8,7 +8,7 @@
                         <iconfont name="icon-miaosha-hdgz" :size="propHelpIconStyle" color="#999"></iconfont>
                     </view>
                 </view>
-                <view class="flex-1 wh-auto ht-auto flex-col gap-5 oh">
+                <view :class="'flex-1 wh-auto ht-auto flex-col gap-5 ' + (['date', 'date-group'].includes(item.key) ? '' : 'oh')">
                     <!-- 输入框 -->
                     <view v-if="['single-text', 'radio-btns', 'select'].includes(item.key) && item.com_data.type == 'single-text'" :style="item.com_data.common_style">
                         <component-input :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propStyle="propComponentStyle" @dataCheck="data_check" @dataChange="data_change"></component-input>
diff --git a/pages/form-input/components/form-input/modules/uploads.vue b/pages/form-input/components/form-input/modules/uploads.vue
index 97eaa845..9051c8b6 100644
--- a/pages/form-input/components/form-input/modules/uploads.vue
+++ b/pages/form-input/components/form-input/modules/uploads.vue
@@ -40,7 +40,7 @@
                 请选择文件，最多可以上传{{ propMaxNum }}个
             </view>
         </template>
-        <uni-popup ref="popup" type="center" border-radius="20rpx" mask-background-color="rgba(0,0,0,0.8)">
+        <uni-popup ref="popup" type="center" border-radius="20rpx" class="forminput-popup" mask-background-color="rgba(0,0,0,0.8)">
             <view class="wh-auto ht-auto">
                 <view class="popup-close oh" @tap="popup_close">
                     <iconfont name="icon-close" size="32rpx" color="#fff"></iconfont>
diff --git a/pages/form-input/components/form-input/select-multi.vue b/pages/form-input/components/form-input/select-multi.vue
index 8de6bb33..bbd9a087 100644
--- a/pages/form-input/components/form-input/select-multi.vue
+++ b/pages/form-input/components/form-input/select-multi.vue
@@ -17,7 +17,7 @@
             </template>
         </view>
         <!-- 弹窗 -->
-        <uni-popup ref="selectPopup" type="bottom" class="popup-bottom" background-color="#fff" :animation="true" @maskClick="quick_close_event">
+        <uni-popup ref="selectPopup" type="bottom" class="popup-bottom forminput-popup" background-color="#fff" :animation="true" @maskClick="quick_close_event">
             <view class="padding-horizontal-main padding-top-main bg-white popup-content flex-col">
                 <!-- 头部的样式 -->
                 <view class="flex-row jc-sb margin-bottom">
@@ -61,11 +61,11 @@
             </view>
         </uni-popup>
         <!-- 选项弹出框 -->
-        <uni-popup ref="inputDialog" type="dialog">
+        <uni-popup ref="inputDialog" type="dialog" class="forminput-popup">
             <uni-popup-dialog ref="inputClose" mode="input" title="输入内容" :value="dialog_value" before-close placeholder="请输入内容" @close="dialog_input_close" @confirm="dialog_input_confirm"></uni-popup-dialog>
         </uni-popup>
         <!-- 失败提示 -->
-        <uni-popup ref="message" type="message">
+        <uni-popup ref="message" type="message" class="forminput-popup">
             <uni-popup-message type="error" message="选项名称不能为空" :duration="2000"></uni-popup-message>
         </uni-popup>
     </view>
diff --git a/pages/form-input/components/form-input/select.vue b/pages/form-input/components/form-input/select.vue
index c8ed8e64..4d9d4ca2 100644
--- a/pages/form-input/components/form-input/select.vue
+++ b/pages/form-input/components/form-input/select.vue
@@ -17,7 +17,7 @@
             </template>
         </view>
         <!-- 弹窗 -->
-        <uni-popup ref="selectPopup" type="bottom" class="popup-bottom" background-color="#fff" :animation="true" @maskClick="quick_close_event">
+        <uni-popup ref="selectPopup" type="bottom" class="popup-bottom forminput-popup" background-color="#fff" :animation="true" @maskClick="quick_close_event">
             <view class="padding-horizontal-main padding-top-main bg-white popup-content flex-col gap-10">
                 <!-- 头部的样式 -->
                 <view class="flex-row jc-sb">
diff --git a/pages/form-input/components/form-input/subform.vue b/pages/form-input/components/form-input/subform.vue
index 785b9056..9c6b00d1 100644
--- a/pages/form-input/components/form-input/subform.vue
+++ b/pages/form-input/components/form-input/subform.vue
@@ -138,7 +138,7 @@
             </template>
         </view>
         <!-- 表格详情 -->
-        <uni-popup ref="tableMorePopup" type="bottom" class="popup-bottom" background-color="#fff" :animation="true" @maskClick="quick_table_more_event">
+        <uni-popup ref="tableMorePopup" type="bottom" class="popup-bottom forminput-popup" background-color="#fff" :animation="true" @maskClick="quick_table_more_event">
             <view class="bg-white subform-row">
                 <view class="subform-row-head">
                     <span class="title">{{ com_data.title }}</span><span>（{{ table_more_index + 1 }}）</span>
@@ -180,11 +180,11 @@
             </view>
         </uni-popup>
         <!-- 删除提示弹出框 -->
-        <uni-popup ref="deletePopup" type="dialog" @maskClick="delete_close">
+        <uni-popup ref="deletePopup" type="dialog" class="forminput-popup" @maskClick="delete_close">
             <uni-popup-dialog cancelText="取消" confirmText="确定" title="" content="是否确认删除这条数据" @confirm="delete_confirm" @close="delete_close"></uni-popup-dialog>
         </uni-popup>
         <!-- 更多弹窗 -->
-        <uni-popup ref="morePopup" type="bottom" class="popup-bottom" background-color="#fff" :animation="true" @maskClick="quick_close_event">
+        <uni-popup ref="morePopup" type="bottom" class="popup-bottom forminput-popup" background-color="#fff" :animation="true" @maskClick="quick_close_event">
             <view class="bg-white action-sheet">
                 <view class="action-sheet-item" data-value="copy" @tap="copy">复制到下一行</view>
                 <view class="action-sheet-item" data-value="copy_last" @tap="copy">复制到最后一行</view>
@@ -195,7 +195,7 @@
             </view>
         </uni-popup>
         <!-- 表格报错提示 -->
-        <uni-popup ref="popup_error" type="center" border-radius="20rpx" @maskClick="quick_close_event">
+        <uni-popup ref="popup_error" type="center" class="forminput-popup" border-radius="20rpx" @maskClick="quick_close_event">
             <view class="popup-error-content">{{ popup_error_content }}</view>
         </uni-popup>
     </view>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
index 3ea5bb1a..6b789168 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -444,6 +444,10 @@ function checkDate(date){
 
 const dateTimeReg = /^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])( [0-5]?[0-9]:[0-5]?[0-9]:[0-5]?[0-9])?$/
 function fixIosDateFormat(value) {
+	// 将年月日时分秒转换为对应的时间
+	if (value != '' && typeof value === 'string') {
+		value = value.replace(/年/g, '/').replace(/月/g, '/').replace(/日/g, '').replace(/时/g, ' :').replace(/分/g, ':').replace(/秒/g, '');
+	}
   if (typeof value === 'string' && dateTimeReg.test(value)) {
     value = value.replace(/-/g, '/')
   }