From 8d5eab0ef821b57bc7145e9ccd2dc4db36a6f6d3 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 7 Jul 2022 19:27:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(form):=20date=E7=BB=84=E4=BB=B6=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=80=BC=20=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/fields/Date.vue | 28 ++++++++++++----------------
 packages/form/src/fields/Time.vue | 18 ++++++++----------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/packages/form/src/fields/Date.vue b/packages/form/src/fields/Date.vue
index 3781c25e..d3f4017f 100644
--- a/packages/form/src/fields/Date.vue
+++ b/packages/form/src/fields/Date.vue
@@ -1,20 +1,18 @@
 <template>
-  <div v-if="model">
-    <el-date-picker
-      v-model="model[modelName]"
-      type="date"
-      :size="size"
-      :placeholder="config.placeholder"
-      :disabled="disabled"
-      :format="config.format"
-      :value-format="config.format || 'YYYY-MM-DD HH:mm:ss'"
-      @change="changeHandler"
-    ></el-date-picker>
-  </div>
+  <el-date-picker
+    v-model="model[name]"
+    type="date"
+    :size="size"
+    :placeholder="config.placeholder"
+    :disabled="disabled"
+    :format="config.format"
+    :value-format="config.format || 'YYYY-MM-DD HH:mm:ss'"
+    @change="changeHandler"
+  ></el-date-picker>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue';
+import { defineComponent, PropType } from 'vue';
 
 import { datetimeFormatter } from '@tmagic/utils';
 
@@ -38,10 +36,8 @@ export default defineComponent({
   setup(props, { emit }) {
     useAddField(props.prop);
 
-    const modelName = computed(() => props.prop || props.config.name || '');
-    props.model[modelName.value] = datetimeFormatter(props.model[modelName.value], '');
+    props.model[props.name] = datetimeFormatter(props.model[props.name], '');
     return {
-      modelName,
       changeHandler(v: string) {
         emit('change', v);
       },
diff --git a/packages/form/src/fields/Time.vue b/packages/form/src/fields/Time.vue
index 03e18f5d..909166d5 100644
--- a/packages/form/src/fields/Time.vue
+++ b/packages/form/src/fields/Time.vue
@@ -1,14 +1,12 @@
 <template>
-  <div>
-    <el-time-picker
-      v-model="model[name]"
-      :size="size"
-      value-format="HH:mm:ss"
-      :placeholder="config.placeholder"
-      :disabled="disabled"
-      @change="changeHandler"
-    ></el-time-picker>
-  </div>
+  <el-time-picker
+    v-model="model[name]"
+    :size="size"
+    value-format="HH:mm:ss"
+    :placeholder="config.placeholder"
+    :disabled="disabled"
+    @change="changeHandler"
+  ></el-time-picker>
 </template>
 
 <script lang="ts">