From 83cd10159d87893d167f53f3a2218e0d18323df5 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Fri, 24 Jun 2022 20:32:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(form):=20datetime=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E5=85=B7=E4=BD=93=E6=97=B6=E5=88=BB=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA23=EF=BC=9A59:59?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/fields/DateTime.vue  | 25 ++++++++++++-------------
 packages/form/src/fields/Daterange.vue | 25 ++++++++++++-------------
 packages/form/src/schema.ts            |  2 ++
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/form/src/fields/DateTime.vue b/packages/form/src/fields/DateTime.vue
index 8df20e47..b4fd3cd2 100644
--- a/packages/form/src/fields/DateTime.vue
+++ b/packages/form/src/fields/DateTime.vue
@@ -1,17 +1,16 @@
 <template>
-  <div v-if="model">
-    <el-date-picker
-      v-model="model[name]"
-      popper-class="magic-datetime-picker-popper"
-      type="datetime"
-      :size="size"
-      :placeholder="config.placeholder"
-      :disabled="disabled"
-      :format="config.format || 'YYYY-MM-DD HH:mm:ss'"
-      :value-format="config.valueFormat || 'YYYY-MM-DD HH:mm:ss'"
-      @change="changeHandler"
-    ></el-date-picker>
-  </div>
+  <el-date-picker
+    v-model="model[name]"
+    popper-class="magic-datetime-picker-popper"
+    type="datetime"
+    :size="size"
+    :placeholder="config.placeholder"
+    :disabled="disabled"
+    :format="config.format || 'YYYY-MM-DD HH:mm:ss'"
+    :value-format="config.valueFormat || 'YYYY-MM-DD HH:mm:ss'"
+    :default-time="config.defaultTime || [new Date(2000, 1, 1, 23, 59, 59)]"
+    @change="changeHandler"
+  ></el-date-picker>
 </template>
 
 <script lang="ts">
diff --git a/packages/form/src/fields/Daterange.vue b/packages/form/src/fields/Daterange.vue
index 5836b5d3..6a1af988 100644
--- a/packages/form/src/fields/Daterange.vue
+++ b/packages/form/src/fields/Daterange.vue
@@ -1,17 +1,16 @@
 <template>
-  <div>
-    <el-date-picker
-      v-model="value"
-      type="datetimerange"
-      range-separator="-"
-      start-placeholder="开始日期"
-      end-placeholder="结束日期"
-      :size="size"
-      :unlink-panels="true"
-      :disabled="disabled"
-      @change="changeHandler"
-    ></el-date-picker>
-  </div>
+  <el-date-picker
+    v-model="value"
+    type="datetimerange"
+    range-separator="-"
+    start-placeholder="开始日期"
+    end-placeholder="结束日期"
+    :size="size"
+    :unlink-panels="true"
+    :disabled="disabled"
+    :default-time="config.defaultTime || [new Date(2000, 1, 1, 23, 59, 59)]"
+    @change="changeHandler"
+  ></el-date-picker>
 </template>
 
 <script lang="ts">
diff --git a/packages/form/src/schema.ts b/packages/form/src/schema.ts
index 54757f10..700fd380 100644
--- a/packages/form/src/schema.ts
+++ b/packages/form/src/schema.ts
@@ -237,6 +237,7 @@ interface CascaderOption {
  */
 export interface DaterangeConfig extends FormItem {
   type: 'daterange';
+  defaultTime?: Date[];
   names?: string[];
 }
 
@@ -317,6 +318,7 @@ export interface DateConfig extends FormItem, Input {
  */
 export interface DateTimeConfig extends FormItem, Input {
   type: 'datetime';
+  defaultTime?: Date[];
   format?: 'YYYY-MM-dd HH:mm:ss' | string;
   valueFormat?: 'YYYY-MM-dd HH:mm:ss' | string;
 }