FIO-7184 Fixed showing incorrect value for DateTime and Time componen…

…ts with multiple value enabled inside of the DataTable
formio · Nov 3, 2023 · 38dd9ff · 38dd9ff
1 parent 51f82ab
commit 38dd9ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/components/datetime/DateTime.js b/src/components/datetime/DateTime.js
@@ -203,6 +203,9 @@ export default class DateTimeComponent extends Input {
     format += format.match(/z$/) ? '' : ' z';
     const timezone = this.timezone;
     if (value && !this.attached && timezone) {
+      if (Array.isArray(value) && this.component.multiple) {
+        return value.map((item) => _.trim(FormioUtils.momentDate(item, format, timezone).format(format))).join(', ');
+      }
       return _.trim(FormioUtils.momentDate(value, format, timezone).format(format));
     }
     return (value ? _.trim(moment(value).format(format)) : value) || '';

diff --git a/src/components/time/Time.js b/src/components/time/Time.js
@@ -156,6 +156,9 @@ export default class TimeComponent extends TextFieldComponent {
   }
 
   getValueAsString(value) {
+    if (Array.isArray(value) && this.component.multiple) {
+      return value.map((item) => moment(item, this.component.dataFormat).format(this.component.format)).join(', ');
+    }
     return (value ? moment(value, this.component.dataFormat).format(this.component.format) : value) || '';
   }