github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2473 from QingWei-Li/fix/table-column-key 

Table: fix columnKey, fixed #2322
pull/2505/head
baiyaaaaa 2017-01-18 17:06:27 +08:00 committed by GitHub
parent 5e23dd3cd5 bfb4c9c3f1
commit 8453db88e5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/table/src/table-column.js
View File

@ -182,8 +182,7 @@ export default {
created() { created() {
this.customRender = this.$options.render; this.customRender = this.$options.render;
this.$options.render = h => h('div', this.$slots.default); this.$options.render = h => h('div', this.$slots.default);
this.columnId = (this.$parent.tableId || (this.$parent.columnId + '_')) + 'column_' + columnIdSeed++;
let columnId = this.columnId = this.columnKey || ((this.$parent.tableId || (this.$parent.columnId + '_')) + 'column_' + columnIdSeed++);
let parent = this.$parent; let parent = this.$parent;
let owner = this.owner; let owner = this.owner;
@ -210,7 +209,8 @@ export default {
let isColumnGroup = false; let isColumnGroup = false;
let column = getDefaultColumn(type, { let column = getDefaultColumn(type, {
id: columnId, id: this.columnId,
columnKey: this.columnKey,
label: this.label, label: this.label,
className: this.className, className: this.className,
property: this.prop || this.property, property: this.prop || this.property,

8
packages/table/src/table-store.js
View File

@ -152,15 +152,17 @@ TableStore.prototype.mutations = {
} }
const prop = column.property; const prop = column.property;
const filters = [];
if (prop) { if (prop) {
states.filters[column.id] = values; states.filters[column.id] = values;
filters[column.columnKey || column.id] = values;
} }
let data = states._data; let data = states._data;
const filters = states.filters;
Object.keys(filters).forEach((columnId) => { Object.keys(states.filters).forEach((columnId) => {
const values = filters[columnId]; const values = states.filters[columnId];
if (!values || values.length === 0) return; if (!values || values.length === 0) return;
const column = getColumnById(this.states, columnId); const column = getColumnById(this.states, columnId);
if (column && column.filterMethod) { if (column && column.filterMethod) {