fix(linestyle bug): lineStyle

dream-num · Jul 31, 2020 · 27ba0a3 · 27ba0a3
1 parent d9fb5fe
commit 27ba0a3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 786 deletions.
diff --git a/src/controllers/sheetMove.js b/src/controllers/sheetMove.js
@@ -1786,7 +1786,7 @@ function getNextIndex(direction, focusIndex, strIndex, endIndex) {
             }
 
             if(cellNull.length == 1 && stNull && cellNull[i] == false){
-                index = strIndex + i;
+                index = strIndex + i + 1;
                 break;
             }
             else if(cellNull.length > 1){

diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js
@@ -43,9 +43,12 @@ const sheetmanage = {
     generateRandomSheetName: function(file, isPivotTable) {
         let index = file.length;
 
+        const locale_pivotTable = locale().pivotTable;
+        const title = locale_pivotTable.title;
+
         for(let i = 0; i < file.length; i++){
-            if(file[i].name.indexOf("Sheet") > -1 || file[i].name.indexOf("数据透视表") > -1){
-                let suffix = parseFloat(file[i].name.replace("Sheet", "").replace("数据透视表", ""));
+            if(file[i].name.indexOf("Sheet") > -1 || file[i].name.indexOf(title) > -1){
+                let suffix = parseFloat(file[i].name.replace("Sheet", "").replace(title, ""));
 
                 if(suffix != "NaN" && Math.ceil(suffix) > index){
                     index = Math.ceil(suffix);
@@ -54,7 +57,7 @@ const sheetmanage = {
         }
 
         if(isPivotTable){
-            return "数据透视表" + (index + 1);
+            return title + (index + 1);
         }
         else{
             return "Sheet" + (index + 1);