mkm/goview_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 解决前进撤回中锁定/隐藏无法正常实现的问题

Browse Source
This commit is contained in:
奔跑的面条 2022-10-01 19:59:57 +08:00
parent ef7dbba3ce
commit 8d81ed3870
2 changed files with 53 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/store/modules/chartEditStore/chartEditStore.ts
View File

@ -532,6 +532,10 @@ export const useChartEditStore = defineStore({
return return
} }
// 取消选中
this.setTargetSelectChart()
// 重新选中
let historyData = HistoryItem.historyData as Array<CreateComponentType | CreateComponentGroupType> let historyData = HistoryItem.historyData as Array<CreateComponentType | CreateComponentGroupType>
if (isArray(historyData)) { if (isArray(historyData)) {
// 选中目标元素，支持多个 // 选中目标元素，支持多个
@ -619,30 +623,36 @@ export const useChartEditStore = defineStore({
return return
} }
switch (HistoryItem.actionType) { // 处理锁定
// 锁定处理 const isLock = HistoryItem.actionType === HistoryActionTypeEnum.LOCK
case HistoryActionTypeEnum.LOCK: const isUnLock = HistoryItem.actionType === HistoryActionTypeEnum.UNLOCK
case HistoryActionTypeEnum.UNLOCK: if (isLock || isUnLock) {
if (!isForward) { if ((isLock && isForward) || (isUnLock && !isForward)) {
// 恢复原来状态 historyData.forEach(item => {
if (HistoryItem.actionType === HistoryActionTypeEnum.LOCK) historyData[0].status.lock = false this.setLock(!item.status.lock, false)
if (HistoryItem.actionType === HistoryActionTypeEnum.UNLOCK) historyData[0].status.lock = true })
return
}
historyData.forEach(item => {
this.setUnLock(false)
})
return return
} }
this.setLock(!historyData[0].status.lock, false)
break
// 隐藏处理 // 处理隐藏
case HistoryActionTypeEnum.HIDE: const isHide = HistoryItem.actionType === HistoryActionTypeEnum.HIDE
case HistoryActionTypeEnum.SHOW: const isShow = HistoryItem.actionType === HistoryActionTypeEnum.SHOW
if (!isForward) { if (isHide || isShow) {
// 恢复原来状态 if ((isHide && isForward) || (isShow && !isForward)) {
if (HistoryItem.actionType === HistoryActionTypeEnum.HIDE) historyData[0].status.hide = false historyData.forEach(item => {
if (HistoryItem.actionType === HistoryActionTypeEnum.SHOW) historyData[0].status.hide = true this.setHide(!item.status.hide, false)
})
return return
} }
this.setHide(!historyData[0].status.hide, false) historyData.forEach(item => {
break this.setShow(false)
})
return
} }
}, },
// * 撤回 // * 撤回
@ -837,10 +847,9 @@ export const useChartEditStore = defineStore({
// 历史记录 // 历史记录
if (isHistory) { if (isHistory) {
chartHistoryStore.createLockHistory( status
[targetItem], ? chartHistoryStore.createLockHistory([targetItem])
status ? HistoryActionTypeEnum.LOCK : HistoryActionTypeEnum.UNLOCK : chartHistoryStore.createUnLockHistory([targetItem])
)
} }
this.updateComponentList(index, targetItem) this.updateComponentList(index, targetItem)
// 锁定添加失焦效果 // 锁定添加失焦效果
@ -871,10 +880,9 @@ export const useChartEditStore = defineStore({
// 历史记录 // 历史记录
if (isHistory) { if (isHistory) {
chartHistoryStore.createHideHistory( status
[targetItem], ? chartHistoryStore.createHideHistory([targetItem])
status ? HistoryActionTypeEnum.HIDE : HistoryActionTypeEnum.SHOW : chartHistoryStore.createShowHistory([targetItem])
)
} }
this.updateComponentList(index, targetItem) this.updateComponentList(index, targetItem)
loadingFinish() loadingFinish()

22
src/store/modules/chartHistoryStore/chartHistoryStore.ts
View File

@ -169,18 +169,20 @@ export const useChartHistoryStore = defineStore({
this.createStackItem(item, HistoryActionTypeEnum.UN_GROUP, HistoryTargetTypeEnum.CHART) this.createStackItem(item, HistoryActionTypeEnum.UN_GROUP, HistoryTargetTypeEnum.CHART)
}, },
// * 锁定记录 // * 锁定记录
createLockHistory( createLockHistory(item: Array<CreateComponentType | CreateComponentGroupType>) {
item: Array<CreateComponentType | CreateComponentGroupType>, this.createStackItem(item, HistoryActionTypeEnum.LOCK, HistoryTargetTypeEnum.CHART)
type: HistoryActionTypeEnum.LOCK | HistoryActionTypeEnum.UNLOCK },
) { // * 解锁记录
this.createStackItem(item, type, HistoryTargetTypeEnum.CHART) createUnLockHistory(item: Array<CreateComponentType | CreateComponentGroupType>) {
this.createStackItem(item, HistoryActionTypeEnum.UNLOCK, HistoryTargetTypeEnum.CHART)
}, },
// * 隐藏记录 // * 隐藏记录
createHideHistory( createHideHistory(item: Array<CreateComponentType | CreateComponentGroupType>) {
item: Array<CreateComponentType | CreateComponentGroupType>, this.createStackItem(item, HistoryActionTypeEnum.HIDE, HistoryTargetTypeEnum.CHART)
type: HistoryActionTypeEnum.HIDE | HistoryActionTypeEnum.SHOW },
) { // * 展示记录
this.createStackItem(item, type, HistoryTargetTypeEnum.CHART) createShowHistory(item: Array<CreateComponentType | CreateComponentGroupType>) {
this.createStackItem(item, HistoryActionTypeEnum.SHOW, HistoryTargetTypeEnum.CHART)
} }
} }
}) })