mirror of
https://github.com/PanJiaChen/vue-element-admin.git
synced 2025-08-13 23:20:12 +08:00
Solve empty menu in relationships (#234)
* Solve empty menu in relationships * fixe style of dashboard * Review changes of Fixe style of dashboard * delete console.log
This commit is contained in:
parent
577148384f
commit
683855a0d4
@ -26,10 +26,6 @@ export default {
|
|||||||
},
|
},
|
||||||
getWindowHeight(event) {
|
getWindowHeight(event) {
|
||||||
this.$store.dispatch('setHeight', document.documentElement.clientHeight)
|
this.$store.dispatch('setHeight', document.documentElement.clientHeight)
|
||||||
},
|
|
||||||
theAction(event) {
|
|
||||||
console.log(event)
|
|
||||||
alert('ok', event)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -74,8 +74,13 @@ export const contextMixin = {
|
|||||||
relations() {
|
relations() {
|
||||||
if (this.$route.params.menuParentUuid !== undefined) {
|
if (this.$route.params.menuParentUuid !== undefined) {
|
||||||
return this.$store.getters.getRelations(this.$route.params.menuParentUuid)
|
return this.$store.getters.getRelations(this.$route.params.menuParentUuid)
|
||||||
|
} else {
|
||||||
|
return this.$store.getters.getRelations(this.menuParentUuid).filter(relations => {
|
||||||
|
if (!relations.hidden) {
|
||||||
|
return relations
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
return this.$store.getters.getRelations(this.menuParentUuid)
|
|
||||||
},
|
},
|
||||||
getterContextMenu() {
|
getterContextMenu() {
|
||||||
return this.$store.getters.getContextMenu(this.containerUuid)
|
return this.$store.getters.getContextMenu(this.containerUuid)
|
||||||
@ -195,7 +200,6 @@ export const contextMixin = {
|
|||||||
methods: {
|
methods: {
|
||||||
showNotification,
|
showNotification,
|
||||||
actionContextMenu(event) {
|
actionContextMenu(event) {
|
||||||
console.log(event)
|
|
||||||
switch (event.srcKey) {
|
switch (event.srcKey) {
|
||||||
case 'f2':
|
case 'f2':
|
||||||
this.$store.dispatch('resetPanelToNew', {
|
this.$store.dispatch('resetPanelToNew', {
|
||||||
@ -395,7 +399,6 @@ export const contextMixin = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
runAction(action) {
|
runAction(action) {
|
||||||
console.log(action)
|
|
||||||
if (action.type === 'action') {
|
if (action.type === 'action') {
|
||||||
// run process or report
|
// run process or report
|
||||||
const fieldNotReady = this.$store.getters.isNotReadyForSubmit(this.$route.meta.uuid)
|
const fieldNotReady = this.$store.getters.isNotReadyForSubmit(this.$route.meta.uuid)
|
||||||
@ -472,14 +475,6 @@ export const contextMixin = {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
console.log('actionaction', action.action)
|
|
||||||
console.log('parentUuid:', this.parentUuid)
|
|
||||||
console.log('containerUuid:', this.containerUuid,)
|
|
||||||
console.log('recordUuid:', this.recordUuid)
|
|
||||||
console.log('panelType:', this.panelType)
|
|
||||||
console.log('isNewRecord:', action.action === 'resetPanelToNew')
|
|
||||||
console.log('tableName:', action.tableName)
|
|
||||||
console.log('recordId:', action.recordId)
|
|
||||||
this.$store.dispatch(action.action, {
|
this.$store.dispatch(action.action, {
|
||||||
parentUuid: this.parentUuid,
|
parentUuid: this.parentUuid,
|
||||||
containerUuid: this.containerUuid,
|
containerUuid: this.containerUuid,
|
||||||
@ -490,7 +485,6 @@ export const contextMixin = {
|
|||||||
recordId: action.recordId
|
recordId: action.recordId
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
console.log(response)
|
|
||||||
if (response && response.isPrivateAccess) {
|
if (response && response.isPrivateAccess) {
|
||||||
this.validatePrivateAccess(response)
|
this.validatePrivateAccess(response)
|
||||||
}
|
}
|
||||||
|
@ -57,6 +57,7 @@ export const menuTableMixin = {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
isProcessTable() {
|
isProcessTable() {
|
||||||
|
console.log(this.$route)
|
||||||
if (this.isProcessMenu) {
|
if (this.isProcessMenu) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@ -215,13 +216,6 @@ export const menuTableMixin = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
tableProcess(process) {
|
tableProcess(process) {
|
||||||
// if (!this.isOption) {
|
|
||||||
// if (this.getDataSelection.length <= 1) {
|
|
||||||
// this.showModal(process)
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// this.showModal(process)
|
|
||||||
// }
|
|
||||||
this.showModal(process)
|
this.showModal(process)
|
||||||
},
|
},
|
||||||
showTotals() {
|
showTotals() {
|
||||||
@ -313,7 +307,7 @@ export const menuTableMixin = {
|
|||||||
exportFileZip({
|
exportFileZip({
|
||||||
header: Header,
|
header: Header,
|
||||||
data,
|
data,
|
||||||
filename: '',
|
title: this.$route.meta.title,
|
||||||
exportType: 'zip'
|
exportType: 'zip'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user