@firecms/core 3.0.0-canary.201 → 3.0.0-canary.202
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.es.js +7 -2
- package/dist/index.es.js.map +1 -1
- package/dist/index.umd.js +7 -2
- package/dist/index.umd.js.map +1 -1
- package/package.json +5 -5
- package/src/form/EntityForm.tsx +2 -1
- package/src/util/objects.ts +4 -1
package/dist/index.umd.js
CHANGED
|
@@ -214,7 +214,11 @@
|
|
|
214
214
|
if (targetIsObject && isObject(source)) {
|
|
215
215
|
Object.keys(source).forEach((key) => {
|
|
216
216
|
const sourceElement = source[key];
|
|
217
|
-
if (
|
|
217
|
+
if (sourceElement instanceof Date) {
|
|
218
|
+
Object.assign(output, {
|
|
219
|
+
[key]: new Date(sourceElement.getTime())
|
|
220
|
+
});
|
|
221
|
+
} else if (isObject(sourceElement)) {
|
|
218
222
|
if (!(key in target)) Object.assign(output, {
|
|
219
223
|
[key]: sourceElement
|
|
220
224
|
});
|
|
@@ -16680,7 +16684,8 @@
|
|
|
16680
16684
|
if (!collection.alwaysApplyDefaultValues) {
|
|
16681
16685
|
return entity.values ?? getDefaultValuesFor(properties);
|
|
16682
16686
|
} else {
|
|
16683
|
-
|
|
16687
|
+
const defaultValues = getDefaultValuesFor(properties);
|
|
16688
|
+
return mergeDeep(defaultValues, entity.values ?? {});
|
|
16684
16689
|
}
|
|
16685
16690
|
} else if (status === "new") {
|
|
16686
16691
|
return getDefaultValuesFor(properties);
|