pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 12:18:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE] Fix document lists

Browse Source
This commit is contained in:
Julia Radzhabova
2023-03-01 20:16:59 +03:00
parent e733549618
commit 0133372233
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/common/main/lib/component/DataView.js
View File

@ -328,7 +328,10 @@ define([
if (this.listenStoreEvents) {
this.listenTo(this.store, 'add', this.onAddItem);
this.listenTo(this.store, 'reset', this.onResetItems);
this.groups && this.listenTo(this.groups, 'add', this.onAddGroup);
if (this.groups) {
this.listenTo(this.groups, 'add', this.onAddGroup);
this.listenTo(this.groups, 'remove', this.onRemoveGroup);
}
}
this.onResetItems();
@ -559,6 +562,15 @@ define([
}
},
onRemoveGroup: function(group) {
var innerEl = $(this.el).find('.inner').addBack().filter('.inner');
if (innerEl) {
var div = innerEl.find('#' + group.get('id') + '.grouped-data');
div && div.remove();
}
this._layoutParams = undefined;
},
onResetItems: function() {
_.each(this.dataViewItems, function(item) {
var tip = item.$el.data('bs.tooltip');

8
apps/documenteditor/main/app/controller/Toolbar.js
View File

@ -1390,12 +1390,13 @@ define([
var patterns = this._listPatterns[type];
if (!patterns) return;
picker.store.remove(picker.store.where({type: 2}));
var rec = picker.groups.findWhere({type: 2});
if (!rec && patterns.length>0)
picker.groups.add({id: picker.options.listSettings.docGroup, caption: picker.options.listSettings.docName, type: 2});
else if (rec && patterns.length===0)
picker.groups.remove(rec);
picker.store.remove(picker.store.where({type: 2}));
for (var i=0; i<patterns.length; i++) {
var item = patterns[i];
@ -1407,7 +1408,10 @@ define([
type: 2
});
}
picker.scroller && picker.scroller.update();
if (picker.scroller) {
picker.scroller.update();
picker.scroller.scrollTop(0);
}
this._listPatterns[type] = null;
},

2
apps/documenteditor/main/app/view/Toolbar.js
View File

@ -2375,7 +2375,7 @@ define([
el: $('#id-toolbar-menu-markers'),
parentMenu: this.btnMarkers.menu,
outerMenu: {menu: this.btnMarkers.menu, index: 0},
restoreHeight: 175,
restoreHeight: 250,
delayRenderTips: true,
scrollAlwaysVisible: true,
listSettings: listSettings,