diff --git a/src/controllers/conditionformat.js b/src/controllers/conditionformat.js
index c9d3c6e..c54e1f0 100644
--- a/src/controllers/conditionformat.js
+++ b/src/controllers/conditionformat.js
@@ -98,6 +98,8 @@ const conditionformat = {
init: function(){
let _this = this;
+ const conditionformat_Text = locale().conditionformat;
+
// 管理规则
$(document).off("change.CFchooseSheet").on("change.CFchooseSheet", "#luckysheet-administerRule-dialog .chooseSheet", function(){
let index = $("#luckysheet-administerRule-dialog .chooseSheet option:selected").val();
@@ -221,10 +223,10 @@ const conditionformat = {
$(document).off("click.CFnewConditionRule").on("click.CFnewConditionRule", "#newConditionRule", function(){
if(Store.luckysheet_select_save.length == 0){
if(isEditMode()){
- alert("请选择应用范围");
+ alert(conditionformat_Text.pleaseSelectRange);
}
else{
- tooltip.info("请选择应用范围", "");
+ tooltip.info(conditionformat_Text.pleaseSelectRange, "");
}
return;
}
@@ -304,7 +306,7 @@ const conditionformat = {
//条件值是否是选区
let rangeArr1 = _this.getRangeByTxt(v1);
if(rangeArr1.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr1.length == 1){
@@ -318,13 +320,13 @@ const conditionformat = {
conditionValue.push(v1);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr1.length == 0){
if(isNaN(v1) || v1 == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -334,7 +336,7 @@ const conditionformat = {
let rangeArr2 = _this.getRangeByTxt(v2);
if(rangeArr2.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr2.length == 1){
@@ -348,13 +350,13 @@ const conditionformat = {
conditionValue.push(v2);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr2.length == 0){
if(isNaN(v2) || v2 == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -369,7 +371,7 @@ const conditionformat = {
//条件值是否是选区
let rangeArr = _this.getRangeByTxt(v);
if(rangeArr.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr.length == 1){
@@ -383,13 +385,13 @@ const conditionformat = {
conditionValue.push(v);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr.length == 0){
if(isNaN(v) || v == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -407,7 +409,7 @@ const conditionformat = {
//条件值是否是选区
let rangeArr = _this.getRangeByTxt(v);
if(rangeArr.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr.length == 1){
@@ -421,13 +423,13 @@ const conditionformat = {
conditionValue.push(v);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr.length == 0){
if(isNaN(v) || v == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -442,7 +444,7 @@ const conditionformat = {
let v = $("#luckysheet-newConditionRule-dialog #daterange-btn").val();
if(v == "" || v == null){
- _this.infoDialog("请选择日期", "");
+ _this.infoDialog(conditionformat_Text.pleaseSelectADate, "");
return;
}
@@ -472,7 +474,7 @@ const conditionformat = {
let v = $("#luckysheet-newConditionRule-dialog #conditionVal input").val().trim();
if(parseInt(v) != v || parseInt(v) < 1 || parseInt(v) > 1000){
- _this.infoDialog("请输入一个介于 1 和 1000 之间的整数", "");
+ _this.infoDialog(conditionformat_Text.pleaseEnterInteger, "");
return;
}
@@ -669,7 +671,7 @@ const conditionformat = {
//条件值是否是选区
let rangeArr1 = _this.getRangeByTxt(v1);
if(rangeArr1.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr1.length == 1){
@@ -683,13 +685,13 @@ const conditionformat = {
conditionValue.push(v1);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr1.length == 0){
if(isNaN(v1) || v1 == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -699,7 +701,7 @@ const conditionformat = {
let rangeArr2 = _this.getRangeByTxt(v2);
if(rangeArr2.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr2.length == 1){
@@ -713,13 +715,13 @@ const conditionformat = {
conditionValue.push(v2);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr2.length == 0){
if(isNaN(v2) || v2 == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -734,7 +736,7 @@ const conditionformat = {
//条件值是否是选区
let rangeArr = _this.getRangeByTxt(v);
if(rangeArr.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr.length == 1){
@@ -748,13 +750,13 @@ const conditionformat = {
conditionValue.push(v);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr.length == 0){
if(isNaN(v) || v == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -772,7 +774,7 @@ const conditionformat = {
//条件值是否是选区
let rangeArr = _this.getRangeByTxt(v);
if(rangeArr.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr.length == 1){
@@ -786,13 +788,13 @@ const conditionformat = {
conditionValue.push(v);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr.length == 0){
if(isNaN(v) || v == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -807,7 +809,7 @@ const conditionformat = {
let v = $("#luckysheet-editorConditionRule-dialog #daterange-btn").val();
if(v == "" || v == null){
- _this.infoDialog("请选择日期", "");
+ _this.infoDialog(conditionformat_Text.pleaseSelectADate, "");
return;
}
@@ -837,7 +839,7 @@ const conditionformat = {
let v = $("#luckysheet-editorConditionRule-dialog #conditionVal input").val().trim();
if(parseInt(v) != v || parseInt(v) < 1 || parseInt(v) > 1000){
- _this.infoDialog("请输入一个介于 1 和 1000 之间的整数", "");
+ _this.infoDialog(conditionformat_Text.pleaseEnterInteger, "");
return;
}
@@ -998,7 +1000,7 @@ const conditionformat = {
//条件值是否是选区
let rangeArr = _this.getRangeByTxt(v);
if(rangeArr.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr.length == 1){
@@ -1012,13 +1014,13 @@ const conditionformat = {
conditionValue.push(v);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr.length == 0){
if(isNaN(v) || v == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -1033,7 +1035,7 @@ const conditionformat = {
//条件值是否是选区
let rangeArr1 = _this.getRangeByTxt(v1);
if(rangeArr1.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr1.length == 1){
@@ -1047,13 +1049,13 @@ const conditionformat = {
conditionValue.push(v1);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr1.length == 0){
if(isNaN(v1) || v1 == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -1063,7 +1065,7 @@ const conditionformat = {
let rangeArr2 = _this.getRangeByTxt(v2);
if(rangeArr2.length > 1){
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
else if(rangeArr2.length == 1){
@@ -1077,13 +1079,13 @@ const conditionformat = {
conditionValue.push(v2);
}
else{
- _this.infoDialog("只能对单个单元格进行引用", "");
+ _this.infoDialog(conditionformat_Text.onlySingleCell, "");
return;
}
}
else if(rangeArr2.length == 0){
if(isNaN(v2) || v2 == ""){
- _this.infoDialog("条件值只能是数字或者单个单元格", "");
+ _this.infoDialog(conditionformat_Text.conditionValueCanOnly, "");
return;
}
else{
@@ -1095,7 +1097,7 @@ const conditionformat = {
let v = $("#luckysheet-conditionformat-dialog #daterange-btn").val();
if(v == "" || v == null){
- _this.infoDialog("请选择日期", "");
+ _this.infoDialog(conditionformat_Text.pleaseSelectADate, "");
return;
}
@@ -1108,7 +1110,7 @@ const conditionformat = {
let v = $("#luckysheet-conditionformat-dialog #conditionVal").val().trim();
if(parseInt(v) != v || parseInt(v) < 1 || parseInt(v) > 1000){
- _this.infoDialog("请输入一个介于 1 和 1000 之间的整数", "");
+ _this.infoDialog(conditionformat_Text.pleaseEnterInteger, "");
return;
}
@@ -1287,7 +1289,7 @@ const conditionformat = {
//新建规则弹出层
if(id == "luckysheet-newConditionRule-dialog"){
- let source=$("#" + id).find("#luckysheet-newConditionRule-dialog-close").attr("data-source");
+ let source = $("#" + id).find("#luckysheet-newConditionRule-dialog-close").attr("data-source");
//新建规则入口
if(source == 1){
$("#luckysheet-administerRule-dialog").show();
@@ -1343,12 +1345,15 @@ const conditionformat = {
$("#luckysheet-modal-dialog-mask").hide();
$("#luckysheet-singleRange-dialog").remove();
+ const conditionformat_Text = locale().conditionformat;
+
$("body").append(replaceHtml(modelHTML, {
"id": "luckysheet-singleRange-dialog",
"addclass": "luckysheet-singleRange-dialog",
- "title": "选择单元格",
- "content": '',
- "botton": '',
+ "title": conditionformat_Text.selectCell,
+ "content": ``,
+ "botton": `
+ `,
"style": "z-index:100003"
}));
let $t = $("#luckysheet-singleRange-dialog")
@@ -1370,12 +1375,15 @@ const conditionformat = {
$("#luckysheet-modal-dialog-mask").hide();
$("#luckysheet-multiRange-dialog").remove();
+ const conditionformat_Text = locale().conditionformat;
+
$("body").append(replaceHtml(modelHTML, {
"id": "luckysheet-multiRange-dialog",
"addclass": "luckysheet-multiRange-dialog",
- "title": "选择应用范围",
- "content": '',
- "botton": '',
+ "title": conditionformat_Text.selectRange,
+ "content": ``,
+ "botton": `
+ `,
"style": "z-index:100003"
}));
let $t = $("#luckysheet-multiRange-dialog")
@@ -1431,6 +1439,8 @@ const conditionformat = {
return range;
},
colorSelectInit: function(){
+ const conditionformat_Text = locale().conditionformat;
+
$(".luckysheet-conditionformat-config-color").spectrum({
showPalette: true,
showPaletteOnly:true,
@@ -1445,12 +1455,12 @@ const conditionformat = {
maxPaletteSize: 8,
maxSelectionSize: 8,
// color: currenColor,
- cancelText: "取消",
- chooseText: "确定颜色",
+ cancelText: conditionformat_Text.cancel,
+ chooseText: conditionformat_Text.confirmColor,
togglePaletteMoreText: "自定义",
togglePaletteLessText: "收起",
togglePaletteOnly: true,
- clearText: "清除颜色选择",
+ clearText: conditionformat_Text.clearColorSelect,
noColorSelectedText: "没有颜色被选择",
localStorageKey: "spectrum.textcolor" + server.gridKey,
palette: [["#000","#444","#666","#999","#ccc","#eee","#f3f3f3","#fff"],
@@ -1474,12 +1484,15 @@ const conditionformat = {
$("#luckysheet-modal-dialog-mask").show();
$("#luckysheet-conditionformat-dialog").remove();
+ const conditionformat_Text = locale().conditionformat;
+
$("body").append(replaceHtml(modelHTML, {
"id": "luckysheet-conditionformat-dialog",
"addclass": "luckysheet-conditionformat-dialog",
"title": title,
"content": content,
- "botton": '',
+ "botton": `
+ `,
"style": "z-index:100003"
}));
let $t = $("#luckysheet-conditionformat-dialog")
@@ -1498,7 +1511,7 @@ const conditionformat = {
_this.init();
_this.colorSelectInit();
- if(title == "条件格式——发生日期"){
+ if(title == locale().conditionformat.conditionformat_occurrenceDate){
_this.daterangeInit("luckysheet-conditionformat-dialog");
}
},
@@ -1506,68 +1519,70 @@ const conditionformat = {
$("#luckysheet-modal-dialog-mask").show();
$("#luckysheet-CFicons-dialog").remove();
- let content = ''+
- '
请点击选择一组图标：
'+
- '
方向
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
形状
'+
- '
'+
- '
标记
'+
- '
'+
- '
等级
'+
- '
'+
- '
+
${conditionformat_Text.pleaseSelectIcon}
+
${conditionformat_Text.direction}
+
+
${conditionformat_Text.shape}
+
+
${conditionformat_Text.mark}
+
+
${conditionformat_Text.grade}
+
+
' +
- '
选择规则类型：
' +
+ '
'+ conditionformat_Text.chooseRuleType +'：
' +
_this.ruleTypeHtml() +
- '
编辑规则说明：
' +
+ '
'+ conditionformat_Text.editRuleDescription +'：
' +
'
' +
ruleExplainHtml +
'
' +
@@ -1976,9 +1993,10 @@ const conditionformat = {
$("body").append(replaceHtml(modelHTML, {
"id": "luckysheet-editorConditionRule-dialog",
"addclass": "luckysheet-newEditorRule-dialog",
- "title": "编辑格式规则",
+ "title": conditionformat_Text.editFormatRule,
"content": content,
- "botton": '
',
+ "botton": `
+
`,
"style": "z-index:100003"
}));
let $t = $("#luckysheet-editorConditionRule-dialog")
@@ -2129,7 +2147,7 @@ const conditionformat = {
"addclass": "",
"title": title,
"content": content,
- "botton": '
',
+ "botton": `
`,
"style": "z-index:100003"
}));
let $t = $("#luckysheet-conditionformat-info-dialog")
@@ -2213,138 +2231,159 @@ const conditionformat = {
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
只为满足以下条件的单元格：
' +
- '' +
- '
'+
- '
' +
- '
' +
- '
' +
- '
' +
- '' +
- '
' +
- '
到' +
- '
' +
- '' +
- '
' +
- '
' +
- '
' +
- '
' +
- '
' +
- '' +
- '
' +
- '
' +
- '
' +
- '
' +
- '' +
- '
' +
- '
' +
- '
' +
- '
设置格式：
' + textCellColorHtml;
+ ruleExplainHtml = `${conditionformat_Text.ruleTypeItem2_title}：
+
+
+
+
+
+
+
+
+
+
${conditionformat_Text.in}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
设置格式：
${textCellColorHtml}`;
break;
case 2: //仅对排名靠前或靠后的数值设置格式
- ruleExplainHtml = '为以下排名内的值：
'+
- ''+
- '
'+
- '
'+
- ''+
- '
'+
- '
'+
- '
'+
- '
设置格式：
' + textCellColorHtml;
+ ruleExplainHtml = `${conditionformat_Text.ruleTypeItem3_title}：
+
+
+
+
+
+
+
+
${conditionformat_Text.setFormat}：
${textCellColorHtml}`;
break;
case 3: //仅对高于或低于平均值的数值设置格式
- ruleExplainHtml = '为满足以下条件的值：
'+
- ''+
- ''+
- '选定范围的平均值'+
- '
'+
- '设置格式：
' + textCellColorHtml;
+ ruleExplainHtml = `${conditionformat_Text.ruleTypeItem4_title}：
+
+
+ ${conditionformat_Text.selectRange_average}
+
+ ${conditionformat_Text.setFormat}：
${textCellColorHtml}`;
break;
case 4: //仅对唯一值或重复值设置格式
- ruleExplainHtml = '全部：
'+
- ''+
- ''+
- '选定范围中的数值'+
- '
'+
- '设置格式：
' + textCellColorHtml;
+ ruleExplainHtml = `${conditionformat_Text.all}：
+
+
+ ${conditionformat_Text.selectRange_value}
+
+ ${conditionformat_Text.setFormat}：
${textCellColorHtml}`;
break;
}
return ruleExplainHtml;
},
daterangeInit: function(id){
+ const conditionformat_Text = locale().conditionformat;
+
//日期选择插件
$('.ranges_1 ul').remove();
$('#' + id).find("#daterange-btn").daterangepicker({
ranges:
{
- // '全部': [moment(), moment().subtract(-1, 'days')],
- '昨天': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
- '今天': [moment(), moment()],
- // '明天': [moment().subtract(-1, 'days'), moment().subtract(-1, 'days')],
- '上周': [moment(moment().subtract(1, 'week')).subtract(new Date().getDay() - 1, 'days'), moment().subtract(new Date().getDay(), 'days')],
- '本周': [moment().subtract(new Date().getDay() - 1, 'days'), moment().add(7 - new Date().getDay(), 'days')],
- '上月': [moment(moment().format('YYYY-MM')).subtract(1, 'month'), moment(moment().format('YYYY-MM')).subtract(1, 'day')],
- '本月': [moment().format('YYYY-MM'), moment(moment(moment().format('YYYY-MM')).add(1, 'month')).subtract(1, 'day')],
- '去年': [moment(moment(moment().format('YYYY'))).subtract(1, 'years').format('YYYY'), moment(moment().format('YYYY')).subtract(1, 'day')],
- '本年': [moment().format('YYYY'), moment(moment(moment().add(1, 'years')).format('YYYY')).subtract(1, 'day')],
- '最近7天': [moment().subtract(6, 'days'), moment()],
- '最近30天': [moment().subtract(29, 'days'), moment()]
- // '未来七天': [moment(),moment().subtract(-6, 'days')],
- // '未来30天': [moment(),moment().subtract(-29, 'days')],
- // '未来60天': [moment(),moment().subtract(-59, 'days'), ]
+ // [conditionformat_Text.all]: [moment(), moment().subtract(-1, 'days')],
+ [conditionformat_Text.yesterday]: [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+ [conditionformat_Text.today]: [moment(), moment()],
+ // [conditionformat_Text.tomorrow]: [moment().subtract(-1, 'days'), moment().subtract(-1, 'days')],
+ [conditionformat_Text.lastWeek]: [moment(moment().subtract(1, 'week')).subtract(new Date().getDay() - 1, 'days'), moment().subtract(new Date().getDay(), 'days')],
+ [conditionformat_Text.thisWeek]: [moment().subtract(new Date().getDay() - 1, 'days'), moment().add(7 - new Date().getDay(), 'days')],
+ [conditionformat_Text.lastMonth]: [moment(moment().format('YYYY-MM')).subtract(1, 'month'), moment(moment().format('YYYY-MM')).subtract(1, 'day')],
+ [conditionformat_Text.thisMonth]: [moment().format('YYYY-MM'), moment(moment(moment().format('YYYY-MM')).add(1, 'month')).subtract(1, 'day')],
+ [conditionformat_Text.lastYear]: [moment(moment(moment().format('YYYY'))).subtract(1, 'years').format('YYYY'), moment(moment().format('YYYY')).subtract(1, 'day')],
+ [conditionformat_Text.thisYear]: [moment().format('YYYY'), moment(moment(moment().add(1, 'years')).format('YYYY')).subtract(1, 'day')],
+ [conditionformat_Text.last7days]: [moment().subtract(6, 'days'), moment()],
+ [conditionformat_Text.last30days]: [moment().subtract(29, 'days'), moment()]
+ // [conditionformat_Text.next7days]: [moment(),moment().subtract(-6, 'days')],
+ // [conditionformat_Text.next30days]: [moment(),moment().subtract(-29, 'days')],
+ // [conditionformat_Text.next60days]: [moment(),moment().subtract(-59, 'days'), ]
},
startDate: moment(),
endDate: moment()
},
function(start, end,label) {
//label:通过它来知道用户选择的是什么，传给后台进行相应的展示
- if(label == '全部'){
+ let format1 = [
+ conditionformat_Text.yesterday,
+ conditionformat_Text.today
+ ];
+
+ let format2 = [
+ conditionformat_Text.lastWeek,
+ conditionformat_Text.thisWeek,
+ conditionformat_Text.lastMonth,
+ conditionformat_Text.thisMonth,
+ conditionformat_Text.lastYear,
+ conditionformat_Text.thisYear,
+ conditionformat_Text.last7days,
+ conditionformat_Text.last30days
+ ]
+
+ if(label == conditionformat_Text.all){
$('#daterange-btn').val('');
}
- else if(label == '昨天' || label == '今天'){
+ else if(format1.indexOf(label) > -1){
$('#daterange-btn').val(start.format('YYYY/MM/DD'));
}
- else if(label == '上周' || label == '本周' || label == '上月' || label == '本月' || label == '去年' || label == '本年' || label == '最近7天' || label == '最近30天'){
- $('#daterange-btn').val(start.format('YYYY/MM/DD')+'-'+end.format('YYYY/MM/DD'));
+ else if(format2.indexOf(label) > -1){
+ $('#daterange-btn').val(start.format('YYYY/MM/DD') + '-' + end.format('YYYY/MM/DD'));
}
}
);
diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index af19b5e..e37b712 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -2108,131 +2108,132 @@ const menuButton = {
$("#luckysheet-icon-conditionformat").click(function(){
let menuButtonId = $(this).attr("id") + "-menuButton";
let $menuButton = $("#" + menuButtonId);
+
+ const conditionformat_text = locale().conditionformat;
if($menuButton.length == 0){
let itemdata = [
- {"text": "突出显示单元格规则", "value": "highlightCellRule", "example": "more"},
- {"text": "项目选取规则", "value": "projectSelectRule", "example": "more"},
- {"text": "数据条", "value": "dataBar", "example": "more"},
- {"text": "色阶", "value": "colorGradation", "example": "more"},
- {"text": "图标集", "value": "icons", "example": ""},
- {"text": "", "value": "split", "example": ""},
- {"text": "新建规则", "value": "newRule", "example": ""},
- {"text": "清除规则", "value": "deleteRule", "example": "more"},
- {"text": "管理规则", "value": "administerRule", "example": ""}
+ { "text": conditionformat_text.highlightCellRules, "value": "highlightCellRule", "example": "more" },
+ { "text": conditionformat_text.itemSelectionRules, "value": "projectSelectRule", "example": "more" },
+ { "text": conditionformat_text.dataBar, "value": "dataBar", "example": "more" },
+ { "text": conditionformat_text.colorGradation, "value": "colorGradation", "example": "more" },
+ { "text": conditionformat_text.icons, "value": "icons", "example": "" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": conditionformat_text.newRule, "value": "newRule", "example": "" },
+ { "text": conditionformat_text.deleteRule, "value": "deleteRule", "example": "more" },
+ { "text": conditionformat_text.manageRules, "value": "administerRule", "example": "" }
];
let itemset = _this.createButtonMenu(itemdata);
let menu = replaceHtml(_this.menu, {"id": "conditionformat", "item": itemset, "subclass": "", "sub": ""});
//突出显示单元格规则子菜单
let subitemdata = [
- {"text": "大于", "value": "greaterThan", "example": ">"},
- {"text": "小于", "value": "lessThan", "example": "<"},
- {"text": "介于", "value": "betweenness", "example": "[]"},
- {"text": "等于", "value": "equal", "example": "="},
- {"text": "文本包含", "value": "textContains", "example": "()"},
- {"text": "发生日期", "value": "occurrenceDate", "example": "昨天"},
- {"text": "重复值", "value": "duplicateValue", "example": "##"}
+ { "text": conditionformat_text.greaterThan, "value": "greaterThan", "example": ">" },
+ { "text": conditionformat_text.lessThan, "value": "lessThan", "example": "<" },
+ { "text": conditionformat_text.between, "value": "betweenness", "example": "[]" },
+ { "text": conditionformat_text.equal, "value": "equal", "example": "=" },
+ { "text": conditionformat_text.textContains, "value": "textContains", "example": "()" },
+ { "text": conditionformat_text.occurrence, "value": "occurrenceDate", "example": conditionformat_text.yesterday },
+ { "text": conditionformat_text.duplicateValue, "value": "duplicateValue", "example": "##" }
];
let subitemset = _this.createButtonMenu(subitemdata);
let submenu = replaceHtml(_this.menu, {"id": "highlightCellRule", "item": subitemset, "subclass": "luckysheet-menuButton-sub"});
//项目选取规则子菜单
let subitemdata2 = [
- {"text": "前 10 项", "value": "top10", "example": "前10项"},
- {"text": "前 10%", "value": "top10%", "example": "前10%"},
- {"text": "最后 10 项", "value": "last10", "example": "后10项"},
- {"text": "最后 10%", "value": "last10%", "example": "后10%"},
- {"text": "高于平均值", "value": "AboveAverage", "example": "高于均值"},
- {"text": "低于平均值", "value": "SubAverage", "example": "低于均值"}
+ { "text": conditionformat_text.top10, "value": "top10", "example": conditionformat_text.top10 },
+ { "text": conditionformat_text.top10_percent, "value": "top10%", "example": conditionformat_text.top10_percent },
+ { "text": conditionformat_text.last10, "value": "last10", "example": conditionformat_text.last10 },
+ { "text": conditionformat_text.last10_percent, "value": "last10%", "example": conditionformat_text.last10_percent },
+ { "text": conditionformat_text.aboveAverage, "value": "AboveAverage", "example": conditionformat_text.aboveAverage },
+ { "text": conditionformat_text.belowAverage, "value": "SubAverage", "example": conditionformat_text.belowAverage }
];
let subitemset2 = _this.createButtonMenu(subitemdata2);
let submenu2 = replaceHtml(_this.menu, {"id": "projectSelectRule", "item": subitemset2, "subclass": "luckysheet-menuButton-sub"});
//数据条子菜单
- let submenu3 = '';
+ let submenu3 = ``;
//色阶
- let submenu4 = '';
+ let submenu4 = ``;
//清除规则子菜单
let subitemdata6 = [
- // {"text":"清除所选单元格的规则", "value":"", "example":""},
- {"text":"清除整个工作表的规则", "value":"delSheet", "example":""}
+ { "text": conditionformat_text.deleteSheetRule, "value": "delSheet", "example": "" }
];
let subitemset6 = _this.createButtonMenu(subitemdata6);
let submenu6 = replaceHtml(_this.menu, {"id": "deleteRule", "item": subitemset6, "subclass":"luckysheet-menuButton-sub"});
@@ -2251,10 +2252,10 @@ const menuButton = {
if(itemvalue == "icons"){
if(Store.luckysheet_select_save.length == 0){
if(isEditMode()){
- alert("请选择应用范围");
+ alert(conditionformat_text.pleaseSelectRange);
}
else{
- tooltip.info("请选择应用范围", "");
+ tooltip.info(conditionformat_text.pleaseSelectRange, "");
}
return;
}
@@ -2265,10 +2266,10 @@ const menuButton = {
else if(itemvalue == "newRule"){
if(Store.luckysheet_select_save.length == 0){
if(isEditMode()){
- alert("请选择应用范围");
+ alert(conditionformat_text.pleaseSelectRange);
}
else{
- tooltip.info("请选择应用范围", "");
+ tooltip.info(conditionformat_text.pleaseSelectRange, "");
}
return;
}
@@ -2329,108 +2330,107 @@ const menuButton = {
if(Store.luckysheet_select_save.length == 0){
if(isEditMode()){
- alert("请选择条件格式的应用范围");
+ alert(conditionformat_text.pleaseSelectRange);
}
else{
- tooltip.info("请选择条件格式的应用范围", "");
+ tooltip.info(conditionformat_text.pleaseSelectRange, "");
}
return;
}
else{
- let textCellColorHtml = conditionformat.textCellColorHtml;
+ let textCellColorHtml = conditionformat.textCellColorHtml();
let title, content;
switch(itemvalue){
case "greaterThan":
- title = "条件格式——大于";
- content = '' +
- '
为大于以下值的单元格设置格式：
' +
- '
' +
- '' +
- '' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_greaterThan_title}：
+
+
+
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为小于以下值的单元格设置格式：
' +
- '
' +
- '' +
- '' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_lessThan_title}：
+
+
+
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为介于以下值的单元格设置格式：
' +
- '
' +
- '
' +
- '' +
- '' +
- '
' +
- '
到
' +
- '
' +
- '' +
- '' +
- '
' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_betweenness_title}：
+
+
+
+
+
+
${conditionformat_text.to}
+
+
+
+
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为等于以下值的单元格设置格式：
' +
- '
' +
- '' +
- '' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_equal_title}：
+
+
+
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为包含以下文本的单元格设置格式：
' +
- '
' +
- '' +
- '' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_textContains_title}：
+
+
+
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为包含以下日期的单元格设置格式：
' +
- '
' +
- '' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_occurrenceDate_title}：
+
+
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为包含以下类型值的单元格设置格式：
' +
- '
' +
- '
值' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_duplicateValue_title}：
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为值最大的那些单元格设置格式：
' +
- '
' +
- '
前
' +
- '
' +
- '' +
- '
' +
- '
项
' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_top10_title}：
+
+
${conditionformat_text.top}
+
+
+
+
${conditionformat_text.oneself}
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为值最大的那些单元格设置格式：
' +
- '
' +
- '
前
' +
- '
' +
- '' +
- '
' +
- '
%
' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_top10_title}：
+
+
${conditionformat_text.top}
+
+
+
+
%
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为值最小的那些单元格设置格式：
' +
- '
' +
- '
最后
' +
- '
' +
- '' +
- '
' +
- '
项
' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_last10_title}：
+
+
${conditionformat_text.last}
+
+
+
+
${conditionformat_text.oneself}
+
+
${conditionformat_text.setAs}：
+ ${textCellColorHtml}
+
' +
- '
为值最小的那些单元格设置格式：
' +
- '
' +
- '
最后
' +
- '
' +
- '' +
- '
' +
- '
%
' +
- '
' +
- '
设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_last10_title}：
+
+
${conditionformat_text.last}
+
+
+
+
%
+
+
设置为：
+ ${textCellColorHtml}
+
' +
- '
为高于平均值的单元格设置格式：
' +
- '
针对选定区域，设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_AboveAverage_title}：
+
${conditionformat_text.setAsByArea}：
+ ${textCellColorHtml}
+
' +
- '
为低于平均值的单元格设置格式：
' +
- '
针对选定区域，设置为：
' +
- textCellColorHtml +
- '
+
${conditionformat_text.conditionformat_SubAverage_title}：
+
${conditionformat_text.setAsByArea}：
+ ${textCellColorHtml}
+