mirror of
https://github.com/PanJiaChen/vue-element-admin.git
synced 2025-08-10 20:39:48 +08:00
Filter by required and available column (#650)
Co-authored-by: Elsio Sanchez <elsiosanche@gmail.com>
This commit is contained in:
parent
822b909e8f
commit
afa34a8c0d
@ -234,7 +234,7 @@ const actions = {
|
|||||||
fieldsList = getters.getFieldsListFromPanel(containerUuid)
|
fieldsList = getters.getFieldsListFromPanel(containerUuid)
|
||||||
}
|
}
|
||||||
const fieldsIncludes = []
|
const fieldsIncludes = []
|
||||||
fieldsList.array.forEach(fieldItem => {
|
fieldsList.forEach(fieldItem => {
|
||||||
const isMandatory = fieldItem.isMandatory || fieldItem.isMandatoryFromLogic
|
const isMandatory = fieldItem.isMandatory || fieldItem.isMandatoryFromLogic
|
||||||
if (isMandatory) {
|
if (isMandatory) {
|
||||||
fieldsIncludes.push(fieldItem.columnName)
|
fieldsIncludes.push(fieldItem.columnName)
|
||||||
@ -260,9 +260,8 @@ const actions = {
|
|||||||
fieldsList = getters.getFieldsListFromPanel(containerUuid)
|
fieldsList = getters.getFieldsListFromPanel(containerUuid)
|
||||||
}
|
}
|
||||||
const fieldsIncludes = []
|
const fieldsIncludes = []
|
||||||
fieldsList.foreach(fieldItem => {
|
fieldsList.forEach(fieldItem => {
|
||||||
const isDisplayed = fieldItem.isDisplayed && fieldItem.isDisplayedFromLogic && !fieldItem.isKey
|
const isDisplayed = fieldItem.isDisplayed && fieldItem.isDisplayedFromLogic && !fieldItem.isKey
|
||||||
// Verify for displayed and is active
|
|
||||||
if (fieldItem.isActive && isDisplayed) {
|
if (fieldItem.isActive && isDisplayed) {
|
||||||
fieldsIncludes.push(fieldItem.columnName)
|
fieldsIncludes.push(fieldItem.columnName)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user