Table: the props user defined won't be overrided when column's type i…

…s set.
ElemeFE · Sep 26, 2018 · 8b21d21 · 8b21d21
1 parent 143f0c6
commit 8b21d21
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/table/src/table-column.js b/packages/table/src/table-column.js
@@ -283,10 +283,10 @@ export default {
     for (let prop in source) {
       if (source.hasOwnProperty(prop)) {
         let value = source[prop];
-        if (value !== undefined) {
-          column[prop] = prop === 'className'
-            ? `${column[prop]} ${value}`
-            : value;
+        if (prop === 'className') {
+          column[prop] = `${column[prop]} ${value}`;
+        } else if (column[prop] === undefined || column[prop] === null) {
+          column[prop] = value;
         }
       }
     }