diff --git a/src/controllers/matrixOperation.js b/src/controllers/matrixOperation.js index 95692ce0d..6a7971787 100644 --- 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 index 7651f26fe..bb321ccb6 100644 --- 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',