fixed conflicts

BabyElias · Jul 16, 2024 · 48e969c · 48e969c
1 parent a1393d1
commit 48e969c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/docs/pages/playground.vue b/docs/pages/playground.vue
@@ -139,8 +139,8 @@
 
           setTimeout(() => {
             this.updateLoadingMessage('');
-          }, 3000);
-        }, 2000); // Simulate a 2 second delay for fetching data
+          }, 5000);
+        }, 10000); // Simulate a 10 second delay for fetching data
       },
     },
   };
@@ -184,6 +184,5 @@ h1, h2 {
   clip: rect(0, 0, 0, 0);
   white-space: nowrap;
   border-width: 0;
-  visibility: hidden;
 }
 </style>
diff --git a/lib/KTable/index.vue b/lib/KTable/index.vue
@@ -23,8 +23,8 @@
               {{ header.label }}
             </slot>
             <span v-if="sortable && header.dataType !== DATA_TYPE_OTHERS" class="sort-icon">
-              <span v-if="sortKey === index && sortOrder === SORT_ORDER_ASC">⬆️</span>
-              <span v-else-if="sortKey === index && sortOrder === SORT_ORDER_DESC">⬇️</span>
+              <span v-if="sortKey === index && sortOrder === SORT_ORDER_ASC"><KIcon icon="dropup" /></span>
+              <span v-else-if="sortKey === index && sortOrder === SORT_ORDER_DESC"><KIcon icon="dropdown" /></span>
               <span v-else>⬍</span>
             </span>
           </th>