ids-enterprise-wc 1.15.9-patch.19 → 1.15.9-patch.20

package/enterprise-wc.all.iife.js

@@ -72464,11 +72464,32 @@ ids-input::part(container) {
     }
     /** Formats date data as a date string in the desired format */
     date(rowData, columnData, index, api) {
-      let value = this.#extractValue(rowData, columnData.field);
-      value = api.localeAPI?.formatDate(value, columnData.formatOptions) ?? value.toString();
+      const rawValue = this.#extractValue(rowData, columnData.field);
+      let value = api.localeAPI?.formatDate(rawValue, columnData.formatOptions) ?? rawValue?.toString();
+      if (value === rawValue) {
+        value = this.#reformatFromEditorFormat(rawValue, columnData, api) ?? value;
+      }
       const icon = columnData.editor?.type === "datepicker" ? `<ids-icon icon="schedule" class="editor-cell-icon ${columnData.editor?.showEditorIcons ? "show-cell-icon-always" : ""}"></ids-icon>` : "";
       return `<span class="text-ellipsis">${value}</span>${icon}`;
     }
+    /**
+     * Reformats a value stored in the editor's internal format into the column's
+     * display format. Returns undefined when the value cannot be parsed with the
+     * editor format (so callers can fall back to the raw string).
+     * @param {unknown} value the raw cell value
+     * @param {IdsDataGridColumn} columnData the column configuration
+     * @param {IdsDataGrid} api the data grid instance
+     * @returns {string | undefined} the reformatted display value, if any
+     */
+    #reformatFromEditorFormat(value, columnData, api) {
+      const editorFormat = columnData.editor?.editorSettings?.format;
+      const displayFormat = columnData.formatOptions?.format;
+      if (!editorFormat || !displayFormat || editorFormat === displayFormat) return void 0;
+      if (typeof value !== "string" || value.trim() === "" || !/\d/.test(value)) return void 0;
+      const parsed = api.localeAPI?.parseDate(value, { dateFormat: editorFormat });
+      if (!parsed || !isValidDate(parsed)) return void 0;
+      return api.localeAPI?.formatDate(parsed, { dateFormat: displayFormat });
+    }
     /** Formats adds search-list to cells that have lookup editor associated with them */
     lookup(rowData, columnData) {
       const value = this.#extractValue(rowData, columnData.field);
@@ -72477,8 +72498,11 @@ ids-input::part(container) {
     }
     /** Formats date data as a time string in the desired format */
     time(rowData, columnData, index, api) {
-      let value = this.#extractValue(rowData, columnData.field);
-      value = api.localeAPI?.formatDate(value, columnData.formatOptions || { timeStyle: "short" }) ?? value.toString();
+      const rawValue = this.#extractValue(rowData, columnData.field);
+      let value = api.localeAPI?.formatDate(rawValue, columnData.formatOptions || { timeStyle: "short" }) ?? rawValue?.toString();
+      if (value === rawValue) {
+        value = this.#reformatFromEditorFormat(rawValue, columnData, api) ?? value;
+      }
       const icon = columnData.editor?.type === "timepicker" ? `<ids-icon icon="clock" class="editor-cell-icon ${columnData.editor?.showEditorIcons ? "show-cell-icon-always" : ""}"></ids-icon>` : "";
       return `<span class="text-ellipsis">${value}</span>${icon}`;
     }
@@ -77853,11 +77877,31 @@ ids-trigger-button[slot=trigger-end] {
       applyEditorSettings(component, cell?.column.editor?.editorSettings);
       return component;
     }
+    /**
+     * Resolves the date format used for the value the user sees while editing.
+     * Falls back to the editor format, then the locale default, so grids that
+     * only configure `editorSettings.format` keep their previous behavior.
+     * @param {IdsDataGridCell} cell the editing cell
+     * @returns {string | undefined} the display date format, if any
+     */
+    #displayFormat(cell) {
+      const formatOptionsFormat = cell?.column?.formatOptions?.format;
+      const editorFormat = cell?.column?.editor?.editorSettings?.format;
+      return formatOptionsFormat || editorFormat || void 0;
+    }
     #update(cell, dateString) {
-      const inputDate = cell?.dataGrid.localeAPI.parseDate(
+      const displayFormat = this.#displayFormat(cell);
+      const editorFormat = cell?.column?.editor?.editorSettings?.format || void 0;
+      let inputDate = cell?.dataGrid.localeAPI.parseDate(
         dateString,
-        { dateFormat: cell?.column?.editor?.editorSettings?.format || void 0 }
+        { dateFormat: displayFormat }
       );
+      if ((!inputDate || !isValidDate(inputDate)) && editorFormat && editorFormat !== displayFormat) {
+        inputDate = cell?.dataGrid.localeAPI.parseDate(
+          dateString,
+          { dateFormat: editorFormat }
+        );
+      }
       if (!dateString || !isValidDate(inputDate)) {
         this.#displayValue = dateString;
         this.#value = void 0;
@@ -77876,7 +77920,7 @@ ids-trigger-button[slot=trigger-end] {
       } else {
         this.#value = inputDate;
       }
-      this.#displayValue = cell.dataGrid.localeAPI.formatDate(this.#value, cell.column?.editor?.editorSettings);
+      this.#displayValue = cell.dataGrid.localeAPI.formatDate(this.#value, { dateFormat: displayFormat });
     }
     #stopPropagation(evt) {
       const isOpen = this.input?.popup?.hidden === false;
@@ -77894,8 +77938,15 @@ ids-trigger-button[slot=trigger-end] {
     }
     save(cell) {
       this.#update(cell, cell?.value);
+      const editorFormat = cell?.column?.editor?.editorSettings?.format || void 0;
+      let dateValue;
+      if (editorFormat && this.#value instanceof Date) {
+        dateValue = cell.dataGrid.localeAPI.formatDate(this.#value, { dateFormat: editorFormat });
+      } else {
+        dateValue = this.#value?.toISOString();
+      }
       return {
-        value: this.#value?.toISOString() ?? "",
+        value: (dateValue || this.#displayValue) ?? "",
         dirtyCheckValue: this.#displayValue
       };
     }