Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Add Asc.c_oAscError.ID.MultiCellsInTablesFormulaArray error

Browse source
This commit is contained in:
Julia Radzhabova 2019-02-22 14:32:13 +03:00
parent 68d82a0217
commit 9b23955172
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
View file

@ -164,12 +164,19 @@ define([
if (isvalid == Asc.c_oAscError.ID.No) if (isvalid == Asc.c_oAscError.ID.No)
return true; return true;
else { else {
if (isvalid == Asc.c_oAscError.ID.AutoFilterDataRangeError) { switch (isvalid) {
Common.UI.warning({msg: this.errorAutoFilterDataRange}); case Asc.c_oAscError.ID.AutoFilterDataRangeError:
} else if (isvalid == Asc.c_oAscError.ID.FTChangeTableRangeError) { Common.UI.warning({msg: this.errorAutoFilterDataRange});
Common.UI.warning({msg: this.errorFTChangeTableRangeError}); break;
} else if (isvalid == Asc.c_oAscError.ID.FTRangeIncludedOtherTables) { case Asc.c_oAscError.ID.FTChangeTableRangeError:
Common.UI.warning({msg: this.errorFTRangeIncludedOtherTables}); Common.UI.warning({msg: this.errorFTChangeTableRangeError});
break;
case Asc.c_oAscError.ID.FTRangeIncludedOtherTables:
Common.UI.warning({msg: this.errorFTRangeIncludedOtherTables});
break;
case Asc.c_oAscError.ID.MultiCellsInTablesFormulaArray:
Common.UI.warning({msg: this.errorMultiCellFormula});
break;
} }
} }
return false; return false;
@ -212,6 +219,7 @@ define([
txtInvalidRange: 'ERROR! Invalid cells range', txtInvalidRange: 'ERROR! Invalid cells range',
errorAutoFilterDataRange: 'The operation could not be done for the selected range of cells.<br>Select a uniform data range inside or outside the table and try again.', errorAutoFilterDataRange: 'The operation could not be done for the selected range of cells.<br>Select a uniform data range inside or outside the table and try again.',
errorFTChangeTableRangeError: 'Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.', errorFTChangeTableRangeError: 'Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.',
errorFTRangeIncludedOtherTables: 'Operation could not be completed for the selected cell range.<br>Select a range which does not include other tables.' errorFTRangeIncludedOtherTables: 'Operation could not be completed for the selected cell range.<br>Select a range which does not include other tables.',
errorMultiCellFormula: 'Multi-cell array formulas are not allowed in tables.'
}, SSE.Views.TableOptionsDialog || {})) }, SSE.Views.TableOptionsDialog || {}))
}); });

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -1959,6 +1959,7 @@
"SSE.Views.TableOptionsDialog.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.<br>Select a uniform data range different from the existing one and try again.", "SSE.Views.TableOptionsDialog.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.<br>Select a uniform data range different from the existing one and try again.",
"SSE.Views.TableOptionsDialog.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.", "SSE.Views.TableOptionsDialog.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.",
"SSE.Views.TableOptionsDialog.errorFTRangeIncludedOtherTables": "Operation could not be completed for the selected cell range.<br>Select a range which does not include other tables.", "SSE.Views.TableOptionsDialog.errorFTRangeIncludedOtherTables": "Operation could not be completed for the selected cell range.<br>Select a range which does not include other tables.",
"SSE.Views.TableOptionsDialog.errorMultiCellFormula": "Multi-cell array formulas are not allowed in tables.",
"SSE.Views.TableOptionsDialog.textCancel": "Cancel", "SSE.Views.TableOptionsDialog.textCancel": "Cancel",
"SSE.Views.TableOptionsDialog.txtEmpty": "This field is required", "SSE.Views.TableOptionsDialog.txtEmpty": "This field is required",
"SSE.Views.TableOptionsDialog.txtFormat": "Create table", "SSE.Views.TableOptionsDialog.txtFormat": "Create table",