mirror of
https://github.com/dataease/dataease.git
synced 2025-02-26 13:12:54 +08:00
Merge branch 'dev' of github.com:dataease/dataease into dev
This commit is contained in:
commit
83553c85ff
@ -330,6 +330,13 @@ export default {
|
||||
if (component.type === 'view' && this.buttonFilterMap[component.propValue.viewId]) {
|
||||
component.filters = this.buttonFilterMap[component.propValue.viewId]
|
||||
}
|
||||
if (component.type === 'de-tabs') {
|
||||
for (let idx = 0; idx < component.options.tabList.length; idx++) {
|
||||
const ele = component.options.tabList[idx].content
|
||||
if (!ele.type || ele.type !== 'view') continue
|
||||
ele.filters = this.buttonFilterMap[ele.propValue.viewId]
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
buildButtonFilterMap(panelItems, isClear = false) {
|
||||
|
@ -1133,6 +1133,13 @@ export default {
|
||||
if (component.type === 'view' && this.buttonFilterMap[component.propValue.viewId]) {
|
||||
component.filters = this.buttonFilterMap[component.propValue.viewId]
|
||||
}
|
||||
if (component.type === 'de-tabs') {
|
||||
for (let idx = 0; idx < component.options.tabList.length; idx++) {
|
||||
const ele = component.options.tabList[idx].content
|
||||
if (!ele.type || ele.type !== 'view') continue
|
||||
ele.filters = this.buttonFilterMap[ele.propValue.viewId]
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
buildButtonFilterMap(panelItems, isClear = false) {
|
||||
|
@ -64,6 +64,9 @@ export default {
|
||||
state.changeTimes = 0
|
||||
state.lastSaveSnapshotIndex = deepCopy(state.snapshotIndex)
|
||||
},
|
||||
recordChangeTimes(state) {
|
||||
state.changeTimes++
|
||||
},
|
||||
recordStyleChange(state) {
|
||||
state.styleChangeTimes++
|
||||
}
|
||||
|
@ -783,6 +783,7 @@ export default {
|
||||
setTimeout(() => {
|
||||
if (useCache) {
|
||||
_this.$store.commit('recordSnapshot', 'cache')
|
||||
_this.$store.commit('recordChangeTimes' )
|
||||
} else {
|
||||
_this.$store.commit('refreshSaveStatus')
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user