fix(bug): bug

bug
dream-num · Aug 5, 2020 · c578c0e · c578c0e
1 parent fc8f61b
commit c578c0e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/controllers/matrixOperation.js b/src/controllers/matrixOperation.js
@@ -1,14 +1,20 @@
 import selection from './selection';
 import { 
-    numFormat,luckysheetContainerFocus,
+    getObjType,
+    chatatABC,
+    numFormat,
+    luckysheetContainerFocus,
 } from '../utils/util';
 import { hasPartMC, isEditMode } from '../global/validate';
 import { getdatabyselection, getcellvalue } from '../global/getdata';
 import tooltip from '../global/tooltip';
 import editor from '../global/editor';
+import locale from '../locale/locale';
 import Store from '../store';
 
 export function initialMatrixOperation(){
+    const locale_drag = locale().drag;
+
     //右键功能键
     //复制为json格式字符串，首行为标题
     $("#luckysheet-copy-json-head").click(function (event) {
@@ -641,11 +647,12 @@ export function initialMatrixOperation(){
             for (let c = 0; c < getdata[0].length; c++) {
                 let bool = false;
 
+                let v;
                 if(getObjType(getdata[r][c]) == "object"){
-                    let v = getdata[r][c].v;
+                    v = getdata[r][c].v;
                 }
                 else{
-                    let v = getdata[r][c];
+                    v = getdata[r][c];
                 }
 
                 if (v == null || v == "") {

diff --git a/src/locale/en.js b/src/locale/en.js
@@ -523,7 +523,7 @@ export default {
         antiDiagonal: 'Anti-diagonal',
         diagonalOffset: 'Diagonal offset',
         offset: 'Offset',
-        Boolean: '布尔值',
+        boolean: 'Boolean',
         flip: 'Flip',
         upAndDown: 'Up and down',
         leftAndRight: 'Left and right',