|
@@ -280,16 +280,19 @@ export default {
|
|
|
});
|
|
|
|
|
|
let source = forced[type] || {};
|
|
|
- for (let prop in source) {
|
|
|
- if (source.hasOwnProperty(prop)) {
|
|
|
- let value = source[prop];
|
|
|
- if (value !== undefined) {
|
|
|
- column[prop] = prop === 'className'
|
|
|
- ? `${column[prop]} ${value}`
|
|
|
- : value;
|
|
|
+ Object.keys(source).forEach((prop) => {
|
|
|
+ let value = source[prop];
|
|
|
+ if (value !== undefined) {
|
|
|
+ if (prop === 'renderHeader') {
|
|
|
+ if (type === 'selection' && column[prop]) {
|
|
|
+ console.warn('[Element Warn][TableColumn]Selection column doesn\'t allow to set render-header function.');
|
|
|
+ } else {
|
|
|
+ value = column[prop] || value;
|
|
|
+ }
|
|
|
}
|
|
|
+ column[prop] = prop === 'className' ? `${column[prop]} ${value}` : value;
|
|
|
}
|
|
|
- }
|
|
|
+ });
|
|
|
|
|
|
this.columnConfig = column;
|
|
|
|