Merge branch 'master' into dev-to-mas

smeup · Dec 5, 2022 · 0dbeef2 · 0dbeef2
2 parents 5ebdb76 + 1a11151
commit 0dbeef2
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/packages/ketchup/src/assets/data-table.js b/packages/ketchup/src/assets/data-table.js
@@ -949,6 +949,50 @@ const mockedRows = [
             },
         },
     },
+    {
+        cells: {
+            FLD1: {
+                obj: {
+                    t: 'CN',
+                    p: 'COL',
+                    k: 'CASFRA',
+                },
+                value: 'CASFRA',
+            },
+            FLD2: {
+                obj: {
+                    t: 'NR',
+                    p: '',
+                    k: '10',
+                },
+                value: '10',
+            },
+            FLD3: {
+                obj: {
+                    t: 'NR',
+                    p: '',
+                    k: '100000.60',
+                },
+                value: '100,000.60',
+            },
+            FLD4: {
+                obj: {
+                    t: 'D8',
+                    p: '*YYMD',
+                    k: '20181101',
+                },
+                value: '2018-11-01',
+            },
+            FLD5: {
+                obj: {
+                    t: 'NR',
+                    p: 'P',
+                    k: '0',
+                },
+                value: '0.00',
+            },
+        },
+    },
     {
         cells: {
             FLD1: {

diff --git a/packages/ketchup/src/components/kup-data-table/kup-data-table-state.ts b/packages/ketchup/src/components/kup-data-table/kup-data-table-state.ts
@@ -14,8 +14,8 @@ export class KupDataTableState implements KupState {
     expandGroups = false;
     groupLabelDisplay = GroupLabelDisplayMode.BOTH;
     density: string = 'small';
-    enableSortableColumns: boolean = false;
     enableExtraColumns: boolean = true;
+    enableSortableColumns: boolean = false;
     forceOneLine: boolean = false;
     globalFilter = false;
     globalFilterValue = '';

diff --git a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
@@ -2227,7 +2227,6 @@ export class KupDataTable {
 
     private getEventPath(currentEl: unknown): HTMLElement[] {
         const path: HTMLElement[] = [];
-
         while (
             currentEl &&
             currentEl !== this.rootElement &&

diff --git a/packages/ketchup/src/components/kup-time-picker/kup-time-picker.tsx b/packages/ketchup/src/components/kup-time-picker/kup-time-picker.tsx
@@ -397,10 +397,10 @@ export class KupTimePicker {
         this.value = value;
     }
 
+
     /*-------------------------------------------------*/
     /*           P r i v a t e   M e t h o d s         */
     /*-------------------------------------------------*/
-
     getFormattedValue(value: string): string {
         return formattedStringToCustomUnformattedStringTime(
             value,