Skip to content

Commit

Permalink
Merge pull request #8285 from dataease/pr@dev@fix_fullscreen_clean_fi…
Browse files Browse the repository at this point in the history
…lter

fix(过滤器): 全屏会清空过滤器中内容 close #8076
  • Loading branch information
fit2cloud-chenyw committed Mar 4, 2024
2 parents 54a11a3 + b18a475 commit e9c19b0
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion core/frontend/src/components/widget/deWidget/DeDate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ export default {
if (this.refreshHandler()) {
return
}
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]?.length
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]
if (this.element.options.value || existLastValidFilters) {
this.values = this.fillValueDerfault()
this.dateChange(this.values)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default {
}
},
created() {
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]?.length
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]
if (this.element.options.value || existLastValidFilters) {
this.value = this.fillValueDerfault()
this.search()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export default {
}
},
created() {
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]?.length
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]
if ((this.element.options.value && this.element.options.value.length > 0) || existLastValidFilters) {
const values = this.fillValueDerfault()
this.form.min = values[0]
Expand Down
2 changes: 1 addition & 1 deletion core/frontend/src/components/widget/deWidget/DeSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ export default {
},
initLoad() {
this.initOptions(this.fillFirstSelected)
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]?.length
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]
if ((this.element.options.value || existLastValidFilters) && !this.selectFirst) {
this.value = this.fillValueDerfault()
this.changeValue(this.value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ export default {
initLoad() {
this.value = this.element.options.attrs.multiple ? [] : null
this.initOptions()
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]?.length
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]
if (this.element.options.value || existLastValidFilters) {
this.value = this.fillValueDerfault()
this.changeValue(this.value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ export default {
this.value = this.fillValueDerfault()
this.data = []
this.initOptions()
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]?.length
const existLastValidFilters = this.$store.state.lastValidFilters && this.$store.state.lastValidFilters[this.element.id]
if (this.element.options.value || existLastValidFilters) {
this.value = this.fillValueDerfault()
this.changeValue(this.value)
Expand Down

0 comments on commit e9c19b0

Please sign in to comment.