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

[SSE] Add note when changing table size

Browse source
This commit is contained in:
Julia Radzhabova 2020-06-22 15:04:56 +03:00
parent f488066766
commit 8d69e3e642
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@ define([
SSE.Views.TableOptionsDialog = Common.UI.Window.extend(_.extend({
options: {
width : 350,
width : 355,
cls : 'modal-dlg',
modal : false,
buttons: ['ok', 'cancel']
@ -65,7 +65,8 @@ define([
this.template = [
'<div class="box">',
'<div id="id-dlg-tableoptions-range" class="input-row" style="margin-bottom: 5px;"></div>',
'<div class="input-row" id="id-dlg-tableoptions-title" style="margin-top: 5px;"></div>',
'<div class="input-row hidden" id="id-dlg-tableoptions-title" style="margin-top: 5px;"></div>',
'<label class="" id="id-dlg-tableoptions-lbl" style="margin-top: 5px;">' + this.txtNote + '</label>',
'</div>'
].join('');
@ -96,6 +97,8 @@ define([
labelText : this.txtTitle
});
me.lblNote =$window.find('#id-dlg-tableoptions-lbl');
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.on('close', _.bind(this.onClose, this));
@ -113,12 +116,13 @@ define([
me.api = settings.api;
if (settings.range) {
me.cbTitle.setVisible(false);
me.setHeight(130);
me.checkRangeType = Asc.c_oAscSelectionDialogType.FormatTableChangeRange;
me.inputRange.setValue(settings.range);
me.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.FormatTable, settings.range);
} else {
me.cbTitle.$el && me.cbTitle.$el.removeClass('hidden');
me.lblNote.addClass('hidden');
me.setHeight(152);
var options = me.api.asc_getAddFormatTableOptions();
me.inputRange.setValue(options.asc_getRange());
me.cbTitle.setValue(options.asc_getIsTitle());
@ -218,6 +222,7 @@ define([
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.',
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.'
errorMultiCellFormula: 'Multi-cell array formulas are not allowed in tables.',
txtNote: 'The headers must remain in the same row, and the resulting table range must overlap the original table range.'
}, SSE.Views.TableOptionsDialog || {}))
});

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

@ -2442,6 +2442,7 @@
"SSE.Views.TableOptionsDialog.txtFormat": "Create table",
"SSE.Views.TableOptionsDialog.txtInvalidRange": "ERROR! Invalid cells range",
"SSE.Views.TableOptionsDialog.txtTitle": "Title",
"SSE.Views.TableOptionsDialog.txtNote": "The headers must remain in the same row, and the resulting table range must overlap the original table range.",
"SSE.Views.TableSettings.deleteColumnText": "Delete Column",
"SSE.Views.TableSettings.deleteRowText": "Delete Row",
"SSE.Views.TableSettings.deleteTableText": "Delete Table",

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

@ -2342,6 +2342,7 @@
"SSE.Views.TableOptionsDialog.txtFormat": "Создать таблицу",
"SSE.Views.TableOptionsDialog.txtInvalidRange": "ОШИБКА! Недопустимый диапазон ячеек",
"SSE.Views.TableOptionsDialog.txtTitle": "Заголовок",
"SSE.Views.TableOptionsDialog.txtNote": "Заголовки должны оставаться в той же строке, а результирующий диапазон таблицы - частично перекрываться с исходным диапазоном.",
"SSE.Views.TableSettings.deleteColumnText": "Удалить столбец",
"SSE.Views.TableSettings.deleteRowText": "Удалить строку",
"SSE.Views.TableSettings.deleteTableText": "Удалить таблицу",