center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-08-25 16:10:29 +08:00
commit 83553c85ff
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -75,7 +75,7 @@ import { mapState } from 'vuex'
import ComponentWrapper from './ComponentWrapper'
import { changeStyleWithScale } from '@/components/canvas/utils/translate'
import { uuid } from 'vue-uuid'
import {deepCopy, imgUrlTrans} from '@/components/canvas/utils/utils'
import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils'
import eventBus from '@/components/canvas/utils/eventBus'
import elementResizeDetectorMaker from 'element-resize-detector'
import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
@ -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) {

9
frontend/src/components/canvas/components/Editor/index.vue
View File

@ -189,7 +189,7 @@ import DeDrag from '@/components/DeDrag'
// eslint-disable-next-line no-unused-vars
import { getStyle, getComponentRotatedStyle } from '@/components/canvas/utils/style'
import {_$, imgUrlTrans} from '@/components/canvas/utils/utils'
import { _$, imgUrlTrans } from '@/components/canvas/utils/utils'
import ContextMenu from './ContextMenu'
import MarkLine from './MarkLine'
import Area from './Area'
@ -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) {

3
frontend/src/components/canvas/store/snapshot.js
View File

@ -64,6 +64,9 @@ export default {
state.changeTimes = 0
state.lastSaveSnapshotIndex = deepCopy(state.snapshotIndex)
},
recordChangeTimes(state) {
state.changeTimes++
},
recordStyleChange(state) {
state.styleChangeTimes++
}

1
frontend/src/views/panel/edit/index.vue
View File

@ -783,6 +783,7 @@ export default {
setTimeout(() => {
if (useCache) {
_this.$store.commit('recordSnapshot', 'cache')
_this.$store.commit('recordChangeTimes' )
} else {
_this.$store.commit('refreshSaveStatus')
}