From 035143f6446afe28d97cdb3309e52a08928bc95b Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 8 Oct 2019 11:20:45 +0300 Subject: [PATCH] [SSE] Bug 37388 (copy worksheet) --- .../main/app/controller/Statusbar.js | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index fe25994f2..784565ac5 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -293,7 +293,7 @@ define([ return name; }, - createCopyName: function(orig) { + createCopyName: function(orig, curArrNames) { var wc = this.api.asc_getWorksheetsCount(), names = []; while (wc--) { names.push(this.api.asc_getWorksheetName(wc).toLowerCase()); @@ -308,6 +308,17 @@ define([ if (names.indexOf(name.toLowerCase()) < 0) break; } + if (curArrNames && curArrNames.length > 0) { + var arr = []; + curArrNames.forEach(function (item) { + arr.push(item.toLowerCase()); + }); + while(arr.indexOf(name.toLowerCase()) !== -1) { + index++; + name = first + '(' + index + ')'; + } + } + return name; }, @@ -434,8 +445,11 @@ define([ if (cut) { me.api.asc_moveWorksheet(i == -255 ? wc : i, arrIndex); } else { - var new_text = me.createCopyName(me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex())); - me.api.asc_copyWorksheet(i == -255 ? wc : i, new_text); + var arrNames = []; + arrIndex.forEach(function (item) { + arrNames.push(me.createCopyName(me.api.asc_getWorksheetName(item), arrNames)); + }); + me.api.asc_copyWorksheet(i == -255 ? wc : i, arrNames, arrIndex); } } me.api.asc_enableKeyEvents(true);