Table column add new prop: display

src/components/table/cell.vue

@@ -35,6 +35,7 @@
             v-if="renderType === 'slot'"
             :row="row"
             :column="column"
+            :display="column.display || 'block'"
             :index="index"></table-slot>
     </div>
 </template>

src/components/table/slot.js

@@ -8,13 +8,23 @@ export default {
         column: {
             type: Object,
             default: null
+        },
+        display: {
+            type: String,
+            default: 'block'
         }
     },
     render: (h, ctx) => {
-        return h('div', ctx.injections.tableRoot.$scopedSlots[ctx.props.column.slot]({
+        return h('div', {
+            'class': {
+                'ivu-table-cell-slot': true,
+                'ivu-table-cell-slot-inline': ctx.props.display === 'inline',
+                'ivu-table-cell-slot-inline-block': ctx.props.display === 'inline-block'
+            }
+        }, ctx.injections.tableRoot.$scopedSlots[ctx.props.column.slot]({
             row: ctx.props.row,
             column: ctx.props.column,
             index: ctx.props.index
         }));
     }
-};
+};

src/styles/components/table.less

@@ -289,6 +289,14 @@
                 height: 16px;
             }
         }
+        &-slot{
+            &-inline{
+                display: inline;
+            }
+            &-inline-block{
+                display: inline-block;
+            }
+        }
     }
     &-hidden{
         visibility: hidden;