From c2a71987136a1dcd34968576dbd2a1c8d3204c07 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Mon, 10 Oct 2022 11:45:31 +0300
Subject: [PATCH] fix bug

---
 apps/common/main/lib/component/DataView.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js
index 3f1e17204f..badd7245e9 100644
--- a/apps/common/main/lib/component/DataView.js
+++ b/apps/common/main/lib/component/DataView.js
@@ -738,7 +738,7 @@ define([
                 if (_.indexOf(this.moveKeys, data.keyCode)>-1 || data.keyCode==Common.UI.Keys.RETURN) {
                 data.preventDefault();
                 data.stopPropagation();
-                var rec = this.currentSelectedRec;
+                var rec =(this.multiSelect) ? this.currentSelectedRec : this.getSelectedRec();
                 if (this.lastSelectedRec === null)
                     this.lastSelectedRec = rec;
                 if (data.keyCode == Common.UI.Keys.RETURN) {
@@ -751,7 +751,7 @@ define([
                     if (this.parentMenu)
                         this.parentMenu.hide();
                 } else {
-                    var idx = _.indexOf(this.store.models, this.lastSelectedRec);
+                    var idx = (!this.multiSelect)? _.indexOf(this.store.models, rec):_.indexOf(this.store.models, this.lastSelectedRec);
                     if (idx<0) {
                         if (data.keyCode==Common.UI.Keys.LEFT) {
                             var target = $(e.target).closest('.dropdown-submenu.over');
@@ -824,7 +824,8 @@ define([
                         this.selectRecord(rec);
                         this.scrollToRecord(rec);
                         this._fromKeyDown = false;
-                        this.lastSelectedRec = rec;
+                        if(this.multiSelect)
+                            this.lastSelectedRec = rec;
                     }
                 }
             } else {