Merge branch 'master' of http://gitlab.lashuju.com/opensource/luckysheet

docs/zh/guide/config.md

@@ -139,6 +139,39 @@
 - 默认值：{}
 - 作用：表格行高、列宽、合并单元格、公式等设置
 
+### config.merge
+- 类型：Object
+- 默认值：{}
+- 作用：合并单元格设置,示例：
+  ```js
+  {
+        "13_5": {
+            "r": 13,
+            "c": 5,
+            "rs": 3,
+            "cs": 1
+        },
+        "13_7": {
+            "r": 13,
+            "c": 7,
+            "rs": 3,
+            "cs": 2
+        },
+        "14_2": {
+            "r": 14,
+            "c": 2,
+            "rs": 1,
+            "cs": 2
+        }
+    }
+  ```
+  对象中的`key`为`r + '_' + c`的拼接值，`value`为左上角单元格信息: r:行数，c:列数，rs：合并的行数，cs:合并的列数
+
+### config.rowlen
+- 类型：Array
+- 默认值：[]
+- 作用：每个单元格的行高,示例：
+
 ------------
 ## devicePixelRatio
 - 类型：Number

src/controllers/alternateformat.js

@@ -977,27 +977,27 @@ const alternateformat = {
         
         //应用范围
         let rangeValue = $("#luckysheet-modal-dialog-slider-alternateformat #luckysheet-alternateformat-range input").val().trim();
-        if(formula.iscelldata(rangeValue)){
-            let cellrange = formula.getcellrange(rangeValue);
-            let isExists = _this.rangeIsExists(cellrange, dataIndex)[0];
         
-            if(isExists){
+        if(!formula.iscelldata(rangeValue)){
             if(isEditMode()){
-                    alert("您选择的应用范围已存在交替颜色且不属于你要编辑的应用范围！");
+                alert("您选择的应用范围不是选区！");
             }
             else{
-                    tooltip.info("您选择的应用范围已存在交替颜色且不属于你要编辑的应用范围！", ""); 
+                tooltip.info("您选择的应用范围不是选区！", "");
             }
 
             return;
         }
-        }
+        
-        else{
+        let cellrange = formula.getcellrange(rangeValue);
+        let isExists = _this.rangeIsExists(cellrange, dataIndex)[0];
+
+        if(isExists){
             if(isEditMode()){
-                alert("您选择的应用范围不是选区！");
+                alert("您选择的应用范围已存在交替颜色且不属于你要编辑的应用范围！");
             }
             else{
-                tooltip.info("您选择的应用范围不是选区！", "");
+                tooltip.info("您选择的应用范围已存在交替颜色且不属于你要编辑的应用范围！", ""); 
             }
 
             return;

src/controllers/handler.js

@@ -71,6 +71,7 @@ import { update, genarate } from '../global/format';
 import method from '../global/method';
 import { getBorderInfoCompute } from '../global/border';
 import { luckysheetDrawMain } from '../global/draw';
+import locale from '../locale/locale';
 import Store from '../store';
 import locale from '../locale/locale';
 
@@ -885,10 +886,10 @@ export default function luckysheetHandler() {
             if (obj_s["row"] != null && obj_s["row"][0] == 0 && obj_s["row"][1] == Store.flowdata.length - 1) {
                 Store.luckysheetRightHeadClickIs = "column";
 
-                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text("列");
+                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text(locale().rightclick.column);
-                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-size").text("宽");
+                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-size").text(locale().rightclick.width);
-                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text("左");
+                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text(locale().rightclick.left);
-                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text("右");
+                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text(locale().rightclick.right);
 
                 $("#luckysheet-cols-rows-add").show();
                 $("#luckysheet-cols-rows-data").show();
@@ -930,10 +931,10 @@ export default function luckysheetHandler() {
             else if (obj_s["column"] != null && obj_s["column"][0] == 0 && obj_s["column"][1] == Store.flowdata[0].length - 1) {
                 Store.luckysheetRightHeadClickIs = "row";
 
-                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text("行");
+                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text(locale().rightclick.row);
-                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-size").text("高");
+                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-size").text(locale().rightclick.height);
-                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text("上");
+                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text(locale().rightclick.top);
-                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text("下");
+                $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text(locale().rightclick.bottom);
                 
                 $("#luckysheet-cols-rows-add").show();
                 $("#luckysheet-cols-rows-data").show();
@@ -4537,10 +4538,10 @@ export default function luckysheetHandler() {
 
             $("#luckysheet-cols-rows-shift").hide();
             Store.luckysheetRightHeadClickIs = "row";
-            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text("行");
+            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text(locale().rightclick.row);
-            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-size").text("高");
+            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-size").text(locale().rightclick.height);
-            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text("上");
+            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text(locale().rightclick.top);
-            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text("下");
+            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text(locale().rightclick.bottom);
 
             $("#luckysheet-cols-rows-add").show();
             $("#luckysheet-cols-rows-data").show();
@@ -4925,10 +4926,10 @@ export default function luckysheetHandler() {
             }
 
             Store.luckysheetRightHeadClickIs = "column";
-            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text("列");
+            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text(locale().rightclick.column);
-            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-size").text("宽");
+            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-size").text(locale().rightclick.width);
-            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text("左");
+            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text(locale().rightclick.left);
-            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text("右");
+            $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text(locale().rightclick.right);
 
             $("#luckysheet-cols-rows-add").show();
             $("#luckysheet-cols-rows-data").show();
@@ -5193,9 +5194,9 @@ export default function luckysheetHandler() {
         let offset = $(this).offset();
         $("#luckysheet-cols-rows-shift").show();
         Store.luckysheetRightHeadClickIs = "column";
-        $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text("列");
+        $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-word").text(locale().rightclick.column);
-        $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text("左");
+        $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-left").text(locale().rightclick.left);
-        $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text("右");
+        $("#luckysheet-rightclick-menu .luckysheet-cols-rows-shift-right").text(locale().rightclick.right);
 
         $("#luckysheet-cols-rows-add").show();
         $("#luckysheet-cols-rows-data").hide();

src/controllers/sheetmanage.js

@@ -753,6 +753,8 @@ const sheetmanage = {
 
         Store.flowdata = file["data"];
         editor.webWorkerFlowDataCache(Store.flowdata);//worker存数据
+        formula.execFunctionGroupData = null;
+        window.luckysheet_getcelldata_cache = null;
 
         luckysheetPostil.buildAllPs(Store.flowdata);
 

src/core.js

@@ -12,9 +12,13 @@ import {
     getluckysheetfile, 
     getluckysheet_select_save, 
     getconfig, 
-    getvisibledatarow, 
-    getvisibledatacolumn 
 } from './methods/get';
+import { 
+    setluckysheetfile,
+    setluckysheet_select_save,
+    setconfig,
+} from './methods/set';
+import { luckysheetrefreshgrid } from './global/refresh';
 
 let luckysheet = {};
 
@@ -115,14 +119,22 @@ luckysheet.getluckysheetfile = getluckysheetfile;
 //获取当前表格 选区
 luckysheet.getluckysheet_select_save = getluckysheet_select_save;
 
+//设置当前表格 选区
+luckysheet.setluckysheet_select_save = setluckysheet_select_save;
+
 //获取当前表格 config配置
 luckysheet.getconfig = getconfig;
 
-//获取当前表格 行高数据
+//设置当前表格 config配置
-luckysheet.getvisibledatarow = getvisibledatarow;
+luckysheet.setconfig = setconfig;
+
+//二维数组数据 转化成 {r, c, v}格式 一维数组 (传入参数为二维数据data)
+luckysheet.getGridData = sheetmanage.getGridData;
+
+//生成表格所需二维数组 （传入参数为表格数据对象file）
+luckysheet.buildGridData = sheetmanage.buildGridData;
 
-//获取当前表格 列宽数据
+luckysheet.luckysheetrefreshgrid = luckysheetrefreshgrid;
-luckysheet.getvisibledatacolumn = getvisibledatacolumn;
 
 export {
     luckysheet

src/demoData/sheetPivotTable.js

@@ -22,27 +22,27 @@ const sheetPivotTable = {
 	"celldata": [{
 		"r": 0,
 		"c": 0,
-		"v": "计数:分数"
+		"v": "count:score"
 	}, {
 		"r": 0,
 		"c": 1,
-		"v": "理综"
+		"v": "science"
 	}, {
 		"r": 0,
 		"c": 2,
-		"v": "数学"
+		"v": "mathematics"
 	}, {
 		"r": 0,
 		"c": 3,
-		"v": "英语"
+		"v": "foreign language"
 	}, {
 		"r": 0,
 		"c": 4,
-		"v": "语文"
+		"v": "English"
 	}, {
 		"r": 0,
 		"c": 5,
-		"v": "总计"
+		"v": "total"
 	}, {
 		"r": 1,
 		"c": 0,
@@ -118,7 +118,7 @@ const sheetPivotTable = {
 	}, {
 		"r": 4,
 		"c": 0,
-		"v": "总计"
+		"v": "total"
 	}, {
 		"r": 4,
 		"c": 1,
@@ -168,32 +168,32 @@ const sheetPivotTable = {
 			"row_focus": 0,
 			"column_focus": 0
 		},
-		"pivotDataSheetIndex": 5, //The sheet index where the source data is located
+		"pivotDataSheetIndex": 6, //The sheet index where the source data is located
 		"column": [{
 			"index": 3,
-			"name": "科目",
+			"name": "subject",
-			"fullname": "科目"
+			"fullname": "subject"
 		}],
 		"row": [{
 			"index": 1,
-			"name": "学生",
+			"name": "student",
-			"fullname": "学生"
+			"fullname": "student"
 		}],
 		"filter": [],
 		"values": [{
 			"index": 4,
-			"name": "分数",
+			"name": "score",
-			"fullname": "计数:分数",
+			"fullname": "count:score",
 			"sumtype": "COUNTA",
 			"nameindex": 0
 		}],
 		"showType": "column",
 		"pivotDatas": [
-			["计数:分数", "理综", "数学", "英语", "语文", "总计"],
+			["count:score", "science", "mathematics", "foreign language", "English", "total"],
 			["Alex", 1, 1, 1, 1, 4],
 			["Joy", 1, 1, 1, 1, 4],
 			["Tim", 1, 1, 1, 1, 4],
-			["总计", 3, 3, 3, 3, 12]
+			["total", 3, 3, 3, 3, 12]
 		],
 		"drawPivotTable": false,
 		"pivotTableBoundary": [5, 6]

src/demoData/sheetPivotTableData.js

@@ -19,74 +19,74 @@ const sheetPivotTableData = {
 	}],
 	"status": "0",
 	"order": "6",
-	"hide": 1,
+	"hide": 0,
 	"column": 18,
 	"row": 36,
 	"celldata": [{
 		"r": 0,
 		"c": 0,
 		"v": {
-			"m": "模考",
+			"m": "Mock test",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "模考"
+			"v": "Mock test"
 		}
 	}, {
 		"r": 0,
 		"c": 1,
 		"v": {
-			"m": "学生",
+			"m": "student",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "学生"
+			"v": "student"
 		}
 	}, {
 		"r": 0,
 		"c": 2,
 		"v": {
-			"m": "班级",
+			"m": "class",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "班级"
+			"v": "class"
 		}
 	}, {
 		"r": 0,
 		"c": 3,
 		"v": {
-			"m": "科目",
+			"m": "subject",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "科目"
+			"v": "subject"
 		}
 	}, {
 		"r": 0,
 		"c": 4,
 		"v": {
-			"m": "分数",
+			"m": "score",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "分数"
+			"v": "score"
 		}
 	}, {
 		"r": 1,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 1,
@@ -103,23 +103,23 @@ const sheetPivotTableData = {
 		"r": 1,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 1,
 		"c": 3,
 		"v": {
-			"m": "语文",
+			"m": "English",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "语文"
+			"v": "English"
 		}
 	}, {
 		"r": 1,
@@ -136,12 +136,12 @@ const sheetPivotTableData = {
 		"r": 2,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 2,
@@ -158,23 +158,23 @@ const sheetPivotTableData = {
 		"r": 2,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 2,
 		"c": 3,
 		"v": {
-			"m": "数学",
+			"m": "mathematics",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "数学"
+			"v": "mathematics"
 		}
 	}, {
 		"r": 2,
@@ -191,12 +191,12 @@ const sheetPivotTableData = {
 		"r": 3,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 3,
@@ -213,23 +213,23 @@ const sheetPivotTableData = {
 		"r": 3,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 3,
 		"c": 3,
 		"v": {
-			"m": "英语",
+			"m": "foreign language",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "英语"
+			"v": "foreign language"
 		}
 	}, {
 		"r": 3,
@@ -246,12 +246,12 @@ const sheetPivotTableData = {
 		"r": 4,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 4,
@@ -268,23 +268,23 @@ const sheetPivotTableData = {
 		"r": 4,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 4,
 		"c": 3,
 		"v": {
-			"m": "理综",
+			"m": "science",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "理综"
+			"v": "science"
 		}
 	}, {
 		"r": 4,
@@ -301,12 +301,12 @@ const sheetPivotTableData = {
 		"r": 5,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 5,
@@ -323,23 +323,23 @@ const sheetPivotTableData = {
 		"r": 5,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 5,
 		"c": 3,
 		"v": {
-			"m": "语文",
+			"m": "English",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "语文"
+			"v": "English"
 		}
 	}, {
 		"r": 5,
@@ -356,12 +356,12 @@ const sheetPivotTableData = {
 		"r": 6,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 6,
@@ -378,23 +378,23 @@ const sheetPivotTableData = {
 		"r": 6,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 6,
 		"c": 3,
 		"v": {
-			"m": "数学",
+			"m": "mathematics",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "数学"
+			"v": "mathematics"
 		}
 	}, {
 		"r": 6,
@@ -411,12 +411,12 @@ const sheetPivotTableData = {
 		"r": 7,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 7,
@@ -433,23 +433,23 @@ const sheetPivotTableData = {
 		"r": 7,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 7,
 		"c": 3,
 		"v": {
-			"m": "英语",
+			"m": "foreign language",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "英语"
+			"v": "foreign language"
 		}
 	}, {
 		"r": 7,
@@ -466,12 +466,12 @@ const sheetPivotTableData = {
 		"r": 8,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 8,
@@ -488,23 +488,23 @@ const sheetPivotTableData = {
 		"r": 8,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 8,
 		"c": 3,
 		"v": {
-			"m": "理综",
+			"m": "science",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "理综"
+			"v": "science"
 		}
 	}, {
 		"r": 8,
@@ -521,12 +521,12 @@ const sheetPivotTableData = {
 		"r": 9,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 9,
@@ -543,23 +543,23 @@ const sheetPivotTableData = {
 		"r": 9,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 9,
 		"c": 3,
 		"v": {
-			"m": "语文",
+			"m": "English",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "语文"
+			"v": "English"
 		}
 	}, {
 		"r": 9,
@@ -576,12 +576,12 @@ const sheetPivotTableData = {
 		"r": 10,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 10,
@@ -598,23 +598,23 @@ const sheetPivotTableData = {
 		"r": 10,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 10,
 		"c": 3,
 		"v": {
-			"m": "数学",
+			"m": "mathematics",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "数学"
+			"v": "mathematics"
 		}
 	}, {
 		"r": 10,
@@ -631,12 +631,12 @@ const sheetPivotTableData = {
 		"r": 11,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 11,
@@ -653,23 +653,23 @@ const sheetPivotTableData = {
 		"r": 11,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 11,
 		"c": 3,
 		"v": {
-			"m": "英语",
+			"m": "foreign language",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "英语"
+			"v": "foreign language"
 		}
 	}, {
 		"r": 11,
@@ -686,12 +686,12 @@ const sheetPivotTableData = {
 		"r": 12,
 		"c": 0,
 		"v": {
-			"m": "第一轮",
+			"m": "first round",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "第一轮"
+			"v": "first round"
 		}
 	}, {
 		"r": 12,
@@ -708,23 +708,23 @@ const sheetPivotTableData = {
 		"r": 12,
 		"c": 2,
 		"v": {
-			"m": "一班",
+			"m": "Class one",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "一班"
+			"v": "Class one"
 		}
 	}, {
 		"r": 12,
 		"c": 3,
 		"v": {
-			"m": "理综",
+			"m": "science",
 			"ct": {
 				"fa": "General",
 				"t": "g"
 			},
-			"v": "理综"
+			"v": "science"
 		}
 	}, {
 		"r": 12,

src/function/func.js

@@ -184,11 +184,12 @@ function luckysheet_compareWith() {
                             fp[m][n] = booleanToNum(fp[m][n]);
                             tp[m][n] = booleanToNum(tp[m][n]);
 
+                            let value;
                             if(isRealNum(fp[m][n]) && isRealNum(tp[m][n])){
-                                let value = parseFloat(fp[m][n]) * parseFloat(tp[m][n]);
+                                value = parseFloat(fp[m][n]) * parseFloat(tp[m][n]);
                             }
                             else{
-                                let value = error.v;
+                                value = error.v;
                             }
 
                             rowArr.push(value);

src/global/createdom.js

@@ -97,7 +97,7 @@ export default function luckysheetcreatedom(colwidth, rowheight, data, menu, tit
     //新建行菜单
     $("body").append(maskHTML);
     $("body").append(colsmenuHTML);
-    $("body").append(rightclickHTML);
+    $("body").append(rightclickHTML());
     $("body").append(inputHTML);
     $("body").append(replaceHtml(filtermenuHTML(), { "menuid": "filter" }));
     $("body").append(replaceHtml(filtersubmenuHTML(), { "menuid": "filter" }));

src/global/draw.js

@@ -776,7 +776,8 @@ function luckysheetDrawMain(scrollWidth, scrollHeight, drawWidth, drawHeight, of
         luckysheetTableContent.font = fontset;
 
         let textMetrics = luckysheetTableContent.measureText(value).width;
-        let oneLineTextHeight = menuButton.getTextSize("田", fontset)[1];
+        // let oneLineTextHeight = menuButton.getTextSize("田", fontset)[1];
+        let oneLineTextHeight = menuButton.getTextSize(value, fontset)[1];
 
         let textW, textH; 
 

src/locale/en.js

@@ -415,7 +415,65 @@ export default {
        filterCancel:"Cancel",
        clearFilter:"Clear filter",
 
-
+    },
+    rightclick: {
+        copy: 'Copy',
+        copyAs: 'Copy as',
+        paste: 'Paste',
+        insert: 'Insert',
+        delete: 'Delete',
+        deleteSelected: 'Delete selected ',
+        hide: 'Hide',
+        hideSelected: 'Hide selected ',
+        showHide: 'Show hide',
+        to: 'Towards',
+        left: 'Left',
+        right: 'Right',
+        top: 'Top',
+        bottom: 'Bottom',
+        add: 'Add',
+        row: 'Row',
+        column: 'Column',
+        width: 'Width',
+        height: 'Height',
+        number: 'Number',
+        confirm: 'Confirm',
+        orderAZ: 'A-Z order',
+        orderZA: 'Z-A order',
+        clearContent: 'Clear content',
+        matrix: 'Matrix operation selection',
+        sortSelection: 'Sort selection',
+        filterSelection: 'Filter selection',
+        chartGeneration: 'Chart generation',
+        firstLineTitle: 'First line title',
+        untitled: 'Untitled',
+        array1: 'One-dimensional array',
+        array2: 'Two-dimensional array',
+        array3: 'Multidimensional Arrays',
+        diagonal: 'Diagonal',
+        antiDiagonal: 'Anti-diagonal',
+        diagonalOffset: 'Diagonal offset',
+        offset: 'Offset',
+        Boolean: '布尔值',
+        flip: 'Flip',
+        upAndDown: 'Up and down',
+        leftAndRight: 'Left and right',
+        clockwise: 'Clockwise',
+        counterclockwise: 'Counterclockwise',
+        transpose: 'Transpose',
+        matrixCalculation: 'Matrix calculation',
+        plus: 'Plus',
+        minus: 'Minus',
+        multiply: 'Multiply',
+        divided: 'Divided',
+        power: 'Power',
+        root: 'Root',
+        log: 'Log',
+        delete0: 'Delete 0 values at both ends',
+        removeDuplicate: 'Remove duplicate values',
+        byRow: 'By row',
+        byCol: 'By column',
+        generateNewMatrix: 'Generate new matrix',
     }
   };
   

src/locale/zh.js

@@ -429,6 +429,73 @@ export default {
         clearFilter:"清除筛选",
 
         conditionNone:"无",
-       
+        conditionCellIsNull:"单元格为空",
+        conditionCellNotNull:"单元格有数据",
+        conditionCellTextContain:"文本包含",
+        conditionCellTextNotContain:"文本不包含",
+        conditionNone:"无",
+        conditionNone:"无",
+        conditionNone:"无",
+        conditionNone:"无",
+        conditionNone:"无",
+    },
+    rightclick: {
+        copy: '复制',
+        copyAs: '复制为',
+        paste: '粘贴',
+        insert: '插入',
+        delete: '删除',
+        deleteSelected: '删除选中',
+        hide: '隐藏',
+        hideSelected: '隐藏选中',
+        showHide: '显示隐藏',
+        to: '向',
+        left: '左',
+        right: '右',
+        top: '上',
+        bottom: '下',
+        add: '增加',
+        row: '行',
+        column: '列',
+        width: '宽',
+        height: '高',
+        number: '数字',
+        confirm: '确认',
+        orderAZ: 'A-Z顺序排列',
+        orderZA: 'Z-A降序排列',
+        clearContent: '清除内容',
+        matrix: '矩阵操作选区',
+        sortSelection: '排序选区',
+        filterSelection: '筛选选区',
+        chartGeneration: '图表生成',
+        firstLineTitle: '首行为标题',
+        untitled: '无标题',
+        array1: '一维数组',
+        array2: '二维数组',
+        array3: '多维数组',
+        diagonal: '对角线',
+        antiDiagonal: '反对角线',
+        diagonalOffset: '对角偏移',
+        offset: '偏移量',
+        boolean: '布尔值',
+        flip: '翻转',
+        upAndDown: '上下',
+        leftAndRight: '左右',
+        clockwise: '顺时针',
+        counterclockwise: '逆时针',
+        transpose: '转置',
+        matrixCalculation: '矩阵计算',
+        plus: '加',
+        minus: '减',
+        multiply: '乘',
+        divided: '除',
+        power: '次方',
+        root: '次方根',
+        log: 'log',
+        delete0: '删除两端0值',
+        removeDuplicate: '删除重复值',
+        byRow: '按行',
+        byCol: '按列',
+        generateNewMatrix: '生成新矩阵',
     }
 };