From 4b138b4189d6de3820a3219946c46e94c26fb588 Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Tue, 22 Feb 2022 01:00:34 +0800
Subject: [PATCH] fix(form): when `model.xxx` is `undefined`, validator will
 use `null` as validation value, closes #2486

---
 CHANGELOG.en-US.md        | 1 +
 CHANGELOG.zh-CN.md        | 1 +
 src/form/src/FormItem.tsx | 3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index ac5b474f8df..d8a0f815b06 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -10,6 +10,7 @@
 - Fix `n-data-table` cannot click selection checkbox if the selection column is a column's child.
 - Fix `n-table`'s `border-color` abnormal style when this added dynamically, closes [#2403](https://github.com/TuSimple/naive-ui/issues/2403).
 - Fix `n-tree`'s `default-expand-all` prop doesn't work for dynamic data.
+- Fix `n-form` when `model.xxx` is `undefined`, validator will use `null` as validation value, closes [#2486](https://github.com/TuSimple/naive-ui/issues/2486).
 
 ### Feats
 
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 1e444dbc4fb..cfea7052066 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -10,6 +10,7 @@
 - 修复 `n-data-table` 当 selection column 为某个 column 的子 column 时无法点击全选复选框
 - 修复 `n-table` 动态增加时 `border-color` 的样式异常，关闭 [#2403](https://github.com/TuSimple/naive-ui/issues/2403)
 - 修复 `n-tree` 的 `default-expand-all` 对于动态数据不生效
+- 修复 `n-form` 当 `model.xxx` 为 `undefined` 的时候会使用 `null` 作为验证值，关闭 [#2486](https://github.com/TuSimple/naive-ui/issues/2486)
 
 ### Feats
 
diff --git a/src/form/src/FormItem.tsx b/src/form/src/FormItem.tsx
index 00987011b81..8a05c508356 100644
--- a/src/form/src/FormItem.tsx
+++ b/src/form/src/FormItem.tsx
@@ -260,8 +260,7 @@ export default defineComponent({
         if (!options.first) options.first = props.first
       }
       const { value: rules } = mergedRulesRef
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const value = NForm ? get(NForm.props.model, path!, null) : undefined
+      const value = NForm ? get(NForm.props.model, path || '') : undefined
       const activeRules = (
         !trigger
           ? rules