pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 03:19:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2273 from ONLYOFFICE/fix/bug-61613

Browse Source 
Fix/bug 61613
This commit is contained in:
Julia Radzhabova
2023-03-15 18:35:30 +03:00
committed by GitHub
parent 666367f756 5f1f44a466
commit d2158394d6
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/spreadsheeteditor/main/app/controller/PivotTable.js
View File

@ -359,10 +359,19 @@ define([
if (count>0 && count==Templates.length) {
var data = styles.menuPicker.dataViewItems;
var findDataViewItem = function(template) {
for(var i = 0; i < data.length; i++) {
if(data[i].model.get('name') && data[i].model.get('name') === template.asc_getName()) return data[i];
else if(data[i].model.get('caption') === template.asc_getDisplayName()) return data[i];
}
return undefined;
};
data && _.each(Templates, function(template, index){
var img = template.asc_getImage();
data[index].model.set('imageUrl', img, {silent: true});
$(data[index].el).find('img').attr('src', img);
var dataViewItem = findDataViewItem(template);
dataViewItem && dataViewItem.model.set('imageUrl', img, {silent: true});
dataViewItem && $(dataViewItem.el).find('img').attr('src', img);
});
styles.fieldPicker.store.reset(styles.fieldPicker.store.models);
} else {

13
apps/spreadsheeteditor/main/app/view/TableSettings.js
View File

@ -576,10 +576,19 @@ define([
var count = self.mnuTableTemplatePicker.store.length;
if (count>0 && count==Templates.length) {
var data = self.mnuTableTemplatePicker.dataViewItems;
var findDataViewItem = function(template) {
for(var i = 0; i < data.length; i++) {
if(data[i].model.get('name') && data[i].model.get('name') === template.asc_getName()) return data[i];
else if(data[i].model.get('caption') === template.asc_getDisplayName()) return data[i];
}
return undefined;
};
data && _.each(Templates, function(template, index){
var img = template.asc_getImage();
data[index].model.set('imageUrl', img, {silent: true});
$(data[index].el).find('img').attr('src', img);
var dataViewItem = findDataViewItem(template);
dataViewItem && dataViewItem.model.set('imageUrl', img, {silent: true});
dataViewItem && $(dataViewItem.el).find('img').attr('src', img);
});
} else {
var templates = [];