lkt-table 2.0.4 → 2.0.6

package/dist/components/LktTableRow.vue.d.ts

@@ -33,24 +33,24 @@ declare const canItem: boolean;
 declare const onClick: ($event: any) => void, onShow: ($event: any, i: any) => void, classes: import("vue").ComputedRef<string>, hasNavButtonSlot: import("vue").ComputedRef<boolean>, navButtonSlot: import("vue").ComputedRef<string | import("vue").Component>, onClickUp: () => void, onClickDown: () => void, onClickDrop: () => void, onClickEdit: () => void;
 declare const canRenderDragIndicator: import("vue").ComputedRef<any>;
 declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
-declare var __VLS_26: `item-${number}`, __VLS_27: {
+declare var __VLS_24: `item-${number}`, __VLS_25: {
     item: LktObject;
     index: number;
-}, __VLS_29: {
+}, __VLS_27: {
     item: LktObject;
     index: number;
-}, __VLS_32: string, __VLS_33: {
+}, __VLS_30: string, __VLS_31: {
     value: any;
     item: LktObject;
     column: Column;
     i: number;
 };
 type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
-    [K in NonNullable<typeof __VLS_26>]?: (props: typeof __VLS_27) => any;
+    [K in NonNullable<typeof __VLS_24>]?: (props: typeof __VLS_25) => any;
 } & {
-    [K in NonNullable<typeof __VLS_32>]?: (props: typeof __VLS_33) => any;
+    [K in NonNullable<typeof __VLS_30>]?: (props: typeof __VLS_31) => any;
 } & {
-    item?: (props: typeof __VLS_29) => any;
+    item?: (props: typeof __VLS_27) => any;
 }>;
 declare const __VLS_self: import("vue").DefineComponent<__VLS_Props, {
     canRenderColumn: typeof canRenderColumn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lkt-table",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "",
   "keywords": [
     "lkt",
@@ -53,13 +53,13 @@
     "lkt-button": "^2.0.7",
     "lkt-data-state": "^1.0.11",
     "lkt-date-tools": "^1.0.4",
-    "lkt-field": "^0.0.34",
+    "lkt-field": "^1.0.0",
     "lkt-http-client": "^1.0.34",
     "lkt-i18n": "^1.0.6",
     "lkt-loader": "^1.2.0",
     "lkt-paginator": "^1.3.3",
-    "lkt-string-tools": "^1.0.8",
-    "lkt-vue-kernel": "^1.0.31",
+    "lkt-string-tools": "^1.1.0",
+    "lkt-vue-kernel": "^1.0.35",
     "vue": "^3.3",
     "vue-router": "^4.2.5"
   }

package/src/components/TableHeader.vue

@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import {getColumnClasses, getVerticalColSpan} from "../functions/table-functions";
-import {Column, LktObject} from "lkt-vue-kernel";
+import {Column, extractI18nValue, LktObject, LktSettings, SortDirection} from "lkt-vue-kernel";
 import {computed} from "vue";
-import {__} from "lkt-i18n";
 
 const emit = defineEmits(['click']);
 
@@ -33,10 +32,16 @@ const computedColSpan = computed(() => {
         return '';
     }),
     computedLabel = computed(() => {
-        if (props.column.label.startsWith('__:')) {
-            return __(props.column.label.substring(3));
+        return extractI18nValue(props.column.label);
+    }),
+    computedSortableIcon = computed(() => {
+        if (!computedSortable.value) return '';
+        if (props.sortBy === props.column.key) {
+            if (props.sortDirection === SortDirection.Asc) return LktSettings.defaultTableSortAscIcon;
+            if (props.sortDirection === SortDirection.Desc) return LktSettings.defaultTableSortDescIcon;
+            return '';
         }
-        return props.column.label;
+        return '';
     });
 
 const onClick = () => emit('click', props.column)
@@ -51,6 +56,6 @@ const onClick = () => emit('click', props.column)
         :class="getColumnClasses(column)"
         v-on:click="onClick"
     >
-        <div>{{ computedLabel }}</div>
+        <div>{{ computedLabel }} <i v-if="computedSortableIcon" :class="computedSortableIcon"/> </div>
     </th>
 </template>

package/src/lib-components/LktTable.vue

@@ -263,6 +263,7 @@ const getItemByEvent = (e: any) => {
             });
             SortingDirection.value = SortingDirection.value === SortDirection.Asc ? SortDirection.Desc : SortDirection.Asc;
             SortBy.value = column.key;
+            updateTimeStamp.value = time();
             emit('sort', [SortBy.value, SortingDirection.value]);
         }
     },
@@ -574,7 +575,7 @@ const hasEmptySlot = computed(() => {
                                 :sort-direction="SortingDirection"
                                 :amount-of-columns="columns.length"
                                 :items="Items"
-                                v-on:click="sort(column)"
+                                @click="sort(column)"
                             />
                         </template>
                         <th