Commit b55f59c6cbe197aab0c138deec0fbc40626ddc24
1 parent
69a84401
fix #4258
Showing
2 changed files
with
8 additions
and
8 deletions
Show diff stats
src/components/table/cell.vue
| @@ -18,23 +18,23 @@ | @@ -18,23 +18,23 @@ | ||
| 18 | <Icon type="ios-arrow-forward"></Icon> | 18 | <Icon type="ios-arrow-forward"></Icon> |
| 19 | </div> | 19 | </div> |
| 20 | </template> | 20 | </template> |
| 21 | - <Cell | 21 | + <table-expand |
| 22 | v-if="renderType === 'render'" | 22 | v-if="renderType === 'render'" |
| 23 | :row="row" | 23 | :row="row" |
| 24 | :column="column" | 24 | :column="column" |
| 25 | :index="index" | 25 | :index="index" |
| 26 | - :render="column.render"></Cell> | 26 | + :render="column.render"></table-expand> |
| 27 | </div> | 27 | </div> |
| 28 | </template> | 28 | </template> |
| 29 | <script> | 29 | <script> |
| 30 | - import Cell from './expand'; | 30 | + import TableExpand from './expand'; |
| 31 | import Icon from '../icon/icon.vue'; | 31 | import Icon from '../icon/icon.vue'; |
| 32 | import Checkbox from '../checkbox/checkbox.vue'; | 32 | import Checkbox from '../checkbox/checkbox.vue'; |
| 33 | import Tooltip from '../tooltip/tooltip.vue'; | 33 | import Tooltip from '../tooltip/tooltip.vue'; |
| 34 | 34 | ||
| 35 | export default { | 35 | export default { |
| 36 | name: 'TableCell', | 36 | name: 'TableCell', |
| 37 | - components: { Icon, Checkbox, Cell, Tooltip }, | 37 | + components: { Icon, Checkbox, TableExpand, Tooltip }, |
| 38 | props: { | 38 | props: { |
| 39 | prefixCls: String, | 39 | prefixCls: String, |
| 40 | row: Object, | 40 | row: Object, |
src/components/table/table-body.vue
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | @click.native="clickCurrentRow(row._index)" | 14 | @click.native="clickCurrentRow(row._index)" |
| 15 | @dblclick.native.stop="dblclickCurrentRow(row._index)"> | 15 | @dblclick.native.stop="dblclickCurrentRow(row._index)"> |
| 16 | <td v-for="column in columns" :class="alignCls(column, row)"> | 16 | <td v-for="column in columns" :class="alignCls(column, row)"> |
| 17 | - <Cell | 17 | + <table-cell |
| 18 | :fixed="fixed" | 18 | :fixed="fixed" |
| 19 | :prefix-cls="prefixCls" | 19 | :prefix-cls="prefixCls" |
| 20 | :row="row" | 20 | :row="row" |
| @@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
| 25 | :checked="rowChecked(row._index)" | 25 | :checked="rowChecked(row._index)" |
| 26 | :disabled="rowDisabled(row._index)" | 26 | :disabled="rowDisabled(row._index)" |
| 27 | :expanded="rowExpanded(row._index)" | 27 | :expanded="rowExpanded(row._index)" |
| 28 | - ></Cell> | 28 | + ></table-cell> |
| 29 | </td> | 29 | </td> |
| 30 | </table-tr> | 30 | </table-tr> |
| 31 | <tr v-if="rowExpanded(row._index)" :class="{[prefixCls + '-expanded-hidden']: fixed}"> | 31 | <tr v-if="rowExpanded(row._index)" :class="{[prefixCls + '-expanded-hidden']: fixed}"> |
| @@ -40,14 +40,14 @@ | @@ -40,14 +40,14 @@ | ||
| 40 | <script> | 40 | <script> |
| 41 | // todo :key="row" | 41 | // todo :key="row" |
| 42 | import TableTr from './table-tr.vue'; | 42 | import TableTr from './table-tr.vue'; |
| 43 | - import Cell from './cell.vue'; | 43 | + import TableCell from './cell.vue'; |
| 44 | import Expand from './expand.js'; | 44 | import Expand from './expand.js'; |
| 45 | import Mixin from './mixin'; | 45 | import Mixin from './mixin'; |
| 46 | 46 | ||
| 47 | export default { | 47 | export default { |
| 48 | name: 'TableBody', | 48 | name: 'TableBody', |
| 49 | mixins: [ Mixin ], | 49 | mixins: [ Mixin ], |
| 50 | - components: { Cell, Expand, TableTr }, | 50 | + components: { TableCell, Expand, TableTr }, |
| 51 | props: { | 51 | props: { |
| 52 | prefixCls: String, | 52 | prefixCls: String, |
| 53 | styleObject: Object, | 53 | styleObject: Object, |