Merge pull request #4753 from RookieZoe/2.0-fix#4258

fix #4258, Table, Cell

src/components/table/cell.vue

@@ -18,23 +18,23 @@
                 <Icon type="ios-arrow-forward"></Icon>
             </div>
         </template>
-        <Cell
+        <table-expand
             v-if="renderType === 'render'"
             :row="row"
             :column="column"
             :index="index"
-            :render="column.render"></Cell>
+            :render="column.render"></table-expand>
     </div>
 </template>
 <script>
-    import Cell from './expand';
+    import TableExpand from './expand';
     import Icon from '../icon/icon.vue';
     import Checkbox from '../checkbox/checkbox.vue';
     import Tooltip from '../tooltip/tooltip.vue';
 
     export default {
         name: 'TableCell',
-        components: { Icon, Checkbox, Cell, Tooltip },
+        components: { Icon, Checkbox, TableExpand, Tooltip },
         props: {
             prefixCls: String,
             row: Object,

src/components/table/table-body.vue

@@ -14,7 +14,7 @@
                     @click.native="clickCurrentRow(row._index)"
                     @dblclick.native.stop="dblclickCurrentRow(row._index)">
                     <td v-for="column in columns" :class="alignCls(column, row)">
-                        <Cell
+                        <table-cell
                             :fixed="fixed"
                             :prefix-cls="prefixCls"
                             :row="row"
@@ -25,7 +25,7 @@
                             :checked="rowChecked(row._index)"
                             :disabled="rowDisabled(row._index)"
                             :expanded="rowExpanded(row._index)"
-                        ></Cell>
+                        ></table-cell>
                     </td>
                 </table-tr>
                 <tr v-if="rowExpanded(row._index)" :class="{[prefixCls + '-expanded-hidden']: fixed}">
@@ -40,14 +40,14 @@
 <script>
     // todo :key="row"
     import TableTr from './table-tr.vue';
-    import Cell from './cell.vue';
+    import TableCell from './cell.vue';
     import Expand from './expand.js';
     import Mixin from './mixin';
 
     export default {
         name: 'TableBody',
         mixins: [ Mixin ],
-        components: { Cell, Expand, TableTr },
+        components: { TableCell, Expand, TableTr },
         props: {
             prefixCls: String,
             styleObject: Object,