提交 22e0d8f3 authored 作者: wangjiahao's avatar wangjiahao

fix:1.重做按钮不生效问题;2.输入文字保存按钮依然是灰的问题

上级 37977644
...@@ -1176,7 +1176,7 @@ export default { ...@@ -1176,7 +1176,7 @@ export default {
if (this.canvasStyleData.auxiliaryMatrix) { if (this.canvasStyleData.auxiliaryMatrix) {
this.recordMatrixCurStyle() this.recordMatrixCurStyle()
} }
this.hasMove && this.$store.commit('recordSnapshot') this.hasMove && this.$store.commit('recordSnapshot', 'handleUp')
// 记录snapshot后 移动已记录设置为false // 记录snapshot后 移动已记录设置为false
this.hasMove = false this.hasMove = false
......
...@@ -87,13 +87,13 @@ export default { ...@@ -87,13 +87,13 @@ export default {
paste() { paste() {
this.$store.commit('paste', true) this.$store.commit('paste', true)
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'paste')
}, },
deleteComponent() { deleteComponent() {
this.deleteCurCondition() this.deleteCurCondition()
this.$store.commit('deleteComponent') this.$store.commit('deleteComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'deleteComponent')
this.$store.commit('setCurComponent', { component: null, index: null }) this.$store.commit('setCurComponent', { component: null, index: null })
}, },
...@@ -106,22 +106,22 @@ export default { ...@@ -106,22 +106,22 @@ export default {
upComponent() { upComponent() {
this.$store.commit('upComponent') this.$store.commit('upComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'upComponent')
}, },
downComponent() { downComponent() {
this.$store.commit('downComponent') this.$store.commit('downComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'downComponent')
}, },
topComponent() { topComponent() {
this.$store.commit('topComponent') this.$store.commit('topComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'topComponent')
}, },
bottomComponent() { bottomComponent() {
this.$store.commit('bottomComponent') this.$store.commit('bottomComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'bottomComponent')
} }
} }
} }
......
...@@ -86,13 +86,13 @@ export default { ...@@ -86,13 +86,13 @@ export default {
paste() { paste() {
this.$store.commit('paste', true) this.$store.commit('paste', true)
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','paste')
}, },
deleteComponent() { deleteComponent() {
this.deleteCurCondition() this.deleteCurCondition()
this.$store.commit('deleteComponent') this.$store.commit('deleteComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','deleteComponent')
this.$store.commit('setCurComponent', { component: null, index: null }) this.$store.commit('setCurComponent', { component: null, index: null })
}, },
...@@ -105,22 +105,22 @@ export default { ...@@ -105,22 +105,22 @@ export default {
upComponent() { upComponent() {
this.$store.commit('upComponent') this.$store.commit('upComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','upComponent')
}, },
downComponent() { downComponent() {
this.$store.commit('downComponent') this.$store.commit('downComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','downComponent')
}, },
topComponent() { topComponent() {
this.$store.commit('topComponent') this.$store.commit('topComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','topComponent')
}, },
bottomComponent() { bottomComponent() {
this.$store.commit('bottomComponent') this.$store.commit('bottomComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','bottomComponent')
}, },
linkageSetting() { linkageSetting() {
debugger debugger
......
...@@ -292,17 +292,17 @@ export default { ...@@ -292,17 +292,17 @@ export default {
}, },
deep: true deep: true
}, },
canvasStyleData: { // canvasStyleData: {
handler(newVal, oldVla) { // handler(newVal, oldVla) {
// 第一次变化 不需要 重置边界 待改进 // // 第一次变化 不需要 重置边界 待改进
if (this.changeIndex++ > 0) { // if (this.changeIndex++ > 0) {
this.resizeParentBounds() // // this.resizeParentBounds()
this.$store.state.styleChangeTimes++ // this.$store.state.styleChangeTimes++
} // }
// this.changeScale() // // this.changeScale()
}, // },
deep: true // deep: true
}, // },
componentData: { componentData: {
handler(newVal, oldVla) { handler(newVal, oldVla) {
// console.log('11111') // console.log('11111')
......
...@@ -154,8 +154,7 @@ export default { ...@@ -154,8 +154,7 @@ export default {
} }
}, },
styleChange() { styleChange() {
debugger this.$store.commit('recordStyleChange')
this.$store.state.styleChangeTimes++
} }
} }
} }
......
...@@ -206,7 +206,7 @@ export default { ...@@ -206,7 +206,7 @@ export default {
} }
}, },
styleChange() { styleChange() {
this.$store.state.styleChangeTimes++ this.$store.commit('recordStyleChange')
} }
} }
} }
......
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
} }
}, },
styleChange() { styleChange() {
this.$store.state.styleChangeTimes++ this.$store.commit('recordStyleChange')
} }
} }
} }
......
...@@ -214,12 +214,12 @@ export default { ...@@ -214,12 +214,12 @@ export default {
compose() { compose() {
this.$store.commit('compose') this.$store.commit('compose')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','compose')
}, },
decompose() { decompose() {
this.$store.commit('decompose') this.$store.commit('decompose')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','decompose')
}, },
undo() { undo() {
...@@ -267,7 +267,7 @@ export default { ...@@ -267,7 +267,7 @@ export default {
} }
}) })
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','handleFileChange')
} }
img.src = fileResult img.src = fileResult
...@@ -306,7 +306,7 @@ export default { ...@@ -306,7 +306,7 @@ export default {
clearCanvas() { clearCanvas() {
this.$store.commit('setComponentData', []) this.$store.commit('setComponentData', [])
this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING) this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','clearCanvas')
}, },
handlePreviewChange() { handlePreviewChange() {
......
...@@ -67,6 +67,7 @@ export default { ...@@ -67,6 +67,7 @@ export default {
methods: { methods: {
handleInput(e) { handleInput(e) {
this.$emit('input', this.element, e.target.innerHTML) this.$emit('input', this.element, e.target.innerHTML)
this.$store.commit('recordStyleChange')
}, },
handleKeydown(e) { handleKeydown(e) {
......
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
component.style.left = e.offsetX component.style.left = e.offsetX
component.id = generateID() component.id = generateID()
this.$store.commit('addComponent', { component }) this.$store.commit('addComponent', { component })
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','handleDrop')
}, },
handleDragOver(e) { handleDragOver(e) {
......
...@@ -52,6 +52,11 @@ export default { ...@@ -52,6 +52,11 @@ export default {
refreshSaveStatus(state) { refreshSaveStatus(state) {
state.changeTimes = 0 state.changeTimes = 0
state.lastSaveSnapshotIndex = deepCopy(state.snapshotIndex) state.lastSaveSnapshotIndex = deepCopy(state.snapshotIndex)
},
recordStyleChange(state) {
if (state.curComponent) {
state.styleChangeTimes++
}
} }
} }
} }
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
} }
}, },
styleChange() { styleChange() {
this.$store.state.styleChangeTimes++ this.$store.commit('recordStyleChange')
} }
} }
} }
......
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
} }
this.setCondition() this.setCondition()
this.styleChange() this.$store.commit('recordStyleChange')
}) })
}, },
setCondition() { setCondition() {
...@@ -177,7 +177,7 @@ export default { ...@@ -177,7 +177,7 @@ export default {
} }
}, },
styleChange() { styleChange() {
this.$store.state.styleChangeTimes++ this.$store.commit('recordStyleChange')
} }
} }
} }
......
...@@ -104,7 +104,7 @@ export default { ...@@ -104,7 +104,7 @@ export default {
this.inDraw && this.$store.commit('addViewFilter', param) this.inDraw && this.$store.commit('addViewFilter', param)
}, },
styleChange() { styleChange() {
this.$store.state.styleChangeTimes++ this.$store.commit('recordStyleChange')
} }
} }
......
...@@ -211,7 +211,7 @@ export default { ...@@ -211,7 +211,7 @@ export default {
// return data[this.defaultProp.label].indexOf(value) !== -1 // return data[this.defaultProp.label].indexOf(value) !== -1
// }, // },
styleChange() { styleChange() {
this.$store.state.styleChangeTimes++ this.$store.commit('recordStyleChange')
} }
} }
......
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
} }
}) })
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','handleFileChange')
} }
img.src = fileResult img.src = fileResult
......
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
const canvasStyleData = deepCopy(this.canvasStyleData) const canvasStyleData = deepCopy(this.canvasStyleData)
canvasStyleData.panel = this.panel canvasStyleData.panel = this.panel
this.$store.commit('setCanvasStyle', canvasStyleData) this.$store.commit('setCanvasStyle', canvasStyleData)
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','commitStyle')
}, },
onChangeType() { onChangeType() {
this.commitStyle() this.commitStyle()
......
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
const canvasStyleData = deepCopy(this.canvasStyleData) const canvasStyleData = deepCopy(this.canvasStyleData)
canvasStyleData.panel = this.panel canvasStyleData.panel = this.panel
this.$store.commit('setCanvasStyle', canvasStyleData) this.$store.commit('setCanvasStyle', canvasStyleData)
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','onChangePanelStyle')
} }
} }
} }
......
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
}, },
subjectChange() { subjectChange() {
this.$store.commit('setCanvasStyle', JSON.parse(this.subjectItem.details)) this.$store.commit('setCanvasStyle', JSON.parse(this.subjectItem.details))
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','subjectChange')
bus.$emit('onSubjectChange') bus.$emit('onSubjectChange')
}, },
templateEdit() { templateEdit() {
......
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
chart.customFilter = JSON.stringify(this.chart.customFilter) chart.customFilter = JSON.stringify(this.chart.customFilter)
canvasStyleData.chart = chart canvasStyleData.chart = chart
this.$store.commit('setCanvasStyle', canvasStyleData) this.$store.commit('setCanvasStyle', canvasStyleData)
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot','save')
} }
} }
} }
......
...@@ -311,6 +311,7 @@ export default { ...@@ -311,6 +311,7 @@ export default {
this.init(newVal.id) this.init(newVal.id)
}, },
'$store.state.styleChangeTimes'() { '$store.state.styleChangeTimes'() {
// console.log('styleChangeTimes' + this.$store.state.styleChangeTimes)
if (this.$store.state.styleChangeTimes > 0) { if (this.$store.state.styleChangeTimes > 0) {
this.destroyTimeMachine() this.destroyTimeMachine()
this.recordStyleChange(this.$store.state.styleChangeTimes) this.recordStyleChange(this.$store.state.styleChangeTimes)
...@@ -383,7 +384,7 @@ export default { ...@@ -383,7 +384,7 @@ export default {
// this.$store.commit('setComponentData', this.resetID(JSON.parse(response.data.panelData))) // this.$store.commit('setComponentData', this.resetID(JSON.parse(response.data.panelData)))
const panelStyle = JSON.parse(response.data.panelStyle) const panelStyle = JSON.parse(response.data.panelStyle)
this.$store.commit('setCanvasStyle', panelStyle) this.$store.commit('setCanvasStyle', panelStyle)
this.$store.commit('recordSnapshot')// 记录快照 this.$store.commit('recordSnapshot', 'init')// 记录快照
// 刷新联动信息 // 刷新联动信息
getPanelAllLinkageInfo(panelId).then(rsp => { getPanelAllLinkageInfo(panelId).then(rsp => {
this.$store.commit('setNowPanelTrackInfo', rsp.data) this.$store.commit('setNowPanelTrackInfo', rsp.data)
...@@ -493,7 +494,7 @@ export default { ...@@ -493,7 +494,7 @@ export default {
component.style.left = this.getPositionX(e.layerX) component.style.left = this.getPositionX(e.layerX)
component.id = newComponentId component.id = newComponentId
this.$store.commit('addComponent', { component }) this.$store.commit('addComponent', { component })
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'handleDrop')
this.clearCurrentInfo() this.clearCurrentInfo()
// // 文字组件 // // 文字组件
...@@ -545,7 +546,7 @@ export default { ...@@ -545,7 +546,7 @@ export default {
// this.$store.commit('addComponent', { component }) // this.$store.commit('addComponent', { component })
this.$store.commit('setComponentWithId', component) this.$store.commit('setComponentWithId', component)
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'sureFilter')
this.cancelFilter() this.cancelFilter()
}, },
reFreshComponent(component) { reFreshComponent(component) {
...@@ -625,7 +626,7 @@ export default { ...@@ -625,7 +626,7 @@ export default {
} }
}) })
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'handleFileChange')
} }
img.src = fileResult img.src = fileResult
...@@ -677,7 +678,7 @@ export default { ...@@ -677,7 +678,7 @@ export default {
component.style.left = 600 component.style.left = 600
component.id = newComponentId component.id = newComponentId
this.$store.commit('addComponent', { component }) this.$store.commit('addComponent', { component })
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'newViewInfo')
this.clearCurrentInfo() this.clearCurrentInfo()
this.$store.commit('setCurComponent', { component: component, index: this.componentData.length - 1 }) this.$store.commit('setCurComponent', { component: component, index: this.componentData.length - 1 })
...@@ -703,7 +704,7 @@ export default { ...@@ -703,7 +704,7 @@ export default {
recordStyleChange(index) { recordStyleChange(index) {
this.timeMachine = setTimeout(() => { this.timeMachine = setTimeout(() => {
if (index === this.$store.state.styleChangeTimes) { if (index === this.$store.state.styleChangeTimes) {
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot', 'recordStyleChange')
this.$store.state.styleChangeTimes = 0 this.$store.state.styleChangeTimes = 0
} }
this.destroyTimeMachine() this.destroyTimeMachine()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论