fix(form): when model.xxx is undefined, validator will use null…

… as validation value, closes #2486
tusen-ai · Feb 21, 2022 · f97b750 · f97b750
1 parent febba6e
commit f97b750
Show file tree

Hide file tree

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