Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
OVSharova 2022-10-13 08:14:19 +03:00
parent 8ca9e3831f
commit 3d7df44625
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/main/lib/component/DataView.js
View file

@ -393,8 +393,8 @@ define([
if (suspendEvents) if (suspendEvents)
this.suspendEvents(); this.suspendEvents();
this.extremeSeletedRec = record;
if (!this.multiSelect || ( !this.pressedShift && !this.pressedCtrl) || ! this.currentSelectedRec || this.currentSelectedRec == record) { if (!this.multiSelect || ( !this.pressedShift && !this.pressedCtrl) || !this.currentSelectedRec || (this.pressedShift && this.currentSelectedRec == record)) {
_.each(this.store.where({selected: true}), function(rec){ _.each(this.store.where({selected: true}), function(rec){
rec.set({selected: false}); rec.set({selected: false});
}); });
@ -752,7 +752,7 @@ define([
this.parentMenu.hide(); this.parentMenu.hide();
} else { } else {
this.pressedCtrl=false; this.pressedCtrl=false;
var idx = (!this.multiSelect)? _.indexOf(this.store.models, rec):_.indexOf(this.store.models, this.lastSelectedRec); var idx = (!this.multiSelect)? _.indexOf(this.store.models, rec):_.indexOf(this.store.models, this.extremeSeletedRec);
if (idx<0) { if (idx<0) {
if (data.keyCode==Common.UI.Keys.LEFT) { if (data.keyCode==Common.UI.Keys.LEFT) {
var target = $(e.target).closest('.dropdown-submenu.over'); var target = $(e.target).closest('.dropdown-submenu.over');
@ -825,8 +825,6 @@ define([
this.selectRecord(rec); this.selectRecord(rec);
this.scrollToRecord(rec); this.scrollToRecord(rec);
this._fromKeyDown = false; this._fromKeyDown = false;
if(this.multiSelect)
this.lastSelectedRec = rec;
} }
} }
} else { } else {

9
apps/spreadsheeteditor/main/app/view/WatchDialog.js
View file

@ -191,10 +191,9 @@ define([ 'text!spreadsheeteditor/main/app/template/WatchDialog.template',
this.watchList.store.reset(arr); this.watchList.store.reset(arr);
if (this._deletedIndex!==undefined) { if (this._deletedIndex!==undefined) {
var store = this.watchList.store; var store = this.watchList.store;
var me = this;
(store.length>0) && this.watchList.selectByIndex(this._deletedIndex<store.length ? this._deletedIndex : store.length-1); (store.length>0) && this.watchList.selectByIndex(this._deletedIndex<store.length ? this._deletedIndex : store.length-1);
if(this.watchList.options.multiSelect) if(this.watchList.options.multiSelect)
_.each(this.watchList.getSelectedRec(),function (rec){me.watchList.scrollToRecord(rec);}); this.watchList.scrollToRecord(this.watchList.getSelectedRec()[0]);
else else
this.watchList.scrollToRecord(this.watchList.getSelectedRec()); this.watchList.scrollToRecord(this.watchList.getSelectedRec());
this._fromKeyDown && this.watchList.focus(); this._fromKeyDown && this.watchList.focus();
@ -237,10 +236,12 @@ define([ 'text!spreadsheeteditor/main/app/template/WatchDialog.template',
var rec = this.watchList.getSelectedRec(); var rec = this.watchList.getSelectedRec();
if (rec) { if (rec) {
if(this.watchList.options.multiSelect) { if(this.watchList.options.multiSelect) {
_.each(rec, function (r) { var props=[];
_.each(rec, function (r, i) {
me._deletedIndex = me.watchList.store.indexOf(r); me._deletedIndex = me.watchList.store.indexOf(r);
me.api.asc_deleteCellWatches([r.get('props')]); props[i] =r.get('props');
}); });
this.api.asc_deleteCellWatches(props);
} else { } else {
this._deletedIndex = this.watchList.store.indexOf(rec); this._deletedIndex = this.watchList.store.indexOf(rec);
this.api.asc_deleteCellWatches([rec.get('props')]); this.api.asc_deleteCellWatches([rec.get('props')]);