From b16463c7ad4ca1547b470efdfbc5e864748c4dc7 Mon Sep 17 00:00:00 2001
From: lijianxiong <1518062161@qq.com>
Date: Mon, 28 Oct 2024 13:53:44 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E6=97=A0=E5=80=BC?=
 =?UTF-8?q?=E6=97=B6=E7=82=B9=E5=87=BB=E4=B8=8D=E5=87=BA=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=8F=8A=E9=80=82=E9=85=8D=E5=80=BC=E5=88=86?=
 =?UTF-8?q?=E9=9A=94=E7=AC=A6=E4=B8=8Epc=E7=AB=AF=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  4 +++
 .../ibiz-date-range-picker.scss               | 31 ++++++++++---------
 .../ibiz-date-range-picker.tsx                |  8 +++--
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 700c49ce00..f6b9745965 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- 修复时间范围选择无值时点击不出选择弹框及适配值分隔符与pc端保持一致
+
 ## [0.0.31] - 2024-10-27
 
 ### Added
diff --git a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss
index 02d432318a..9dcac1b271 100644
--- a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss
+++ b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss
@@ -6,9 +6,17 @@
   @include e(content) {
     position: relative;
     display: flex;
+    flex: 1;
     align-items: center;
     min-height: calc(var(--van-cell-line-height) + 2px); /* 计算输入框高度，2px为边框 */
     white-space: nowrap;
+    @include when('start') {
+      .van-field {
+        input {
+          text-align: left;
+        }
+      }
+    }
     @include when(end) {
       min-width: 0;
       overflow: hidden;
@@ -18,6 +26,15 @@
         overflow: hidden;
         text-overflow: ellipsis;
       }
+
+      .van-field {
+        input {
+          text-align: right;
+          &::placeholder {
+            text-align: right;
+          }
+        }
+      }
     }
   }
 
@@ -37,15 +54,6 @@
     &::after {
       display: none;
     }
-    &:first-child input {
-      text-align: left;
-    }
-    &:last-child input {
-      text-align: right;
-      &::placeholder {
-        text-align: right;
-      }
-    }
     .van-field__control--custom {
       min-height: getCssVar(form-item, line-height);
     }
@@ -82,8 +90,3 @@
     }
   }
 }
-
-@include b(date-range-picker-separator) {
-flex: 1;
-text-align: center;
-}
diff --git a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx
index 291e182094..65f30f020e 100644
--- a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx
+++ b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx
@@ -46,7 +46,7 @@ export const IBizDateRangePicker = defineComponent({
       sec: ibiz.i18n.t('editor.datePicker.sec'),
     };
     // 值分割符
-    let valueSeparator = ';';
+    let valueSeparator = ',';
 
     // 开始占位提示
     let startPlaceHolder = '';
@@ -55,6 +55,9 @@ export const IBizDateRangePicker = defineComponent({
     // 选择范围时的分隔符
     let rangeSeparator = '~';
 
+    // 开始时间
+    const startDate = ref('');
+
     // 编辑器dom
     const startEditorRef = ref();
     const endEditorRef = ref();
@@ -107,7 +110,7 @@ export const IBizDateRangePicker = defineComponent({
     });
     // 开始值
     const startFormatValue = computed(() => {
-      return valueArray.value?.[0] || '';
+      return valueArray.value?.[0] || startDate.value || '';
     });
 
     // 结束值
@@ -133,6 +136,7 @@ export const IBizDateRangePicker = defineComponent({
       } else {
         items[index] = value;
       }
+      startDate.value = items[0];
       if (items.length === 2) {
         emit('change', items.join(valueSeparator));
       }
-- 
Gitee