Commit 32acc360 authored by 杨柠瑞's avatar 杨柠瑞

coding

parent 79241eaa
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
style="width: 200px;" style="width: 200px;"
class="filter-item" class="filter-item"
:placeholder="filter.placeholder" :placeholder="filter.placeholder"
v-if="filter.isShow"
v-model="listQuery.filters[schema['modelUnderscore']][getFilterColumn(filter)][getFilterOper(filter)]"> v-model="listQuery.filters[schema['modelUnderscore']][getFilterColumn(filter)][getFilterOper(filter)]">
</el-input> </el-input>
</span> </span>
...@@ -344,6 +345,7 @@ ...@@ -344,6 +345,7 @@
filters[tableName] = Object.assign(filters[tableName], filter) filters[tableName] = Object.assign(filters[tableName], filter)
}) })
delete filters[tableName]['placeholder'] delete filters[tableName]['placeholder']
delete filters[tableName]['isShow']
self.$set(self.listQuery, 'filters', filters) self.$set(self.listQuery, 'filters', filters)
} }
...@@ -461,7 +463,7 @@ ...@@ -461,7 +463,7 @@
_.forEach(newFilters, function(columns, columnsKey) { _.forEach(newFilters, function(columns, columnsKey) {
_.forEach(newFilters[columnsKey], function(column, columnKey) { _.forEach(newFilters[columnsKey], function(column, columnKey) {
if (columns[columnKey][Object.keys(column)] === '%%' || columns[columnKey][Object.keys(column)] === '' || if (columns[columnKey][Object.keys(column)] === '%%' || columns[columnKey][Object.keys(column)] === '' ||
columns[columnKey][Object.keys(column)] === null || columns[columnKey][Object.keys(column)].length === 0) { columns[columnKey][Object.keys(column)] === null) {
delete (columns[columnKey]) delete (columns[columnKey])
} }
}) })
...@@ -591,7 +593,7 @@ ...@@ -591,7 +593,7 @@
const keys = Object.keys(filter) const keys = Object.keys(filter)
let column = null let column = null
_.each(keys, function(key) { _.each(keys, function(key) {
if (key !== 'placeholder') { if (key !== 'placeholder' && key !== 'isShow') {
column = key column = key
return 0 return 0
} }
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
}, },
data() { data() {
return { return {
showUserColumns: ['mobile', 'loginid', 'username', 'email'], showUserColumns: ['mobile', 'loginid', 'username', 'email', 'securityLevel'],
userFilters: [ userFilters: [
{ placeholder: '过滤手机号', 'mobile': { 'like': '' }}, { placeholder: '过滤手机号', 'mobile': { 'like': '' }, isShow: true },
{ placeholder: '过滤用户名', 'username': { 'equalTo': '' }} { placeholder: '过滤用户名', 'username': { 'equalTo': '' }, isShow: true }
] ]
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment