From e6cfa3156ac2ec8989f3716601dc27bcfbdc4d13 Mon Sep 17 00:00:00 2001 From: liuyang Date: Tue, 28 Jul 2020 22:09:55 +0800 Subject: [PATCH] feat(gloabe improve and bug fix): global improve and bug fix,include formula,find and replace,filter --- src/controllers/constant.js | 30 ++- src/controllers/handler.js | 408 ++++++++++++++++--------------- src/controllers/insertFormula.js | 2 +- src/controllers/searchReplace.js | 6 +- src/controllers/select.js | 8 +- src/controllers/sheetmanage.js | 26 +- src/core.js | 3 +- src/global/count.js | 13 +- src/global/createdom.js | 19 +- src/global/formula.js | 45 ++-- src/global/method.js | 4 +- src/global/tooltip.js | 2 +- src/locale/en.js | 64 ++++- src/locale/zh.js | 76 +++++- 14 files changed, 456 insertions(+), 250 deletions(-) diff --git a/src/controllers/constant.js b/src/controllers/constant.js index 9697dd0..cc2d881 100644 --- a/src/controllers/constant.js +++ b/src/controllers/constant.js @@ -1,19 +1,24 @@ import locale from '../locale/locale'; //dom variable -const gridHTML = '
' + +const gridHTML = function(){ + + const _locale = locale(); + const locale_info = _locale.info; + + return '
' + '' + '
' + '' + '
' + - '
' + + '
' + '' + '
' + '
' + - '' + + '' + '
' + - '
新打开
' + - '
待更新
' + + '
'+locale_info.detailUpdate+'
' + + '
'+locale_info.wait+'
' + '
${functionButton}
' + '
' + '
${menu}
' + @@ -160,8 +165,10 @@ const gridHTML = '
' + '
' + '' + '
' + - '
', - columeHeader_word = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'], + '
'; +} + +const columeHeader_word = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'], columeHeader_word_index = { 'A': 0, 'B': 1, 'C': 2, 'D': 3, 'E': 4, 'F': 5, 'G': 6, 'H': 7, 'I': 8, 'J': 9, 'K': 10, 'L': 11, 'M': 12, 'N': 13, 'O': 14, 'P': 15, 'Q': 16, 'R': 17, 'S': 18, 'T': 19, 'U': 20, 'V': 21, 'W': 22, 'X': 23, 'Y': 24, 'Z': 25 }, flow = '
${flow}
', colsmenuHTML = ''; @@ -434,7 +441,7 @@ const pivottableconfigHTML = '
${item}
', sheetselectlistitemHTML = '
${icon}${name}
', inputHTML = '
', - modelHTML = '', + modelHTML = '', maskHTML = '
'; @@ -1150,8 +1157,13 @@ function menuToolBar (){ ${toolbar.splitColumn}
`; } -const luckysheetlodingHTML = '
渲染中...
'; + +const luckysheetlodingHTML = function(){ + const _locale = locale() + const info =_locale.info; + return'
'+info.loading+'...
'; +} // var menusetting = { // menu_selectall: '
全选
', // menu_copy: '
复制
', diff --git a/src/controllers/handler.js b/src/controllers/handler.js index cf64581..8fc10e2 100644 --- a/src/controllers/handler.js +++ b/src/controllers/handler.js @@ -89,6 +89,14 @@ export default function luckysheetHandler() { event.preventDefault(); }); + const _locale = locale(); + const locale_drag = _locale.drag; + const locale_sheetconfig = _locale.sheetconfig; + const locale_info = _locale.info; + const locale_filter = _locale.filter; + const locale_button= _locale.button; + const locale_formula= _locale.formula; + $("#luckysheet-grid-window-1").mousewheel(function (event, delta) { let scrollLeft = $("#luckysheet-scrollbar-x").scrollLeft(), scrollTop = $("#luckysheet-scrollbar-y").scrollTop(); @@ -2281,10 +2289,10 @@ export default function luckysheetHandler() { //选区包含部分单元格 if(hasPartMC(cfg, last["row"][0], last["row"][1], last["column"][0], last["column"][1])){ if(isEditMode()){ - alert("无法对合并单元格执行此操作"); + alert(locale_drag.noMerge); } else{ - tooltip.info('提示',"无法对合并单元格执行此操作"); + tooltip.info('',locale_drag.noMerge); } return; } @@ -2317,10 +2325,10 @@ export default function luckysheetHandler() { //替换的位置包含部分单元格 if(hasPartMC(cfg, row_s, row_e, col_s, col_e)){ if(isEditMode()){ - alert("无法对合并单元格执行此操作"); + alert(locale_drag.noMerge); } else{ - tooltip.info('提示',"无法对合并单元格执行此操作"); + tooltip.info('',locale_drag.noMerge); } return; } @@ -2553,7 +2561,7 @@ export default function luckysheetHandler() { //是否有数据透视表范围 if(pivotTable.isPivotRange(row_s, col_e)){ - tooltip.info("无法对所选单元格进行此更改，因为它会影响数据透视表！",""); + tooltip.info(locale_drag.affectPivot,""); return; } } @@ -2565,7 +2573,7 @@ export default function luckysheetHandler() { //是否有数据透视表范围 if(pivotTable.isPivotRange(row_e, col_e)){ - tooltip.info("无法对所选单元格进行此更改，因为它会影响数据透视表！",""); + tooltip.info(locale_drag.affectPivot,""); return; } } @@ -2584,7 +2592,7 @@ export default function luckysheetHandler() { //是否有数据透视表范围 if(pivotTable.isPivotRange(row_e, col_s)){ - tooltip.info("无法对所选单元格进行此更改，因为它会影响数据透视表！",""); + tooltip.info(locale_drag.affectPivot,""); return; } } @@ -2596,7 +2604,7 @@ export default function luckysheetHandler() { //是否有数据透视表范围 if(pivotTable.isPivotRange(row_e, col_e)){ - tooltip.info("无法对所选单元格进行此更改，因为它会影响数据透视表！",""); + tooltip.info(locale_drag.affectPivot,""); return; } } @@ -2622,10 +2630,10 @@ export default function luckysheetHandler() { if(hasMc){ if(isEditMode()){ - alert("无法对合并单元格执行此操作"); + alert(locale_drag.noMerge); } else{ - tooltip.info("无法对合并单元格执行此操作", ""); + tooltip.info(locale_drag.noMerge, ""); } return; @@ -2644,10 +2652,10 @@ export default function luckysheetHandler() { if(hasMc){ if(isEditMode()){ - alert("无法对合并单元格执行此操作"); + alert(locale_drag.noMerge); } else{ - tooltip.info("无法对合并单元格执行此操作", ""); + tooltip.info(locale_drag.noMerge, ""); } return; @@ -2900,10 +2908,10 @@ export default function luckysheetHandler() { if (isNaN(parseInt(value))) { if(isEditMode()){ - alert("请输入数字"); + alert(locale_info.tipInputNumber); } else{ - tooltip.info("增加错误", "请输入数字"); + tooltip.info("error", locale_info.tipInputNumber); } return; } @@ -2911,10 +2919,10 @@ export default function luckysheetHandler() { value = parseInt(value); if (value < 1 || value > 100) { if(isEditMode()){ - alert("增加范围限制在1-100"); + alert(locale_info.tipInputNumberLimit); } else{ - tooltip.info("增加错误", "增加范围限制在1-100"); + tooltip.info("error", locale_info.tipInputNumberLimit); } return; } @@ -3143,10 +3151,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noMerge, ""); } return; } @@ -3182,10 +3190,10 @@ export default function luckysheetHandler() { if(hasCF){ if(isEditMode()){ - alert("无法对多重选择区域执行此操作"); + alert(locale_drag.noMulti); } else{ - tooltip.info("无法对多重选择区域执行此操作", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -3211,10 +3219,10 @@ export default function luckysheetHandler() { if((!isSameRow && !isSameCol) || selectIsOverlap()){ if(isEditMode()){ - alert("无法对多重选择区域执行此操作"); + alert(locale_drag.noMulti); } else{ - tooltip.info("无法对多重选择区域执行此操作", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -3254,10 +3262,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("无法在此处粘贴此内容，请选择粘贴区域的一个单元格，然后再次尝试粘贴"); + alert(locale_drag.noPaste); } else{ - tooltip.info("无法在此处粘贴此内容，请选择粘贴区域的一个单元格，然后再次尝试粘贴", ""); + tooltip.info(locale_drag.noPaste, ""); } return; } @@ -3297,10 +3305,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(luckysheetConfigsetting.editMode){ - alert("无法对合并单元格执行此操作"); + alert(_locale_drag.noMerge); } else{ - tooltip.info("无法对合并单元格执行此操作", ""); + tooltip.info(_locale_drag.noMerge, ""); } return; } @@ -3309,10 +3317,10 @@ export default function luckysheetHandler() { //多重选区时 提示 if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -3504,7 +3512,6 @@ export default function luckysheetHandler() { //右键菜单 复制按钮 $("#luckysheet-copy-btn, #luckysheet-cols-copy-btn, #luckysheet-paste-btn-title").click(function (event) { $(this).parent().hide(); - //复制范围内包含部分合并单元格，提示 if(Store.config["merge"] != null){ let has_PartMC = false; @@ -3524,10 +3531,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -3563,10 +3570,10 @@ export default function luckysheetHandler() { if(hasCF){ if(isEditMode()){ - alert("无法对多重选择区域执行此操作"); + alert(locale_drag.noMulti); } else{ - tooltip.info("无法对多重选择区域执行此操作", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -3592,10 +3599,10 @@ export default function luckysheetHandler() { if((!isSameRow && !isSameCol) || selectIsOverlap()){ if(isEditMode()){ - alert("无法对多重选择区域执行此操作"); + alert(locale_drag.noMulti); } else{ - tooltip.info("无法对多重选择区域执行此操作", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -3648,7 +3655,6 @@ export default function luckysheetHandler() { //菜单栏 截图按钮 $("#luckysheet-chart-btn-screenshot").click(function () { - const _locale = locale(); const locale_screenshot = _locale.screenshot; if(Store.luckysheet_select_save.length == 0){ if(isEditMode()){ @@ -3765,7 +3771,6 @@ export default function luckysheetHandler() { //截图下载 $(document).on("click", "a.download", function(){ let dataURI = $("#luckysheet-confirm-screenshot-save img").attr("src"); - const _locale = locale(); const locale_screenshot = _locale.screenshot; let binStr = atob(dataURI.split(",")[1]), len = binStr.length, @@ -3805,13 +3810,15 @@ export default function luckysheetHandler() { return; } + const locale_splitText = _locale.splitText; + if(Store.luckysheet_select_save.length > 1){ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_splitText.tipNoMulti, ""); return; } if(Store.luckysheet_select_save[0].column[0] != Store.luckysheet_select_save[0].column[1]){ - tooltip.info("一次只能转换一列数据，选定区域可以有多行，但不能有多列，请在选定单列区域以后再试", ""); + tooltip.info(locale_splitText.tipNoMultiColumn, ""); return; } @@ -5256,10 +5263,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5283,10 +5290,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -5327,12 +5334,13 @@ export default function luckysheetHandler() { $("body .luckysheet-cols-menu").hide(); $("#" + Store.container).attr("tabindex", 0).focus(); + if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5356,10 +5364,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -5389,10 +5397,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5416,10 +5424,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -5444,12 +5452,13 @@ export default function luckysheetHandler() { $("body .luckysheet-cols-menu").hide(); $("#" + Store.container).attr("tabindex", 0).focus(); + if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5473,10 +5482,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -5504,10 +5513,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5531,10 +5540,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -5582,20 +5591,20 @@ export default function luckysheetHandler() { if(row.toString() == "NaN" || col.toString() == "NaN"){ if(isEditMode()){ - alert("请输入正确的数值!"); + alert(locale_drag.inputCorrect); } else{ - tooltip.info("请输入正确的数值!", ""); + tooltip.info(locale_drag.inputCorrect, ""); } return; } if(row < 1 || col < 1){ if(isEditMode()){ - alert("行列数不能小于1!"); + alert(locale_drag.notLessOne); } else{ - tooltip.info("行列数不能小于1!", ""); + tooltip.info(locale_drag.notLessOne, ""); } return; } @@ -5624,10 +5633,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5651,10 +5660,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -5682,12 +5691,13 @@ export default function luckysheetHandler() { $("body .luckysheet-cols-menu").hide(); $("#" + Store.container).attr("tabindex", 0).focus(); + if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5711,10 +5721,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -5744,10 +5754,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5771,10 +5781,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -5791,20 +5801,20 @@ export default function luckysheetHandler() { if(offset.toString() == "NaN"){ if(isEditMode()){ - alert("请输入正确的数值！"); + alert(locale_drag.inputCorrect); } else{ - tooltip.info("请输入正确的数值！", ""); + tooltip.info(locale_drag.inputCorrect, ""); } return; } if(offset < 0){ if(isEditMode()){ - alert("偏移列不能为负数！"); + alert(locale_drag.offsetColumnLessZero); } else{ - tooltip.info("偏移列不能为负数！", ""); + tooltip.info(locale_drag.offsetColumnLessZero, ""); } return; } @@ -5828,12 +5838,13 @@ export default function luckysheetHandler() { $("body .luckysheet-cols-menu").hide(); $("#" + Store.container).attr("tabindex", 0).focus(); + if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5857,10 +5868,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; } @@ -5910,10 +5921,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5946,10 +5957,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -5982,10 +5993,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -6018,10 +6029,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -6054,10 +6065,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -6103,10 +6114,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -6121,10 +6132,10 @@ export default function luckysheetHandler() { if(calvalue.toString() == "NaN"){ if(isEditMode()){ - alert("请输入正确的数值！"); + alert(locale_drag.inputCorrect); } else{ - tooltip.info("请输入正确的数值！", ""); + tooltip.info(locale_drag.inputCorrect, ""); } return; } @@ -6196,10 +6207,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -6264,10 +6275,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -6345,10 +6356,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -6406,10 +6417,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选定区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选定区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; } @@ -6487,6 +6498,7 @@ export default function luckysheetHandler() { function showsheetconfigmenu() { if (!isInitialSheetConfig) { isInitialSheetConfig = true; + let locale_toolbar = _locale.toolbar; $("#luckysheetsheetconfigcolorur").spectrum({ showPalette: true, preferredFormat: "hex", @@ -6497,12 +6509,12 @@ export default function luckysheetHandler() { hideAfterPaletteSelect: false, showSelectionPalette: true, maxPaletteSize: 10, - cancelText: locale().sheetconfig.cancelText, - chooseText: locale().sheetconfig.chooseText, - togglePaletteMoreText: "更多", - togglePaletteLessText: "少于", - clearText: "清除颜色选择", - noColorSelectedText: "没有颜色被选择", + cancelText: _locale.sheetconfig.cancelText, + chooseText: _locale.sheetconfig.chooseText, + togglePaletteMoreText: locale_toolbar.toolMore, + togglePaletteLessText: locale_toolbar.toolLess, + clearText: locale_toolbar.clearText, + noColorSelectedText: locale_toolbar.noColorSelectedText, palette: [["rgb(0, 0, 0)", "rgb(67, 67, 67)", "rgb(102, 102, 102)", "rgb(204, 204, 204)", "rgb(217, 217, 217)", "rgb(255, 255, 255)"], ["rgb(152, 0, 0)", "rgb(255, 0, 0)", "rgb(255, 153, 0)", "rgb(255, 255, 0)", "rgb(0, 255, 0)", "rgb(0, 255, 255)", "rgb(74, 134, 232)", "rgb(0, 0, 255)", "rgb(153, 0, 255)", "rgb(255, 0, 255)"], ["rgb(230, 184, 175)", "rgb(244, 204, 204)", "rgb(252, 229, 205)", "rgb(255, 242, 204)", "rgb(217, 234, 211)", "rgb(208, 224, 227)", "rgb(201, 218, 248)", "rgb(207, 226, 243)", "rgb(217, 210, 233)", "rgb(234, 209, 220)"], ["rgb(221, 126, 107)", "rgb(234, 153, 153)", "rgb(249, 203, 156)", "rgb(255, 229, 153)", "rgb(182, 215, 168)", "rgb(162, 196, 201)", "rgb(164, 194, 244)", "rgb(159, 197, 232)", "rgb(180, 167, 214)", "rgb(213, 166, 189)"], ["rgb(204, 65, 37)", "rgb(224, 102, 102)", "rgb(246, 178, 107)", "rgb(255, 217, 102)", "rgb(147, 196, 125)", "rgb(118, 165, 175)", "rgb(109, 158, 235)", "rgb(111, 168, 220)", "rgb(142, 124, 195)", "rgb(194, 123, 160)"], ["rgb(166, 28, 0)", "rgb(204, 0, 0)", "rgb(230, 145, 56)", "rgb(241, 194, 50)", "rgb(106, 168, 79)", "rgb(69, 129, 142)", "rgb(60, 120, 216)", "rgb(61, 133, 198)", "rgb(103, 78, 167)", "rgb(166, 77, 121)"], ["rgb(91, 15, 0)", "rgb(102, 0, 0)", "rgb(120, 63, 4)", "rgb(127, 96, 0)", "rgb(39, 78, 19)", "rgb(12, 52, 61)", "rgb(28, 69, 135)", "rgb(7, 55, 99)", "rgb(32, 18, 77)", "rgb(76, 17, 48)"], ["#c1232b", "#27727b", "#fcce10", "#e87c25", "#b5c334", "#fe8463", "#9bca63", "#fad860", "#f3a43b", "#60c0dd", "#d7504b", "#c6e579", "#f4e001", "#f0805a", "#26c0c0", "#c12e34", "#e6b600", "#0098d9", "#2b821d", "#005eaa", "#339ca8", "#cda819", "#32a487", "#3fb1e3", "#6be6c1", "#626c91", "#a0a7e6", "#c4ebad", "#96dee8"]], change: function (color) { let $input = $(this); @@ -6681,14 +6693,15 @@ export default function luckysheetHandler() { $("#luckysheet-sheet-area").on("blur", "span.luckysheet-sheets-item-name", function (e) { let $t = $(this); let txt = $t.text(), oldtxt = $t.data("oldtxt"); + let index = getSheetIndex(Store.currentSheetIndex); for (let i = 0; i < Store.luckysheetfile.length; i++) { if (index != i && Store.luckysheetfile[i].name == txt) { if(isEditMode()){ - alert("标签页的名称不能重复！请重新修改"); + alert(locale_sheetconfig.tipNameRepeat); } else{ - tooltip.info("提示", "标签页的名称不能重复！请重新修改"); + tooltip.info("", locale_sheetconfig.tipNameRepeat); } $t.text(oldtxt).attr("contenteditable", "false"); return; @@ -6770,10 +6783,10 @@ export default function luckysheetHandler() { if($("#luckysheet-sheet-container-c .luckysheet-sheets-item:visible").length <= 1){ if(isEditMode()){ - alert("工作薄内至少含有一张可视工作表。若需删除选定的工作表，请先插入一张新工作表或显示一张隐藏的工作表。"); + alert(locale_sheetconfig.noMoreSheet); } else{ - tooltip.info("工作薄内至少含有一张可视工作表。若需删除选定的工作表，请先插入一张新工作表或显示一张隐藏的工作表。", ""); + tooltip.info(locale_sheetconfig.noMoreSheet, ""); } return; @@ -6781,7 +6794,7 @@ export default function luckysheetHandler() { let index = getSheetIndex(Store.currentSheetIndex); - tooltip.confirm("是否删除【" + Store.luckysheetfile[index].name + "】？", "可以通过Ctrl+Z撤销删除", function () { + tooltip.confirm(locale_sheetconfig.confirmDelete+"【" + Store.luckysheetfile[index].name + "】？", ""+locale_sheetconfig.redoDelete+"", function () { sheetmanage.deleteSheet(luckysheetcurrentSheetitem.data("index")); }, null); @@ -6797,10 +6810,10 @@ export default function luckysheetHandler() { $("#luckysheetsheetconfighide").click(function () { if ($("#luckysheet-sheet-area div.luckysheet-sheets-item:visible").length == 1) { if(isEditMode()){ - alert("不能隐藏, 至少保留一个sheet标签"); + alert(locale_sheetconfig.noHide); } else{ - tooltip.info("不能隐藏", "至少保留一个sheet标签"); + tooltip.info("", locale_sheetconfig.noHide); } return; } @@ -6884,7 +6897,7 @@ export default function luckysheetHandler() { $("#luckysheet-sheet-list").on("click", ".luckysheet-cols-menuitem", function (e) { if(isEditMode()){ // tooltip.info("提示", "图表编辑模式下不允许该操作！"); - alert("图表编辑模式下不允许该操作！"); + alert(locale_sheetconfig.chartEditNoOpt); return; } @@ -6915,10 +6928,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; @@ -6927,10 +6940,10 @@ export default function luckysheetHandler() { let $t = $(this), value = $t.parent().find("input").val(); if (!isRealNum(value)) { if(isEditMode()){ - alert("增加错误, 请输入数字"); + alert(locale_info.tipInputNumber); } else{ - tooltip.info("增加错误, 请输入数字", ""); + tooltip.info(locale_info.tipInputNumber, ""); } return; @@ -6940,10 +6953,10 @@ export default function luckysheetHandler() { if (value < 1 || value > 100) { if(isEditMode()){ - alert("增加错误, 增加范围限制在1-100"); + alert(locale_info.tipInputNumberLimit); } else{ - tooltip.info("增加错误, 增加范围限制在1-100", ""); + tooltip.info(locale_info.tipInputNumberLimit, ""); } return; } @@ -6957,10 +6970,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; @@ -6969,10 +6982,10 @@ export default function luckysheetHandler() { let $t = $(this), value = $t.parent().find("input").val(); if (!isRealNum(value)) { if(isEditMode()){ - alert("增加错误, 请输入数字"); + alert(locale_info.tipInputNumber); } else{ - tooltip.info("增加错误, 请输入数字", ""); + tooltip.info(locale_info.tipInputNumber, ""); } return; @@ -6982,10 +6995,10 @@ export default function luckysheetHandler() { if (value < 1 || value > 100) { if(isEditMode()){ - alert("增加错误, 增加范围限制在1-100"); + alert(llocale_info.tipInputNumberLimit); } else{ - tooltip.info("增加错误, 增加范围限制在1-100", ""); + tooltip.info(llocale_info.tipInputNumberLimit, ""); } return; } @@ -6999,10 +7012,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; @@ -7011,10 +7024,10 @@ export default function luckysheetHandler() { let $t = $(this), value = $t.parent().find("input").val(); if (!isRealNum(value)) { if(isEditMode()){ - alert("增加错误, 请输入数字"); + alert(locale_info.tipInputNumber); } else{ - tooltip.info("增加错误, 请输入数字", ""); + tooltip.info(locale_info.tipInputNumber, ""); } return; @@ -7024,10 +7037,10 @@ export default function luckysheetHandler() { if (value < 1 || value > 100) { if(isEditMode()){ - alert("增加错误, 增加范围限制在1-100"); + alert(llocale_info.tipInputNumberLimit); } else{ - tooltip.info("增加错误, 增加范围限制在1-100", ""); + tooltip.info(llocale_info.tipInputNumberLimit, ""); } return; } @@ -7043,10 +7056,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; @@ -7055,10 +7068,10 @@ export default function luckysheetHandler() { let $t = $(this), value = $t.parent().find("input").val(); if (!isRealNum(value)) { if(isEditMode()){ - alert("增加错误, 请输入数字"); + alert(locale_info.tipInputNumber); } else{ - tooltip.info("增加错误, 请输入数字", ""); + tooltip.info(locale_info.tipInputNumber, ""); } return; @@ -7068,10 +7081,10 @@ export default function luckysheetHandler() { if (value < 1 || value > 100) { if(isEditMode()){ - alert("增加错误, 增加范围限制在1-100"); + alert(llocale_info.tipInputNumberLimit); } else{ - tooltip.info("增加错误, 增加范围限制在1-100", ""); + tooltip.info(llocale_info.tipInputNumberLimit, ""); } return; @@ -7086,10 +7099,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; @@ -7098,10 +7111,10 @@ export default function luckysheetHandler() { let $t = $(this), value = $t.parent().find("input").val(); if (!isRealNum(value)) { if(isEditMode()){ - alert("增加错误, 请输入数字"); + alert(locale_info.tipInputNumber); } else{ - tooltip.info("增加错误, 请输入数字", ""); + tooltip.info(locale_info.tipInputNumber, ""); } return; @@ -7111,10 +7124,10 @@ export default function luckysheetHandler() { if (value < 1 || value > 100) { if(isEditMode()){ - alert("增加错误, 增加范围限制在1-100"); + alert(llocale_info.tipInputNumberLimit); } else{ - tooltip.info("增加错误, 增加范围限制在1-100", ""); + tooltip.info(llocale_info.tipInputNumberLimit, ""); } return; @@ -7129,10 +7142,10 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } return; @@ -7141,10 +7154,10 @@ export default function luckysheetHandler() { let $t = $(this), value = $t.parent().find("input").val(); if (!isRealNum(value)) { if(isEditMode()){ - alert("增加错误, 请输入数字"); + alert(locale_info.tipInputNumber); } else{ - tooltip.info("增加错误, 请输入数字", ""); + tooltip.info(locale_info.tipInputNumber, ""); } return; @@ -7154,10 +7167,10 @@ export default function luckysheetHandler() { if (value < 1 || value > 100) { if(isEditMode()){ - alert("增加错误, 增加范围限制在1-100"); + alert(llocale_info.tipInputNumberLimit); } else{ - tooltip.info("增加错误, 增加范围限制在1-100", ""); + tooltip.info(llocale_info.tipInputNumberLimit, ""); } return; @@ -7175,18 +7188,18 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(Store.luckysheetRightHeadClickIs == "row"){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } } else if(Store.luckysheetRightHeadClickIs == "column"){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } } return; @@ -7203,18 +7216,18 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(Store.luckysheetRightHeadClickIs == "row"){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } } else if(Store.luckysheetRightHeadClickIs == "column"){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } } return; @@ -7231,18 +7244,18 @@ export default function luckysheetHandler() { if(Store.luckysheet_select_save.length > 1){ if(Store.luckysheetRightHeadClickIs == "row"){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } } else if(Store.luckysheetRightHeadClickIs == "column"){ if(isEditMode()){ - alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试"); + alert(locale_drag.noMulti); } else{ - tooltip.info("不能对多重选择区域执行此操作，请选择单个区域，然后再试", ""); + tooltip.info(locale_drag.noMulti, ""); } } return; @@ -7361,10 +7374,10 @@ export default function luckysheetHandler() { if(has_PartMC){ if(isEditMode()){ - alert("无法对部分合并单元格执行此操作"); + alert(locale_drag.noPartMerge); } else{ - tooltip.info("无法对部分合并单元格执行此操作", ""); + tooltip.info(locale_drag.noPartMerge, ""); } return; @@ -7413,10 +7426,10 @@ export default function luckysheetHandler() { if(size < 0 || size > 255){ if(isEditMode()){ - alert("数值必须在0 ~ 255之间"); + alert(llocale_info.tipRowHeightLimit); } else{ - tooltip.info("数值必须在0 ~ 255之间", ""); + tooltip.info(llocale_info.tipRowHeightLimit, ""); } return; @@ -7526,7 +7539,6 @@ export default function luckysheetHandler() { let luckysheet_sort_initial = true; $("#luckysheetorderby").click(function () { $("body .luckysheet-cols-menu").hide(); - const _locale = locale(); const locale_sort = _locale.sort; if(Store.luckysheet_select_save.length > 1){ if(isEditMode()){ @@ -7547,7 +7559,7 @@ export default function luckysheetHandler() { let content = `
${locale_sort.hasTitle}
+ ${locale_sort.addOthers}
`; - $("body").append(replaceHtml(modelHTML, { "id": "luckysheet-sort-dialog", "addclass": "", "title": "排序范围", "content": content, "botton": ``})); + $("body").append(replaceHtml(modelHTML, { "id": "luckysheet-sort-dialog", "addclass": "", "title": _locale.sort.sortTitle, "content": content, "botton": ``})); $("#luckysheet-sort-dialog .luckysheet-sort-dialog-additem").click(function () { let last = Store.luckysheet_select_save[0]; @@ -7812,7 +7824,7 @@ export default function luckysheetHandler() { setTimeout(function () { if ($t.attr("id") == "luckysheet-filter-bycondition" && $("#luckysheet-filter-bycondition").next().is(":visible")) { - if ($("#luckysheet-filter-selected span").text() != "无") { + if ($("#luckysheet-filter-selected span").text() != locale_filter.filiterInputNone) { $("#luckysheet-filter-byvalue").next().slideUp(200); } } @@ -7879,7 +7891,7 @@ export default function luckysheetHandler() { $menu.data("edc", ed_c); $("#luckysheet-filter-menu .luckysheet-filter-selected-input").hide().find("input").val(); - $("#luckysheet-filter-selected span").data("type", "0").data("type", null).text("无"); + $("#luckysheet-filter-selected span").data("type", "0").data("type", null).text(locale_filter.filiterInputNone); let byconditiontype = $t.data("byconditiontype"); $("#luckysheet-filter-selected span").data("value", $t.data("byconditionvalue")).data("type", byconditiontype).text($t.data("byconditiontext")); @@ -7901,7 +7913,7 @@ export default function luckysheetHandler() { orderbydatafiler(st_r, st_c, ed_r, ed_c, cindex, false); }); - $("#luckysheet-filter-byvalue-select").empty().html('
数据量大！请稍后
'); + $("#luckysheet-filter-byvalue-select").empty().html('
'+locale_filter.filiterMoreDataTip+'
'); let rowhiddenother = {}; //其它筛选列的隐藏行 $("#luckysheet-filter-options-sheet" + Store.currentSheetIndex + " .luckysheet-filter-options").not(this).each(function () { @@ -8062,7 +8074,7 @@ export default function luckysheetHandler() { '
' + '' + '' + - '' + + '' + '( ' + msum + ' )' + '
' + '
' + dayHtml + '
' + @@ -8073,7 +8085,7 @@ export default function luckysheetHandler() { '
' + '' + '' + - '' + + '' + '( ' + msum + ' )' + '
' + '
' + dayHtml + '
' + @@ -8088,7 +8100,7 @@ export default function luckysheetHandler() { '
' + '' + '' + - '' + + '' + '( ' + ysum + ' )' + '
' + '
' + monthHtml + '
' + @@ -8099,7 +8111,7 @@ export default function luckysheetHandler() { '
' + '' + '' + - '' + + '' + '( ' + ysum + ' )' + '
' + '
' + monthHtml + '
' + @@ -8243,7 +8255,7 @@ export default function luckysheetHandler() { bgColorItemHtml += '
'; } } - filterBgColorHtml = '
按单元格颜色筛选
' + bgColorItemHtml + '
'; + filterBgColorHtml = '
'+locale_filter.filiterByColorTip+'
' + bgColorItemHtml + '
'; } let filterFcColorHtml = ''; @@ -8257,15 +8269,15 @@ export default function luckysheetHandler() { fcColorItemHtml += '
'; } } - filterFcColorHtml = '
按字体颜色筛选
' + fcColorItemHtml + '
'; + filterFcColorHtml = '
'+locale_filter.filiterByTextColorTip+'
' + fcColorItemHtml + '
'; } // let content; if(filterBgColorHtml == '' && filterFcColorHtml == ''){ - content = '
本列仅包含一种颜色
'; + content = '
'+locale_filter.filterContainerOneColorTip+'
'; } else{ - content = filterBgColorHtml + filterFcColorHtml + '
'; + content = filterBgColorHtml + filterFcColorHtml + '
'; } //颜色筛选子菜单 $("#luckysheet-filter-orderby-color-submenu").remove(); @@ -8677,7 +8689,7 @@ export default function luckysheetHandler() { //清除筛选 $("#luckysheet-filter-initial").click(function () { $("#luckysheet-filter-menu .luckysheet-filter-selected-input").hide().find("input").val(); - $("#luckysheet-filter-selected span").data("type", "0").data("type", null).text("无"); + $("#luckysheet-filter-selected span").data("type", "0").data("type", null).text(locale_filter.conditionNone); $('#luckysheet-filter-selected-sheet' + Store.currentSheetIndex + ', #luckysheet-filter-options-sheet' + Store.currentSheetIndex).remove(); $("#luckysheet-filter-menu, #luckysheet-filter-submenu").hide(); @@ -9106,14 +9118,14 @@ export default function luckysheetHandler() { day = "0" + Number(day); } - let month = $(e).closest(".monthBox").find(".month label").text().replace("月", ""); + let month = $(e).closest(".monthBox").find(".month label").text().replace(locale_filter.filiterMonthText, ""); if(Number(month) < 10){ month = "0" + Number(month); } - let year = $(e).closest(".yearBox").find(".year label").text().replace("年", ""); + let year = $(e).closest(".yearBox").find(".year label").text().replace(locale_filter.filiterYearText, ""); - let itemV = "日期格式#$$$#" + year + "-" + month + "-" + day; + let itemV = locale_filter.filterDateFormatTip +"#$$$#" + year + "-" + month + "-" + day; filterdata[itemV] = "1"; } @@ -9142,7 +9154,7 @@ export default function luckysheetHandler() { } else if(cell.ct != null && cell.ct.t == "d"){ let fmt = update("YYYY-MM-DD", cell.v); - value = "日期格式#$$$#" + fmt; + value = locale_filter.filterDateFormatTip +"#$$$#" + fmt; } else{ value = cell.v + "#$$$#" + cell.m; @@ -9376,10 +9388,10 @@ export default function luckysheetHandler() { //点击函数查找弹出框 if(Store.luckysheet_select_save.length == 0){ if(isEditMode()){ - alert("请选择单元格插入函数"); + alert(locale_formula.tipSelectCell); } else{ - tooltip.info("请选择单元格插入函数",""); + tooltip.info(locale_formula.tipSelectCell,""); } return; @@ -10025,10 +10037,20 @@ export default function luckysheetHandler() { luckysheetConfigsetting.pageInfo.currentPage++; if(luckysheetConfigsetting.pageInfo.totalPage == (luckysheetConfigsetting.pageInfo.currentPage)){ $("#luckysheet-bottom-page-next").hide(); - $("#luckysheet-bottom-page-info").html('共'+luckysheetConfigsetting.total +'条，'+ luckysheetConfigsetting.pageInfo.totalPage +'页，'+'已显示全部数据'); + let pageInfoFull = replaceHtml(locale_info.pageInfoFull,{ + total:luckysheetConfigsetting.total, + totalPage:luckysheetConfigsetting.pageInfo.totalPage, + }); + $("#luckysheet-bottom-page-info").html(pageInfoFull); } else{ - $("#luckysheet-bottom-page-info").html('共'+luckysheetConfigsetting.total +'条，'+ luckysheetConfigsetting.pageInfo.totalPage +'页，当前已显示'+ (luckysheetConfigsetting.pageInfo.currentPage) +'页'); + let pageInfo = replaceHtml(locale_info.pageInfo,{ + total:luckysheetConfigsetting.total, + totalPage:luckysheetConfigsetting.pageInfo.totalPage, + currentPage:luckysheetConfigsetting.pageInfo.currentPage + + }); + $("#luckysheet-bottom-page-info").html(pageInfo); } }); }).mousedown(function(e){ diff --git a/src/controllers/insertFormula.js b/src/controllers/insertFormula.js index fbe01d6..8687450 100644 --- a/src/controllers/insertFormula.js +++ b/src/controllers/insertFormula.js @@ -194,7 +194,7 @@ const insertFormula = { "id": "luckysheet-search-formula", "addclass": "luckysheet-search-formula", "title": "", - "content": "
", + "content": "
", "botton": '', "style": "z-index:100003" })); diff --git a/src/controllers/searchReplace.js b/src/controllers/searchReplace.js index da3ac20..9d64f11 100644 --- a/src/controllers/searchReplace.js +++ b/src/controllers/searchReplace.js @@ -21,6 +21,7 @@ const luckysheetSearchReplace = { const _locale = locale(); const locale_findAndReplace = _locale.findAndReplace; + const locale_button = _locale.button; let content = '
' + ''+ locale_findAndReplace.find +'' + @@ -58,8 +59,9 @@ const luckysheetSearchReplace = { "addclass": "luckysheet-search-replace", "title": "", "content": content, - "botton": '', - "style": "z-index:100003" + "botton": '', + "style": "z-index:100003", + "close":locale_button.close })); let $t = $("#luckysheet-search-replace").find(".luckysheet-modal-dialog-content").css("min-width", 500).end(), myh = $t.outerHeight(), diff --git a/src/controllers/select.js b/src/controllers/select.js index 006f3ec..beb1185 100644 --- a/src/controllers/select.js +++ b/src/controllers/select.js @@ -5,6 +5,7 @@ import { rowLocationByIndex, colLocationByIndex } from '../global/location'; import browser from '../global/browser'; import { getSheetIndex, getRangetxt } from '../methods/get'; import Store from '../store'; +import locale from '../locale/locale'; //公式函数 选区实体框 function seletedHighlistByindex(id, r1, r2, c1, c2) { @@ -347,6 +348,9 @@ function luckysheet_count_show(left, top, width, height, rowseleted, columnselet let scrollWidth = $("#luckysheet-cell-main").scrollLeft(), scrollHeight = $("#luckysheet-cell-main").scrollTop(); + const _locale = locale(); + const locale_info = _locale.info; + if (rowl >= 4) { let leftv = left - 25; if (leftv < 0) { @@ -362,7 +366,7 @@ function luckysheet_count_show(left, top, width, height, rowseleted, columnselet topv = scrollHeight + drawHeight / 2; } - $("#luckysheet-row-count-show").css({ "left": leftv, "top": topv, "display": "block" }).html("
" + rowl.toString().split("").join("
") + "
行
"); + $("#luckysheet-row-count-show").css({ "left": leftv, "top": topv, "display": "block" }).html("
" + rowl.toString().split("").join("
") + "
"+locale_info.row+"
"); } else { $("#luckysheet-row-count-show").hide(); @@ -383,7 +387,7 @@ function luckysheet_count_show(left, top, width, height, rowseleted, columnselet leftv = scrollWidth + drawWidth / 2; } - $("#luckysheet-column-count-show").css({ "left": leftv, "top": topv, "display": "block" }).text(coll + "列"); + $("#luckysheet-column-count-show").css({ "left": leftv, "top": topv, "display": "block" }).text(coll + locale_info.column); } else { $("#luckysheet-column-count-show").hide(); diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js index 5e4cc60..11b3ea1 100644 --- a/src/controllers/sheetmanage.js +++ b/src/controllers/sheetmanage.js @@ -10,7 +10,7 @@ import editor from '../global/editor'; import { luckysheetextendtable, luckysheetdeletetable } from '../global/extend'; import { isRealNum } from '../global/validate'; import { replaceHtml, getObjType, chatatABC } from '../utils/util'; -import { sheetHTML } from './constant'; +import { sheetHTML,luckysheetlodingHTML } from './constant'; import server from './server'; import luckysheetConfigsetting from './luckysheetConfigsetting'; import pivotTable from './pivotTable'; @@ -20,6 +20,7 @@ import luckysheetFreezen from './freezen'; import { createFilterOptions, labelFilterOptionState } from './filter'; import { selectHightlightShow, selectionCopyShow } from './select'; import Store from '../store'; +import locale from '../locale/locale'; const sheetmanage = { generateRandomSheetIndex: function(prefix) { @@ -62,9 +63,12 @@ const sheetmanage = { generateCopySheetName: function(file, name) { let copySheetName = ""; - if(name.toString().indexOf("(副本") > -1){ - let copy_i = name.toString().indexOf("(副本"); - let name2 = name.toString().substring(0, copy_i) + "(副本"; + let _locale = locale(); + let locale_info = _locale.info; + + if(name.toString().indexOf("("+locale_info.copy) > -1){ + let copy_i = name.toString().indexOf("("+locale_info.copy); + let name2 = name.toString().substring(0, copy_i) + "("+locale_info.copy; let index = null; for(let i = 0; i < file.length; i++){ @@ -94,7 +98,7 @@ const sheetmanage = { else{ let index = null; let hascopy = false; - let name2 = name + "(副本"; + let name2 = name + "("+locale_info.copy; for(let i = 0; i < file.length; i++){ let fileName = file[i].name.toString(); @@ -115,15 +119,15 @@ const sheetmanage = { if(hascopy){ if(index == null){ - copySheetName = name + "(副本2)"; + copySheetName = name + "("+ locale_info.copy +"2)"; } else{ index++; - copySheetName = name + "(副本" + index + ")"; + copySheetName = name + "("+ locale_info.copy +"" + index + ")"; } } else{ - copySheetName = name + "(副本)"; + copySheetName = name + "("+ locale_info.copy +")"; } } @@ -632,7 +636,7 @@ const sheetmanage = { width: Store.luckysheetTableContentHW[0], height: Store.luckysheetTableContentHW[1] }).get(0).getContext("2d"); - + let locale_info = locale().info; let key = server.gridKey; let cahce_key = key + "__qkcache"; @@ -663,7 +667,7 @@ const sheetmanage = { _this.restoreSheetAll(Store.currentSheetIndex); luckysheetrefreshgrid(0, 0); - $("#luckysheet_info_detail_save").html("已恢复本地缓存"); + $("#luckysheet_info_detail_save").html(locale_info.detailSave); if (!!file.isPivotTable) { Store.luckysheetcurrentisPivotTable = true; @@ -875,7 +879,7 @@ const sheetmanage = { server.saveParam("shs", null, Store.currentSheetIndex); } else{ - $("#luckysheet-grid-window-1").append('
渲染中...
'); + $("#luckysheet-grid-window-1").append(luckysheetlodingHTML()); let sheetindex = _this.checkLoadSheetIndex(file); diff --git a/src/core.js b/src/core.js index 3ebe88f..1714f62 100644 --- a/src/core.js +++ b/src/core.js @@ -20,6 +20,7 @@ import { } from './methods/set'; import { luckysheetrefreshgrid } from './global/refresh'; import functionlist from './function/functionlist'; +import { luckysheetlodingHTML } from './controllers/constant'; let luckysheet = {}; @@ -92,7 +93,7 @@ luckysheet.create = function (setting) { Store.devicePixelRatio = Math.ceil(devicePixelRatio); //loading - $("#" + container).append('
渲染中...
'); + $("#" + container).append(luckysheetlodingHTML()); let data = []; if (loadurl == "") { diff --git a/src/global/count.js b/src/global/count.js index adc75c2..e644701 100644 --- a/src/global/count.js +++ b/src/global/count.js @@ -2,6 +2,7 @@ import Store from '../store'; import { getdatabyselectionNoCopy } from './getdata'; import { isRealNull, isRealNum } from './validate'; import { update } from './format'; +import locale from '../locale/locale'; //表格计数栏 export function countfunc() { @@ -51,21 +52,23 @@ export function countfunc() { } } + let locale_formula = locale().formula; + let ret = ""; - ret += "计数:" + count + ""; + ret += ""+locale_formula.count+":" + count + ""; //处理成亿万格式 if (isFinite(max) || isFinite(min)) { - ret += "求和:" + update("w", sum) + ""; - ret += "平均值:" + update("w", Math.round(sum / count * 10000) / 10000) + ""; + ret += ""+locale_formula.sum+":" + update("w", sum) + ""; + ret += ""+locale_formula.average+":" + update("w", Math.round(sum / count * 10000) / 10000) + ""; } if (isFinite(max)) { - ret += "最大值:" + update("w", max) + ""; + ret += ""+locale_formula.max+":" + update("w", max) + ""; } if (isFinite(min)) { - ret += "最小值:" + update("w", min) + ""; + ret += ""+locale_formula.min+":" + update("w", min) + ""; } $("#luckysheet-sta-content").html(ret); diff --git a/src/global/createdom.js b/src/global/createdom.js index 646352f..a603965 100644 --- a/src/global/createdom.js +++ b/src/global/createdom.js @@ -18,6 +18,7 @@ import editor from './editor'; import rhchInit from './rhchInit'; import { replaceHtml } from '../utils/util'; import Store from '../store'; +import locale from '../locale/locale'; export default function luckysheetcreatedom(colwidth, rowheight, data, menu, title) { //最少30行 @@ -30,7 +31,7 @@ export default function luckysheetcreatedom(colwidth, rowheight, data, menu, tit colwidth = 22; } - let gh = gridHTML; + let gh = gridHTML(); gh = replaceHtml(gh, { "logotitle": title });//设置title gh = replaceHtml(gh, { "menu": menuToolBar() });//设置需要显示的菜单 @@ -59,11 +60,19 @@ export default function luckysheetcreatedom(colwidth, rowheight, data, menu, tit rhchInit(rowheight, colwidth); - let addControll = '行(在底部添加)'; - let backControll = ' '; + const _locale = locale(); + const locale_info = _locale.info; + + let addControll = ''+ locale_info.row +'('+locale_info.addLast+')'; + let backControll = ' '; // let pageControll = ' 共'+ luckysheetConfigsetting.pageInfo.totalPage +'页，当前已显示'+ (luckysheetConfigsetting.pageInfo.currentPage) +'页，每页'+ luckysheetConfigsetting.pageInfo.pageSize +'条 '; - let pageControll = ' 共'+ luckysheetConfigsetting.total +'条，'+ luckysheetConfigsetting.pageInfo.totalPage +'页，当前已显示'+ (luckysheetConfigsetting.pageInfo.currentPage) +'页 '; - let pageControll2 = ' 共'+ luckysheetConfigsetting.total +'条，'+ luckysheetConfigsetting.pageInfo.totalPage +'页，当前已显示'+ (luckysheetConfigsetting.pageInfo.currentPage) +'页'; + let pageInfo = replaceHtml(locale_info.pageInfo,{ + total:luckysheetConfigsetting.total?luckysheetConfigsetting.total:"", + totalPage:luckysheetConfigsetting.pageInfo.totalPage?luckysheetConfigsetting.pageInfo.totalPage:"", + currentPage:luckysheetConfigsetting.pageInfo.currentPage?luckysheetConfigsetting.pageInfo.currentPage:"", + }); + let pageControll = ' '+ pageInfo +' '; + let pageControll2 = ' '+pageInfo+''; let bottomControll = ""; if(luckysheetConfigsetting.enableAddRow){ diff --git a/src/global/formula.js b/src/global/formula.js index b4729d4..c154ba5 100644 --- a/src/global/formula.js +++ b/src/global/formula.js @@ -22,6 +22,7 @@ import { jfrefreshgrid } from './refresh'; // import functionlist from '../function/functionlist'; import { luckysheet_compareWith, luckysheet_getcelldata, luckysheet_indirect_check, luckysheet_indirect_check_return, luckysheet_offset_check } from '../function/func'; import Store from '../store'; +import locale from '../locale/locale'; const luckysheetformula = { error: { @@ -39,6 +40,8 @@ const luckysheetformula = { }, errorParamCheck: function(thisp, data, i) { let type, require; + let _locale = locale(); + let locale_formulaMore = _locale.formulaMore; if(i < thisp.length){ type = thisp[i].type; require = thisp[i].require; @@ -49,30 +52,30 @@ const luckysheetformula = { } if(require == "o" && (data == null || data == "")){ - return [true, "成功"]; + return [true, locale_formulaMore.tipSuccessText]; } if(type.indexOf("all") > -1){ - return [true, "成功"]; + return [true, locale_formulaMore.tipSuccessText]; } else{ if(type.indexOf("range") > -1 && (getObjType(data) == "object" || getObjType(data) == "array")){ - return [true, "成功"]; + return [true, locale_formulaMore.tipSuccessText]; } if(type.indexOf("number") > -1 && (isRealNum(data) || getObjType(data) == "boolean")){ - return [true, "成功"]; + return [true, locale_formulaMore.tipSuccessText]; } if(type.indexOf("string") > -1 && getObjType(data) == "string"){ - return [true, "成功"]; + return [true, locale_formulaMore.tipSuccessText]; } if(type.indexOf("date") > -1 && isdatetime(data)){ - return [true, "成功"]; + return [true, locale_formulaMore.tipSuccessText]; } - return [false, "参数类型错误"]; + return [false, locale_formulaMore.tipParamErrorText]; } }, getPureValueByData: function(data){ @@ -787,7 +790,7 @@ const luckysheetformula = { $("#luckysheet-formula-functionrange .luckysheet-formula-functionrange-highlight").show(); }, searchHTML: '
', - helpHTML: '
SUM ( A2:A100, 101 )
示例
SUM ( A2:A100, 101 )
摘要
${detail}
${param}
', + helpHTML: '
SUM ( A2:A100, 101 )
${helpExample}
SUM ( A2:A100, 101 )
${helpAbstract}
${helpAbstract}
${param}
', getrangeseleciton: function() { let currSelection = window.getSelection(); let anchor = $(currSelection.anchorNode); @@ -997,6 +1000,9 @@ const luckysheetformula = { return; } + let _locale = locale(); + let locale_formulaMore = _locale.formulaMore; + $("#luckysheet-formula-help-c .luckysheet-arguments-help-function-name").html($func.n); $("#luckysheet-formula-help-c .luckysheet-arguments-help-parameter-content").html($func.d); @@ -1022,11 +1028,11 @@ const luckysheetformula = { if (paramitem.repeat == "y") { name += ", ..."; - nameli += '...-可重复'; + nameli += '...-'+locale_formulaMore.allowRepeatText+''; } if (paramitem.require == "o") { name = "[" + name + "]"; - nameli += '-[可选]'; + nameli += '-['+locale_formulaMore.allowOptionText+']'; } fht += '' + name + ', '; @@ -1065,9 +1071,15 @@ const luckysheetformula = { helpFunctionExe: function($editer, currSelection) { let _this = this; let functionlist = Store.functionlist; - + let _locale = locale(); + let locale_formulaMore = _locale.formulaMore; if ($("#luckysheet-formula-help-c").length == 0) { - $("body").after(_this.helpHTML); + $("body").after(replaceHtml(_this.helpHTML,{ + helpClose:locale_formulaMore.helpClose, + helpCollapse:locale_formulaMore.helpCollapse, + helpExample:locale_formulaMore.helpExample, + helpAbstract:locale_formulaMore.helpAbstract, + })); $("#luckysheet-formula-help-c .luckysheet-formula-help-close").click(function() { $("#luckysheet-formula-help-c").hide(); }); @@ -4742,6 +4754,9 @@ const luckysheetformula = { }, execfunction: function(txt, r, c, isrefresh, notInsertFunc) { let _this = this; + + let _locale = locale(); + let locale_formulaMore = _locale.formulaMore; if(txt.indexOf(_this.error.r) > -1){ return [false, _this.error.r, txt]; @@ -4758,7 +4773,7 @@ const luckysheetformula = { } if (!_this.testFunction(txt, fp) || fp == "") { - tooltip.info("提示", "公式存在错误"); + tooltip.info("",locale_formulaMore.execfunctionError); return [false, _this.error.n, txt]; } @@ -4783,10 +4798,10 @@ const luckysheetformula = { if(funcgRange.sheetIndex == Store.currentSheetIndex && r >= funcgRange.row[0] && r <= funcgRange.row[1] && c >= funcgRange.column[0] && c <= funcgRange.column[1]){ if(isEditMode()){ - alert("公式不可引用其本身的单元格"); + alert(locale_formulaMore.execfunctionSelfError); } else{ - tooltip.info("公式不可引用其本身的单元格，会导致计算结果不准确", ""); + tooltip.info("", locale_formulaMore.execfunctionSelfErrorResult); } diff --git a/src/global/method.js b/src/global/method.js index 7615aeb..812d993 100644 --- a/src/global/method.js +++ b/src/global/method.js @@ -21,7 +21,7 @@ const method = { url = server.loadSheetUrl; } - $("#luckysheet-grid-window-1").append(luckysheetlodingHTML); + $("#luckysheet-grid-window-1").append(luckysheetlodingHTML()); param.currentPage++; let dataType = 'application/json;charset=UTF-8'; @@ -67,7 +67,7 @@ const method = { url = server.loadSheetUrl; } - $("#luckysheet-grid-window-1").append(luckysheetlodingHTML); + $("#luckysheet-grid-window-1").append(luckysheetlodingHTML()); let arg = {"gridKey" : server.gridKey, "index": index}; param = $.extend(true, param, arg); diff --git a/src/global/tooltip.js b/src/global/tooltip.js index 14dd31b..74c563d 100644 --- a/src/global/tooltip.js +++ b/src/global/tooltip.js @@ -16,7 +16,7 @@ const tooltip = { "addclass": "", "title": title, "content": content, - "botton": '', + "botton": '', "style": "z-index:100003" })); let $t = $("#luckysheet-info").find(".luckysheet-modal-dialog-content").css("min-width", 300).end(), diff --git a/src/locale/en.js b/src/locale/en.js index b6254d8..5a22c5e 100644 --- a/src/locale/en.js +++ b/src/locale/en.js @@ -50,6 +50,7 @@ export default { noColorSelectedText:"No color is selected", toolMore:"More", + toolLess:"Less", toolClose:"Close", toolMoreTip:"More features", }, @@ -93,8 +94,28 @@ export default { info:{ detailUpdate: 'New opened', detailSave: 'Local cache restored', - row: 'row', - column: 'column' + row: '', + column: '', + loading:"Loading", + + copy:"Copy", + return:"Exit", + rename:"Rename", + tips:"WorkBook rename", + noName:"Untitled spreadsheet", + wait:"waiting for update", + + add:"Add", + addLast:"more rows at bottom", + backTop:"Back to the top", + pageInfo:'Total ${total}，${totalPage} page，current ${currentPage}', + nextPage:"Next", + + tipInputNumber:"Please enter the number", + tipInputNumberLimit:"The increase range is limited to 1-100", + + tipRowHeightLimit:"The value must be between 0 ~ 255", + pageInfoFull:'Total ${total}，${totalPage} page，All data displayed', }, currencyDetail:{ RMB:'RMB', @@ -443,6 +464,14 @@ export default { conditionCellBetween:"Is between", conditionCellNotBetween:"Is not between", + filiterMoreDataTip:"Big amount of data! please wait", + filiterMonthText:"Month", + filiterYearText:"Year", + filiterByColorTip:"Filter by cell color", + filiterByTextColorTip:"Filter by font color", + filterContainerOneColorTip:"This column contains only one color", + filterDateFormatTip:"Date format", + }, rightclick: { copy: 'Copy', @@ -533,6 +562,9 @@ export default { splitDataPreview:"Preview", splitTextTitle:"Split text", splitConfirmToExe:"There is already data here, do you want to replace it?", + + tipNoMulti:"Cannot perform this operation on multiple selection areas, please select a single area and try again", + tipNoMultiColumn:"Only one column of data can be converted at a time. The selected area can have multiple rows but not multiple columns. Please try again after selecting a single column range", }, punctuation:{ "tab":"Tab", @@ -738,6 +770,34 @@ export default { "selectFunctionTitle":"Select a function", "calculationResult":"Result", + + tipSuccessText:"Success", + tipParamErrorText:"Parameter type error", + + "helpClose":"Close", + "helpCollapse":"Collapse", + "helpExample":"Example", + "helpAbstract":"Abstract", + + "execfunctionError":'Error in the formula', + "execfunctionSelfError":'Formula cannot refer to its own cell', + "execfunctionSelfErrorResult":'The formula cannot refer to its own cell, which will lead to inaccurate calculation results', + + "allowRepeatText":"Repeat", + "allowOptionText":"Option", + + "selectCategory":"Or select a category", + }, + drag:{ + noMerge:"Cannot perform this operation on merged cells", + affectPivot:"This change cannot be made to the selected cell because it will affect the pivot table!", + noMulti:"Cannot perform this operation on multiple selection areas, please select a single area", + noPaste:"Unable to paste this content here, please select a cell in the paste area and try to paste again", + noPartMerge:"Cannot perform this operation on partially merged cells", + + inputCorrect:"Please enter the correct value", + notLessOne:"The number of rows and columns cannot be less than 1", + offsetColumnLessZero:"The offset column cannot be negative!", } }; \ No newline at end of file diff --git a/src/locale/zh.js b/src/locale/zh.js index 7d35562..5ef1e9b 100644 --- a/src/locale/zh.js +++ b/src/locale/zh.js @@ -49,6 +49,7 @@ export default { noColorSelectedText:"没有颜色被选择", toolMore:"更多", + toolLess:"少于", toolClose:"收起", toolMoreTip:"更多功能", @@ -94,7 +95,28 @@ export default { detailUpdate: '新打开', detailSave: '已恢复本地缓存', row: '行', - column: '列' + column: '列', + + loading:"渲染中", + copy:"副本", + return:"返回", + rename:"重命名", + tips:"表格重命名", + noName:"无标题的电子表格", + wait:"待更新", + + add:"添加", + addLast:"在底部添加", + backTop:"回到顶部", + pageInfo:'共${total}条，${totalPage}页，当前已显示${currentPage}页', + nextPage:"下一页", + + tipInputNumber:"请输入数字", + tipInputNumberLimit:"增加范围限制在1-100", + + tipRowHeightLimit:"数值必须在0 ~ 255之间", + pageInfoFull:'共${total}条，${totalPage}页，已显示全部数据', + }, currencyDetail:{ RMB:'人民币', @@ -411,6 +433,8 @@ export default { "columnOperation":"列", "secondaryTitle":"次要排序", + "sortTitle":"排序范围", + "sortRangeTitle":"排序范围从", "sortRangeTitleTo":"到", @@ -443,6 +467,8 @@ export default { filterCancel:"取 消", clearFilter:"清除筛选", + + conditionNone:"无", conditionCellIsNull:"单元格为空", conditionCellNotNull:"单元格有数据", @@ -462,6 +488,15 @@ export default { conditionCellNotEqual:"不等于", conditionCellBetween:"介于", conditionCellNotBetween:"不在其中", + + filiterMoreDataTip:"数据量大！请稍后", + filiterMonthText:"月", + filiterYearText:"年", + filiterByColorTip:"按单元格颜色筛选", + filiterByTextColorTip:"按单元格字体颜色筛选", + filterContainerOneColorTip:"本列仅包含一种颜色", + filterDateFormatTip:"日期格式", + }, rightclick: { copy: '复制', @@ -551,6 +586,9 @@ export default { splitDataPreview:"数据预览", splitTextTitle:"文本分列", splitConfirmToExe:"此处已有数据，是否替换它？", + + tipNoMulti:"不能对多重选择区域执行此操作，请选择单个区域，然后再试", + tipNoMultiColumn:"一次只能转换一列数据，选定区域可以有多行，但不能有多列，请在选定单列区域以后再试", }, punctuation:{ "tab":"Tab 键", @@ -630,6 +668,14 @@ export default { resetColor: '重置颜色', cancelText: '取消', chooseText: '确定颜色', + + tipNameRepeat:"标签页的名称不能重复！请重新修改", + noMoreSheet:"工作薄内至少含有一张可视工作表。若需删除选定的工作表，请先插入一张新工作表或显示一张隐藏的工作表。", + confirmDelete:"是否删除", + redoDelete:"可以通过Ctrl+Z撤销删除", + noHide:"不能隐藏, 至少保留一个sheet标签", + chartEditNoOpt:"图表编辑模式下不允许该操作！", + }, conditionformat: { rule: '规则', @@ -755,5 +801,33 @@ export default { "selectFunctionTitle":"选择函数", "calculationResult":"计算结果", + + tipSuccessText:"成功", + tipParamErrorText:"参数类型错误", + + "helpClose":"关闭", + "helpCollapse":"收起", + "helpExample":"示例", + "helpAbstract":"摘要", + + "execfunctionError":'提示", "公式存在错误', + "execfunctionSelfError":'公式不可引用其本身的单元格', + "execfunctionSelfErrorResult":'公式不可引用其本身的单元格，会导致计算结果不准确', + + "allowRepeatText":"可重复", + "allowOptionText":"可选", + + "selectCategory":"或选择类别", + }, + drag:{ + noMerge:"无法对合并单元格执行此操作", + affectPivot:"无法对所选单元格进行此更改，因为它会影响数据透视表！", + noMulti:"无法对多重选择区域执行此操作,请选择单个区域", + noPaste:"无法在此处粘贴此内容，请选择粘贴区域的一个单元格，然后再次尝试粘贴", + noPartMerge:"无法对部分合并单元格执行此操作", + + inputCorrect:"请输入正确的数值", + notLessOne:"行列数不能小于1", + offsetColumnLessZero:"偏移列不能为负数！", } };