@formily/core
Advanced tools
Comparing version 1.1.0 to 1.1.1-beta.0
@@ -250,2 +250,15 @@ "use strict"; | ||
var editableChanged = field.isDirty('editable'); | ||
var initializeLazy = function (callback) { | ||
if (options.initializeLazySyncState) { | ||
if (initialValueChanged) { | ||
setTimeout(callback); | ||
} | ||
else { | ||
callback(); | ||
} | ||
} | ||
else { | ||
callback(); | ||
} | ||
}; | ||
if (initializedChanged) { | ||
@@ -273,4 +286,6 @@ heart.publish(types_1.LifeCycleTypes.ON_FIELD_INIT, field); | ||
if (!wasHidden) { | ||
setFormValuesIn(path, published.value, true); | ||
notifyTreeFromValues(); | ||
initializeLazy(function () { | ||
setFormValuesIn(path, published.value, true); | ||
notifyTreeFromValues(); | ||
}); | ||
} | ||
@@ -281,4 +296,6 @@ heart.publish(types_1.LifeCycleTypes.ON_FIELD_VALUE_CHANGE, field); | ||
if (!wasHidden) { | ||
setFormInitialValuesIn(path, published.initialValue, true); | ||
notifyTreeFromInitialValues(); | ||
initializeLazy(function () { | ||
setFormInitialValuesIn(path, published.initialValue, true); | ||
notifyTreeFromInitialValues(); | ||
}); | ||
} | ||
@@ -295,11 +312,15 @@ heart.publish(types_1.LifeCycleTypes.ON_FIELD_INITIAL_VALUE_CHANGE, field); | ||
} | ||
deleteFormValuesIn(path, true); | ||
notifyTreeFromValues(); | ||
initializeLazy(function () { | ||
deleteFormValuesIn(path, true); | ||
notifyTreeFromValues(); | ||
}); | ||
} | ||
else { | ||
if (!existFormValuesIn(path)) { | ||
setFormValuesIn(path, shared_1.isValid(published.visibleCacheValue) | ||
? published.visibleCacheValue | ||
: published.initialValue, true); | ||
notifyTreeFromValues(); | ||
initializeLazy(function () { | ||
setFormValuesIn(path, shared_1.isValid(published.visibleCacheValue) | ||
? published.visibleCacheValue | ||
: published.initialValue, true); | ||
notifyTreeFromValues(); | ||
}); | ||
} | ||
@@ -328,11 +349,15 @@ } | ||
} | ||
deleteFormValuesIn(path, true); | ||
notifyTreeFromValues(); | ||
initializeLazy(function () { | ||
deleteFormValuesIn(path, true); | ||
notifyTreeFromValues(); | ||
}); | ||
} | ||
else { | ||
if (!existFormValuesIn(path)) { | ||
setFormValuesIn(path, shared_1.isValid(published.visibleCacheValue) | ||
? published.visibleCacheValue | ||
: published.initialValue, true); | ||
notifyTreeFromValues(); | ||
initializeLazy(function () { | ||
setFormValuesIn(path, shared_1.isValid(published.visibleCacheValue) | ||
? published.visibleCacheValue | ||
: published.initialValue, true); | ||
notifyTreeFromValues(); | ||
}); | ||
} | ||
@@ -470,13 +495,15 @@ } | ||
} | ||
else { | ||
state.value = | ||
existFormValuesIn(state.name) || formValue !== undefined | ||
? formValue | ||
: initialValue; | ||
else if (existFormValuesIn(state.name) || | ||
formValue !== undefined) { | ||
state.value = formValue; | ||
} | ||
state.initialValue = shared_1.isValid(initialValue) | ||
? initialValue | ||
: shared_1.isValid(formInitialValue) | ||
? formInitialValue | ||
: initialValue; | ||
else if (shared_1.isValid(initialValue)) { | ||
state.value = initialValue; | ||
} | ||
if (shared_1.isValid(initialValue)) { | ||
state.initialValue = initialValue; | ||
} | ||
else if (shared_1.isValid(formInitialValue)) { | ||
state.initialValue = formInitialValue; | ||
} | ||
if (shared_1.isValid(visible)) { | ||
@@ -483,0 +510,0 @@ state.visible = visible; |
@@ -179,2 +179,3 @@ /// <reference types="react" /> | ||
useDirty?: boolean; | ||
initializeLazySyncState?: boolean; | ||
editable?: boolean | ((name: string) => boolean); | ||
@@ -181,0 +182,0 @@ validateFirst?: boolean; |
{ | ||
"name": "@formily/core", | ||
"version": "1.1.0", | ||
"version": "1.1.1-beta.0", | ||
"license": "MIT", | ||
@@ -28,4 +28,4 @@ "main": "lib", | ||
"dependencies": { | ||
"@formily/shared": "^1.1.0", | ||
"@formily/validator": "^1.1.0", | ||
"@formily/shared": "^1.1.1-beta.0", | ||
"@formily/validator": "^1.1.1-beta.0", | ||
"immer": "^3.2.0" | ||
@@ -36,3 +36,3 @@ }, | ||
}, | ||
"gitHead": "05a847d338ae6982eccae2ab9e6727cdac6ba9aa" | ||
"gitHead": "9ca343fc1761cbabedcdaf080da12fedf1303307" | ||
} |
@@ -257,2 +257,14 @@ import { | ||
const initializeLazy = (callback: () => void) => { | ||
if (options.initializeLazySyncState) { | ||
if (initialValueChanged) { | ||
setTimeout(callback) | ||
} else { | ||
callback() | ||
} | ||
} else { | ||
callback() | ||
} | ||
} | ||
if (initializedChanged) { | ||
@@ -281,4 +293,6 @@ heart.publish(LifeCycleTypes.ON_FIELD_INIT, field) | ||
if (!wasHidden) { | ||
setFormValuesIn(path, published.value, true) | ||
notifyTreeFromValues() | ||
initializeLazy(() => { | ||
setFormValuesIn(path, published.value, true) | ||
notifyTreeFromValues() | ||
}) | ||
} | ||
@@ -289,4 +303,6 @@ heart.publish(LifeCycleTypes.ON_FIELD_VALUE_CHANGE, field) | ||
if (!wasHidden) { | ||
setFormInitialValuesIn(path, published.initialValue, true) | ||
notifyTreeFromInitialValues() | ||
initializeLazy(() => { | ||
setFormInitialValuesIn(path, published.initialValue, true) | ||
notifyTreeFromInitialValues() | ||
}) | ||
} | ||
@@ -303,14 +319,18 @@ heart.publish(LifeCycleTypes.ON_FIELD_INITIAL_VALUE_CHANGE, field) | ||
} | ||
deleteFormValuesIn(path, true) | ||
notifyTreeFromValues() | ||
initializeLazy(() => { | ||
deleteFormValuesIn(path, true) | ||
notifyTreeFromValues() | ||
}) | ||
} else { | ||
if (!existFormValuesIn(path)) { | ||
setFormValuesIn( | ||
path, | ||
isValid(published.visibleCacheValue) | ||
? published.visibleCacheValue | ||
: published.initialValue, | ||
true | ||
) | ||
notifyTreeFromValues() | ||
initializeLazy(() => { | ||
setFormValuesIn( | ||
path, | ||
isValid(published.visibleCacheValue) | ||
? published.visibleCacheValue | ||
: published.initialValue, | ||
true | ||
) | ||
notifyTreeFromValues() | ||
}) | ||
} | ||
@@ -341,14 +361,18 @@ } | ||
} | ||
deleteFormValuesIn(path, true) | ||
notifyTreeFromValues() | ||
initializeLazy(() => { | ||
deleteFormValuesIn(path, true) | ||
notifyTreeFromValues() | ||
}) | ||
} else { | ||
if (!existFormValuesIn(path)) { | ||
setFormValuesIn( | ||
path, | ||
isValid(published.visibleCacheValue) | ||
? published.visibleCacheValue | ||
: published.initialValue, | ||
true | ||
) | ||
notifyTreeFromValues() | ||
initializeLazy(() => { | ||
setFormValuesIn( | ||
path, | ||
isValid(published.visibleCacheValue) | ||
? published.visibleCacheValue | ||
: published.initialValue, | ||
true | ||
) | ||
notifyTreeFromValues() | ||
}) | ||
} | ||
@@ -524,14 +548,17 @@ } | ||
state.value = value | ||
} else { | ||
state.value = | ||
existFormValuesIn(state.name) || formValue !== undefined | ||
? formValue | ||
: initialValue | ||
} else if ( | ||
existFormValuesIn(state.name) || | ||
formValue !== undefined | ||
) { | ||
state.value = formValue | ||
} else if (isValid(initialValue)) { | ||
state.value = initialValue | ||
} | ||
// initialValue > formInitialValue | ||
state.initialValue = isValid(initialValue) | ||
? initialValue | ||
: isValid(formInitialValue) | ||
? formInitialValue | ||
: initialValue | ||
if (isValid(initialValue)) { | ||
state.initialValue = initialValue | ||
} else if (isValid(formInitialValue)) { | ||
state.initialValue = formInitialValue | ||
} | ||
if (isValid(visible)) { | ||
@@ -538,0 +565,0 @@ state.visible = visible |
@@ -253,2 +253,3 @@ import { FormPath, FormPathPattern, isFn, Subscribable } from '@formily/shared' | ||
useDirty?: boolean | ||
initializeLazySyncState?: boolean | ||
editable?: boolean | ((name: string) => boolean) | ||
@@ -255,0 +256,0 @@ validateFirst?: boolean |
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
250636
5416
1