Table: support class-name when type=expand (#12006)

packages/table/src/table-body.js

@@ -57,30 +57,6 @@ export default {
                     const { rowspan, colspan } = this.getSpan(row, column, $index, cellIndex);
                     if (!rowspan || !colspan) {
                       return '';
-                    } else {
-                      if (rowspan === 1 && colspan === 1) {
-                        return (
-                          <td
-                            style={ this.getCellStyle($index, cellIndex, row, column) }
-                            class={ this.getCellClass($index, cellIndex, row, column) }
-                            on-mouseenter={ ($event) => this.handleCellMouseEnter($event, row) }
-                            on-mouseleave={ this.handleCellMouseLeave }>
-                            {
-                              column.renderCell.call(
-                                this._renderProxy,
-                                h,
-                                {
-                                  row,
-                                  column,
-                                  $index,
-                                  store: this.store,
-                                  _self: this.context || this.table.$vnode.context
-                                },
-                                columnsHidden[cellIndex]
-                              )
-                            }
-                          </td>
-                        );
                     } else {
                       return (
                         <td
@@ -107,7 +83,6 @@ export default {
                         </td>
                       );
                     }
-                    }
                   })
                 }
               </tr>,

packages/table/src/table-column.js

@@ -279,7 +279,17 @@ export default {
       sortOrders: this.sortOrders
     });
 
-    objectAssign(column, forced[type] || {});
+    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;
+        }
+      }
+    }
 
     this.columnConfig = column;