From 6f70d13d462a8521e5d5d03489dd0b97ddf73b7f Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Thu, 11 Jun 2020 15:42:32 -0400
Subject: [PATCH] Fix default values in v-form

---
 src/components/v-form/form-field.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/v-form/form-field.vue b/src/components/v-form/form-field.vue
index 2b7c5fa5f3..b3c91031e0 100644
--- a/src/components/v-form/form-field.vue
+++ b/src/components/v-form/form-field.vue
@@ -76,7 +76,7 @@ export default defineComponent({
 		},
 		initialValue: {
 			type: [String, Number, Object, Array, Boolean],
-			default: null,
+			default: undefined,
 		},
 		primaryKey: {
 			type: [String, Number],
@@ -97,7 +97,8 @@ export default defineComponent({
 
 		const _value = computed(() => {
 			if (props.value !== undefined) return props.value;
-			return props.initialValue;
+			if (props.initialValue !== undefined) return props.initialValue;
+			return props.field.default_value;
 		});
 
 		return { isDisabled, marked, _value };