mirror of
https://github.com/PanJiaChen/vue-element-admin.git
synced 2025-08-07 18:25:45 +08:00
add validation the isDisplayedGrid to table (#783)
* add validation the isDisplayedGrid to table * minimalchanges
This commit is contained in:
parent
3ddba455ab
commit
256af25448
@ -248,6 +248,10 @@ export default {
|
||||
return 'skill'
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.generateContextMenu()
|
||||
this.getReferences()
|
||||
},
|
||||
methods: {
|
||||
clickRelation(item) {
|
||||
this.$router.push({
|
||||
|
@ -276,12 +276,6 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.generateContextMenu()
|
||||
},
|
||||
mounted() {
|
||||
this.getReferences()
|
||||
},
|
||||
methods: {
|
||||
showNotification,
|
||||
actionContextMenu(event) {
|
||||
@ -427,7 +421,9 @@ export default {
|
||||
return item
|
||||
}
|
||||
})
|
||||
this.$store.dispatch('setOrder', processAction)
|
||||
if (processAction) {
|
||||
this.$store.dispatch('setOrder', processAction)
|
||||
}
|
||||
}
|
||||
if (this.isWindow && this.isEmptyValue(this.actions.find(element => element.action === 'recordAccess'))) {
|
||||
this.$store.dispatch('addAttribute', {
|
||||
|
@ -202,6 +202,10 @@ export default {
|
||||
return 'skill'
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.generateContextMenu()
|
||||
this.getReferences()
|
||||
},
|
||||
methods: {
|
||||
clickRelation(item) {
|
||||
this.$router.push({
|
||||
|
@ -344,10 +344,12 @@ export default {
|
||||
})
|
||||
},
|
||||
headerLabel(field) {
|
||||
if (field.isMandatory || field.isMandatoryFromLogic) {
|
||||
if (field.isMandatory || field.isMandatoryFromLogic && field.isDisplayedGrid) {
|
||||
return '* ' + field.name
|
||||
}
|
||||
return field.name
|
||||
if (field.isDisplayedGrid) {
|
||||
return field.name
|
||||
}
|
||||
},
|
||||
/**
|
||||
* @param {object} row, row data
|
||||
|
Loading…
x
Reference in New Issue
Block a user