diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml index ed36fef141e..f77adaaf260 100644 --- a/.github/workflows/check-pr-title.yml +++ b/.github/workflows/check-pr-title.yml @@ -11,7 +11,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: aslafy-z/conventional-pr-title-action@master + - uses: aslafy-z/conventional-pr-title-action@v2.4.0 with: preset: conventional-changelog-angular@^5.0.6 env: diff --git a/packages/core/src/models/Field.ts b/packages/core/src/models/Field.ts index dff6d7ced10..b3b793f9077 100644 --- a/packages/core/src/models/Field.ts +++ b/packages/core/src/models/Field.ts @@ -348,31 +348,11 @@ export class Field< } set value(value: ValueType) { - if (this.destroyed) return - if (!this.initialized) { - if (this.display === 'none') { - this.caches.value = value - return - } - value = getValidFieldDefaultValue(value, this.initialValue) - if (!allowAssignDefaultValue(this.value, value) && !this.designable) { - return - } - } - this.form.setValuesIn(this.path, value) + this.setValue(value) } set initialValue(initialValue: ValueType) { - if (this.destroyed) return - if (!this.initialized) { - if ( - !allowAssignDefaultValue(this.initialValue, initialValue) && - !this.designable - ) { - return - } - } - this.form.setInitialValuesIn(this.path, initialValue) + this.setInitialValue(initialValue) } set selfErrors(messages: FeedbackMessage) { @@ -432,11 +412,31 @@ export class Field< } setValue = (value?: ValueType) => { - this.value = value + if (this.destroyed) return + if (!this.initialized) { + if (this.display === 'none') { + this.caches.value = value + return + } + value = getValidFieldDefaultValue(value, this.initialValue) + if (!allowAssignDefaultValue(this.value, value) && !this.designable) { + return + } + } + this.form.setValuesIn(this.path, value) } setInitialValue = (initialValue?: ValueType) => { - this.initialValue = initialValue + if (this.destroyed) return + if (!this.initialized) { + if ( + !allowAssignDefaultValue(this.initialValue, initialValue) && + !this.designable + ) { + return + } + } + this.form.setInitialValuesIn(this.path, initialValue) } setLoading = (loading?: boolean) => {