diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue index 4d1bb8f81..9f1f5402c 100755 --- a/src/components/datatable/DataTable.vue +++ b/src/components/datatable/DataTable.vue @@ -960,7 +960,7 @@ export default { let column = this.columns[i]; if (column.exportable !== false && column.field) { let cellData = ObjectUtils.resolveFieldData(record, column.field); - + if (cellData != null) { if (this.exportFunction) { cellData = this.exportFunction({ @@ -973,10 +973,10 @@ export default { } else cellData = ''; - - + + csv += '"' + cellData + '"'; - + if (i < (this.columns.length - 1)) { csv += this.csvSeparator; } diff --git a/src/components/tabmenu/TabMenu.vue b/src/components/tabmenu/TabMenu.vue index 6346dd00f..0795acfab 100755 --- a/src/components/tabmenu/TabMenu.vue +++ b/src/components/tabmenu/TabMenu.vue @@ -81,7 +81,7 @@ export default { let tabHeader = this.$refs.nav.children[activeTabIndex]; this.$refs.inkbar.style.width = DomHandler.getWidth(tabHeader) + 'px'; this.$refs.inkbar.style.left = DomHandler.getOffset(tabHeader).left - DomHandler.getOffset(this.$refs.nav).left + 'px'; - } + } else { this.$refs.inkbar.style.width = '0px'; this.$refs.inkbar.style.left = '0px'; diff --git a/src/components/utils/DomHandler.js b/src/components/utils/DomHandler.js index 93c264eab..4eaa4b988 100755 --- a/src/components/utils/DomHandler.js +++ b/src/components/utils/DomHandler.js @@ -194,7 +194,7 @@ export default class DomHandler { if (top < 0) { top = windowScrollTop; } - } + } else { top = targetOuterHeight + targetOffset.top + windowScrollTop; element.style.transformOrigin = 'top'; diff --git a/src/views/datatable/DataTableSelectionDemo.vue b/src/views/datatable/DataTableSelectionDemo.vue index 5803ce7f2..ea1427f37 100755 --- a/src/views/datatable/DataTableSelectionDemo.vue +++ b/src/views/datatable/DataTableSelectionDemo.vue @@ -70,7 +70,7 @@