Commit 847c0d430216e51aaefc7f3221daffb47e127322

Authored by 梁灏
1 parent a367d3e4

fixed #4158

examples/routers/table.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 - <Table ref="currentRowTable" :columns="columns3" :data="data1" :draggable="true" @on-drag-drop="onDragDrop"></Table> 3 + <Table tooltip-theme="light" ref="currentRowTable" :columns="columns3" :data="data1" :draggable="true" @on-drag-drop="onDragDrop"></Table>
4 <Button @click="handleClearCurrentRow">Clear</Button> 4 <Button @click="handleClearCurrentRow">Clear</Button>
5 </div> 5 </div>
6 </template> 6 </template>
src/components/table/cell.vue
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <template v-if="renderType === 'html'"><span v-html="row[column.key]"></span></template> 7 <template v-if="renderType === 'html'"><span v-html="row[column.key]"></span></template>
8 <template v-if="renderType === 'normal'"> 8 <template v-if="renderType === 'normal'">
9 <template v-if="column.tooltip"> 9 <template v-if="column.tooltip">
10 - <Tooltip transfer :content="row[column.key]" :disabled="!showTooltip" :max-width="300" class="ivu-table-cell-tooltip"> 10 + <Tooltip transfer :content="row[column.key]" :theme="tableRoot.tooltipTheme" :disabled="!showTooltip" :max-width="300" class="ivu-table-cell-tooltip">
11 <span ref="content" @mouseenter="handleTooltipIn" @mouseleave="handleTooltipOut" class="ivu-table-cell-tooltip-content">{{ row[column.key] }}</span> 11 <span ref="content" @mouseenter="handleTooltipIn" @mouseleave="handleTooltipOut" class="ivu-table-cell-tooltip-content">{{ row[column.key] }}</span>
12 </Tooltip> 12 </Tooltip>
13 </template> 13 </template>
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
41 export default { 41 export default {
42 name: 'TableCell', 42 name: 'TableCell',
43 components: { Icon, Checkbox, TableExpand, TableSlot, Tooltip }, 43 components: { Icon, Checkbox, TableExpand, TableSlot, Tooltip },
  44 + inject: ['tableRoot'],
44 props: { 45 props: {
45 prefixCls: String, 46 prefixCls: String,
46 row: Object, 47 row: Object,
src/components/table/table.vue
@@ -190,6 +190,12 @@ @@ -190,6 +190,12 @@
190 draggable: { 190 draggable: {
191 type: Boolean, 191 type: Boolean,
192 default: false 192 default: false
  193 + },
  194 + tooltipTheme: {
  195 + validator (value) {
  196 + return oneOf(value, ['dark', 'light']);
  197 + },
  198 + default: 'dark'
193 } 199 }
194 }, 200 },
195 data () { 201 data () {