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

[SSE] Fix copy move dialog (2)

Browse Source
This commit is contained in:
Julia.Svinareva
2024-04-27 17:03:13 +03:00
parent d2766fee83
commit a72a65b018
2 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
apps/spreadsheeteditor/main/app/controller/Statusbar.js
View File

@ -355,25 +355,23 @@ define([
return name;
},
createCopyName: function(orig, curArrNames) {
var wc = this.api.asc_getWorksheetsCount(), names = [];
while (wc--) {
names.push(this.api.asc_getWorksheetName(wc).toLowerCase());
}
createCopyName: function(copy, orig, curNames, names) {
var re = /^(.*)\((\d)\)$/.exec(orig);
var first = re ? re[1] : orig + ' ';
var index = 1, name;
while(true) {
var index = 1, name = orig;
if (copy) {
index++;
name = first + '(' + index + ')';
}
while(names.indexOf(name.toLowerCase()) !== -1) {
index++;
name = first + '(' + index + ')';
if (names.indexOf(name.toLowerCase()) < 0) break;
}
if (curArrNames && curArrNames.length > 0) {
if (curNames && curNames.length > 0) {
var arr = [];
curArrNames.forEach(function (item) {
curNames.forEach(function (item) {
arr.push(item.toLowerCase());
});
while(arr.indexOf(name.toLowerCase()) !== -1) {
@ -385,6 +383,26 @@ define([
return name;
},
generateSheetNames: function (copy, sheetIndexes, otherWorksheetNames) {
var me = this,
names = [];
if (copy) {
var wc = this.api.asc_getWorksheetsCount();
while (wc--) {
names.push(this.api.asc_getWorksheetName(wc).toLowerCase());
}
}
otherWorksheetNames && otherWorksheetNames.forEach(function (item) {
names.push(item.toLowerCase());
});
var newNames = [];
sheetIndexes.forEach(function (item) {
newNames.push(me.createCopyName(copy, me.api.asc_getWorksheetName(item), newNames, names));
});
return newNames;
},
deleteWorksheet: function(selectTabs) {
var me = this;
@ -488,10 +506,7 @@ define([
me.api.asc_moveWorksheet(indTo, arrIndex);
me.api.asc_enableKeyEvents(true);
} else {
var arrNames = [];
arrIndex.forEach(function (item) {
arrNames.push(me.createCopyName(me.api.asc_getWorksheetName(item), arrNames));
});
var arrNames = me.generateSheetNames(!cut, arrIndex);
me.api.asc_copyWorksheet(indTo, arrNames, arrIndex);
}
return;
@ -502,7 +517,7 @@ define([
sheets : items,
spreadsheetName: me.api.asc_getDocumentName(),
isDesktopApp: me.statusbar.mode.isDesktopApp,
handler : function(btn, i, copy, workbook) {
handler : function(btn, i, copy, workbook, names) {
if (btn == 'ok') {
var arrBooks,
arrNames;
@ -512,19 +527,13 @@ define([
else if (workbook !== 'current')
arrBooks = [workbook];
if (workbook !== 'current') {
arrNames = [];
arrIndex.forEach(function (item) {
arrNames.push(me.api.asc_getWorksheetName(item));
});
arrNames = me.generateSheetNames(copy, arrIndex, names);
}
}
if (!copy) {
me.api.asc_moveWorksheet(i == -255 ? wc : i, arrIndex, arrNames, arrBooks);
} else {
arrNames = [];
arrIndex.forEach(function (item) {
arrNames.push(me.createCopyName(me.api.asc_getWorksheetName(item), arrNames));
});
arrNames = me.generateSheetNames(copy, arrIndex, names);
me.api.asc_copyWorksheet(i == -255 ? wc : i, arrNames, arrIndex, arrBooks);
}
}

24
apps/spreadsheeteditor/main/app/view/Statusbar.js
View File

@ -1351,8 +1351,18 @@ define([
}
},
getSheetNames: function (sheets) {
if (sheets) {
var names = [];
sheets.forEach(function (item) {
names.push(item.value);
});
return names;
}
},
getFocusedComponents: function() {
return [this.listNames].concat(this.getFooterButtons());
return [this.cmbSpreadsheet, this.listNames, this.chCreateCopy].concat(this.getFooterButtons());
},
getDefaultFocusableComponent: function () {
@ -1378,8 +1388,12 @@ define([
index = active ? active.get('inindex') : 0;
if (this.options.handler) {
var record = this.cmbSpreadsheet.getSelectedRecord(),
sheetNames;
if (record.value !== 'current' && record.value !== 'new')
sheetNames = this.getSheetNames(this.sheets[record.index]);
this.options.handler.call(this,
event.currentTarget.attributes['result'].value, index, this.chCreateCopy.getValue()==='checked', this.cmbSpreadsheet.getSelectedRecord().value);
event.currentTarget.attributes['result'].value, index, this.chCreateCopy.getValue()==='checked', record.value, sheetNames);
}
this.close();
@ -1390,7 +1404,11 @@ define([
index = active ? active.get('inindex') : 0;
if (this.options.handler) {
this.options.handler.call(this, 'ok', index, this.chCreateCopy.getValue()==='checked', this.cmbSpreadsheet.getSelectedRecord().value);
var record = this.cmbSpreadsheet.getSelectedRecord(),
sheetNames;
if (record.value !== 'current' && record.value !== 'new')
sheetNames = this.getSheetNames(this.sheets[record.index]);
this.options.handler.call(this, 'ok', index, this.chCreateCopy.getValue()==='checked', record.value, sheetNames);
}
this.close();