Fixed when 'Multiple Values' setting is enabled, all the selected val…

…ues display as the last (formio#4663)
Josephalexantony-aot · Apr 11, 2022 · f2cc377 · f2cc377
1 parent 42ff57c
commit f2cc377
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/components/select/Select.js b/src/components/select/Select.js
@@ -249,8 +249,8 @@ export default class SelectComponent extends Field {
     }
     if (typeof data === 'string') {
       const selectData = this.selectData;
-      if (selectData) {
-        data = selectData;
+      if (selectData && selectData[value]) {
+        data = selectData[value];
       }
       else {
         return this.sanitize(this.t(data, { _userInput: true }), this.shouldSanitizeValue);
@@ -1418,7 +1418,11 @@ export default class SelectComponent extends Field {
       if (!submission.metadata.selectData) {
         submission.metadata.selectData = {};
       }
-      _.set(submission.metadata.selectData, this.path, this.templateData[value]);
+      const selectedTemplateData = _.pickBy(this.templateData, (value, key) => {
+        const dataValues = _.isArray(this.dataValue) ? this.dataValue : [this.dataValue];
+        return _.includes(dataValues, key);
+      });
+      _.set(submission.metadata.selectData, this.path, _.cloneDeep(selectedTemplateData));
     }
 
     const displayEntireObject = this.isEntireObjectDisplay();