@colijnit/corecomponents_v12 258.1.8 → 258.1.9

package/fesm2015/colijnit-corecomponents_v12.js

@@ -7450,6 +7450,7 @@ class InputNumberPickerComponent extends BaseInputComponent {
         this.ngZoneWrapper = ngZoneWrapper;
         this.elementRef = elementRef;
         this.modelChangeOnEnter = true;
+        this.showPermanentLabel = false;
         this.minusIcon = CoreComponentsIcon.MinusSimple;
         this.plusIcon = CoreComponentsIcon.PlusSimple;
         // Whether to show buttons 'always', 'onFocusOnly', or 'never'
@@ -7675,16 +7676,19 @@ InputNumberPickerComponent.decorators = [
                        (mousedown)="onMinusMouseDown($event)"
                        (mouseup)="stopAutoCounting()" (mouseleave)="stopAutoCounting()"></co-button>
         </div>
-        <input type="text"
-               [tabIndex]="readonly ? -1 : 0"
-               [ngModel]="model"
-               [readonly]="readonly"
-               [disabled]="disabled"
-               [required]="required"
-               [placeholder]="label"
-               (ngModelChange)="handleChangeModel($event)"
-               (keydown)="handleInputKeyDown($event)"
-               (blur)="handleBlur()"/>
+        <div class="input-wrapper">
+          <span class='permanent-label' [textContent]="label" *ngIf="showPermanentLabel"></span>
+          <input type="text"
+                 [tabIndex]="readonly ? -1 : 0"
+                 [ngModel]="model"
+                 [readonly]="readonly"
+                 [disabled]="disabled"
+                 [required]="required"
+                 [placeholder]="label"
+                 (ngModelChange)="handleChangeModel($event)"
+                 (keydown)="handleInputKeyDown($event)"
+                 (blur)="handleBlur()"/>
+        </div>
         <div class="button-wrapper">
             <co-button *ngIf="showButtons" class="plus-operator" [class.select]="plusSelected" tabindex="-1"
                        [disabled]="readonly"
@@ -7719,6 +7723,7 @@ InputNumberPickerComponent.ctorParameters = () => [
 InputNumberPickerComponent.propDecorators = {
     model: [{ type: Input }],
     modelChangeOnEnter: [{ type: Input }],
+    showPermanentLabel: [{ type: Input }],
     leftIconData: [{ type: HostBinding, args: ['class.has-icon',] }, { type: Input }],
     min: [{ type: Input }],
     step: [{ type: Input }],
@@ -9490,7 +9495,7 @@ class ExcelExportService {
             exportData = data.map(item => {
                 const newItem = {};
                 columns.forEach(col => {
-                    newItem[col.header] = this.getNestedValue(item, col.key);
+                    newItem[col.header] = this.getFlatValue(item, col.key);
                 });
                 return newItem;
             });
@@ -9562,6 +9567,9 @@ class ExcelExportService {
             return current && current[key] !== undefined ? current[key] : '';
         }, obj);
     }
+    getFlatValue(obj, key) {
+        return obj && obj[key] !== undefined ? obj[key] : '';
+    }
     /**
      * Format date for Excel export
      * @param date - Date to format
@@ -9619,8 +9627,8 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
         this.selectedRowIndex = -1;
         this.currentPage = 1;
         this.sortDirection = 'asc';
-        this.Icons = CoreComponentsIcon;
         this.hoveredRowIndex = -1;
+        this.Icons = CoreComponentsIcon;
         this._doubleClicked = false;
         this._newRow = false;
         this.IconCacheService = IconCacheService;
@@ -9783,16 +9791,19 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
             this._resetDblClick();
         });
     }
-    editRow(event, selectCell = true) {
-        this.editRowIndex = this.selectedRowIndex;
-        this.rowToEdit = this.data[this.editRowIndex];
-        this.editing = true;
-        if (selectCell) {
-            this._nextAvailableCellToEdit(true).then((index) => {
-                this.editCellIndex = index;
-            });
-        }
-        this._detectChanges();
+    editRow(event, selectCell = true, rowIndex) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (rowIndex !== undefined) {
+                this.selectTheRow(rowIndex, false);
+            }
+            this.editRowIndex = this.selectedRowIndex;
+            this.rowToEdit = this.data[this.editRowIndex];
+            this.editing = true;
+            if (selectCell) {
+                this.editCellIndex = yield this._nextAvailableCellToEdit(true);
+            }
+            this._detectChanges();
+        });
     }
     handleCellClick(event, row, rowIndex, cellIndex) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -9882,7 +9893,14 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
         this.headerColumnsCopy = this.headerColumns;
     }
     exportToExcel() {
-        this.excelExportService.exportTableToExcel('simple-grid-table', 'ExcelSheet', 'Sheet1');
+        this.isSettingsMenuOpen = false;
+        const columns = this.headerColumnsCopy.map(column => {
+            return ({
+                key: column.field,
+                header: column.headerText
+            });
+        });
+        this.excelExportService.exportToExcel(this.data, columns, 'ExcelSheet', 'Sheet1');
     }
     prepareDataRow(row, index) {
         this.isRowDisabled(row, index);
@@ -10170,8 +10188,7 @@ SimpleGridComponent.decorators = [
               <div class="icons-container" *ngIf="!editing">
                 <co-icon class="icon-item icon-edit"
                          [iconData]="icons.getIcon(Icons.PenToSquareSolid)" *ngIf="hoveredRowIndex === rowIndex"
-                         (click)="editRow($event)"></co-icon>
-
+                         (click)="editRow($event, true, rowIndex); $event.stopPropagation()"></co-icon>
                 <co-icon class="icon-item icon-delete"
                          [iconData]="icons.getIcon(Icons.TrashBin)" *ngIf="hoveredRowIndex === rowIndex"
                          (click)="removeRow()"></co-icon>
@@ -10181,7 +10198,6 @@ SimpleGridComponent.decorators = [
                            *ngIf="editing && (selectedRowIndex === rowIndex || (isNewRow && rowIndex === editRowIndex))"
                            [iconData]="icons.getIcon(Icons.CheckDuotone)"
                            (click)="validateAndSave(); $event.stopPropagation()"></co-button>
-
                 <co-button class="close-button"
                            *ngIf="editing && (selectedRowIndex === rowIndex || (isNewRow && rowIndex === editRowIndex))"
                            [iconData]="icons.getIcon(Icons.CrossSkinny)"
@@ -10193,7 +10209,6 @@ SimpleGridComponent.decorators = [
       </co-form>
       </tbody>
     </table>
-
     <co-pagination-bar
       *ngIf="data?.length > rowsPerPage" class="pagination-bar"
       [itemsPerPage]="rowsPerPage"