drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
fix #4258, Table, Cell
This commit is contained in:
Aresn 2018-11-01 11:18:20 +08:00 • committed by GitHub
commit f4151cfcc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/table/cell.vue
View file

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

8
src/components/table/table-body.vue
View file

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