1
0
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:
Elsio Sanchez 2021-03-09 09:19:56 -04:00 committed by GitHub
parent 822b909e8f
commit afa34a8c0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -234,7 +234,7 @@ const actions = {
fieldsList = getters.getFieldsListFromPanel(containerUuid)
}
const fieldsIncludes = []
fieldsList.array.forEach(fieldItem => {
fieldsList.forEach(fieldItem => {
const isMandatory = fieldItem.isMandatory || fieldItem.isMandatoryFromLogic
if (isMandatory) {
fieldsIncludes.push(fieldItem.columnName)
@ -260,9 +260,8 @@ const actions = {
fieldsList = getters.getFieldsListFromPanel(containerUuid)
}
const fieldsIncludes = []
fieldsList.foreach(fieldItem => {
fieldsList.forEach(fieldItem => {
const isDisplayed = fieldItem.isDisplayed && fieldItem.isDisplayedFromLogic && !fieldItem.isKey
// Verify for displayed and is active
if (fieldItem.isActive && isDisplayed) {
fieldsIncludes.push(fieldItem.columnName)
}