diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 8eeaa0b7f..272eda3c8 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -11,6 +11,7 @@ - 修复`BasicTree`下 ActionItem 的 show 属性逻辑问题 - 修复树组件 demo 示例样式错误 - 修复账号管理新增未清空旧数据 +- form 组件应允许 setFieldsValue 方法值为 null 或者 undefined ## 2.0.2 (2021-03-04) diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts index d8602923e..305d91d55 100644 --- a/src/components/Form/src/hooks/useFormEvents.ts +++ b/src/components/Form/src/hooks/useFormEvents.ts @@ -59,9 +59,11 @@ export function useFormEvents({ const schema = unref(getSchema).find((item) => item.field === key); let value = values[key]; + const hasKey = Reflect.has(values, key); + value = handleInputNumberValue(schema?.component, value); // 0| '' is allow - if (value !== undefined && value !== null && fields.includes(key)) { + if (hasKey && fields.includes(key)) { // time type if (itemIsDateType(key)) { if (Array.isArray(value)) { diff --git a/src/layouts/default/header/components/Breadcrumb.vue b/src/layouts/default/header/components/Breadcrumb.vue index e6efaf7df..30e8a5ae8 100644 --- a/src/layouts/default/header/components/Breadcrumb.vue +++ b/src/layouts/default/header/components/Breadcrumb.vue @@ -91,7 +91,7 @@ return true; }).filter((item) => !item.meta?.hideBreadcrumb || !item.meta?.hideMenu); - resultList = resultList.filter((item) => item.path !== PageEnum.BASE_HOME); + // resultList = resultList.filter((item) => item.path !== PageEnum.BASE_HOME); return resultList; }