diff --git a/lib/KTable/index.vue b/lib/KTable/index.vue
index 1d5e06d1d..119fabb33 100644
--- a/lib/KTable/index.vue
+++ b/lib/KTable/index.vue
@@ -16,17 +16,17 @@
:ref="'header-' + index"
:key="index"
tabindex="0"
- :aria-sort="sortable && header.dataType !== DATA_TYPE_OTHERS ? getAriaSort(index) : null"
+ :aria-sort="isColumnSortable(index) ? getAriaSort(index) : null"
:class="{
[$computedClass(coreOutlineFocus)]: true,
- sortable: sortable && header.dataType !== DATA_TYPE_OTHERS,
+ sortable: isColumnSortable(index),
'sticky-header': true,
'sticky-column': index === 0,
}"
:style="[getHeaderStyle(header),
- sortKey === index ? { color: $themeBrand.primary.v_1000 } : { color: $themePalette.grey.v_800 },
+ isColumnSortActive(index) ? { color: $themeBrand.primary.v_1000 } : { color: $themePalette.grey.v_800 },
{ backgroundColor: $themePalette.white } ,
- focusedColIndex === index ? { backgroundColor: $themePalette.grey.v_50 } : {}]"
+ isColumnFocused(index) ? { backgroundColor: $themePalette.grey.v_50 } : {}]"
role="columnheader"
data-focus="true"
:aria-colindex="index + 1"
@@ -36,9 +36,9 @@
{{ header.label }}
-
-
-
+
+
+
@@ -87,8 +87,6 @@
-
-