other / mew-iview

Commit f4151cfcc1e01355d6fe0ec99198e1a2fc94a2cf

Authored by Aresn
Committed by GitHub
2 parents 62725de3 b55f59c6

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

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