fix(form): date组件初始值不显示

Tencent · Jul 7, 2022 · 8d5eab0 · 8d5eab0
1 parent dd1a8e2
commit 8d5eab0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 26 deletions.
diff --git 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
@@ -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">