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

Merge pull request #614 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-12-08 16:03:42 +03:00 committed by GitHub
parent 61ab340961 5a6f9d5183
commit a0e5ae28b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
apps/spreadsheeteditor/main/app/view/DataValidationDialog.js
View file

@ -90,20 +90,20 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
cls: 'input-group-nr', cls: 'input-group-nr',
editable: false, editable: false,
data: [ data: [
{value: Asc.EDataValidationType.None, displayValue: this.txtAny}, {value: Asc.c_oAscEDataValidationType.None, displayValue: this.txtAny},
{value: Asc.EDataValidationType.Whole, displayValue: this.txtWhole}, {value: Asc.c_oAscEDataValidationType.Whole, displayValue: this.txtWhole},
{value: Asc.EDataValidationType.Decimal, displayValue: this.txtDecimal}, {value: Asc.c_oAscEDataValidationType.Decimal, displayValue: this.txtDecimal},
{value: Asc.EDataValidationType.List, displayValue: this.txtList}, {value: Asc.c_oAscEDataValidationType.List, displayValue: this.txtList},
{value: Asc.EDataValidationType.Date, displayValue: this.txtDate}, {value: Asc.c_oAscEDataValidationType.Date, displayValue: this.txtDate},
{value: Asc.EDataValidationType.Time, displayValue: this.txtTime}, {value: Asc.c_oAscEDataValidationType.Time, displayValue: this.txtTime},
{value: Asc.EDataValidationType.TextLength, displayValue: this.txtTextLength}, {value: Asc.c_oAscEDataValidationType.TextLength, displayValue: this.txtTextLength},
{value: Asc.EDataValidationType.Custom, displayValue: this.txtOther} {value: Asc.c_oAscEDataValidationType.Custom, displayValue: this.txtOther}
], ],
style: 'width: 100%;', style: 'width: 100%;',
menuStyle : 'min-width: 100%;', menuStyle : 'min-width: 100%;',
takeFocusOnClose: true takeFocusOnClose: true
}); });
this.cmbAllow.setValue(Asc.EDataValidationType.None); this.cmbAllow.setValue(Asc.c_oAscEDataValidationType.None);
this.cmbAllow.on('selected', _.bind(this.onAllowSelect, this)); this.cmbAllow.on('selected', _.bind(this.onAllowSelect, this));
this.cmbData = new Common.UI.ComboBox({ this.cmbData = new Common.UI.ComboBox({
@ -406,7 +406,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
value = props.asc_getShowDropDown(); value = props.asc_getShowDropDown();
this.chShowDropDown.setValue(!!value, true); this.chShowDropDown.setValue(!!value, true);
value = props.asc_getType(); value = props.asc_getType();
this.cmbAllow.setValue(value!==null ? value : Asc.EDataValidationType.None, true); this.cmbAllow.setValue(value!==null ? value : Asc.c_oAscEDataValidationType.None, true);
value = props.asc_getOperator(); value = props.asc_getOperator();
this.cmbData.setValue(value!==null ? value : Asc.EDataValidationOperator.Between, true); this.cmbData.setValue(value!==null ? value : Asc.EDataValidationOperator.Between, true);
this.inputRangeMin.setValue(props.asc_getFormula1() ? props.asc_getFormula1().asc_getValue() || '' : ''); this.inputRangeMin.setValue(props.asc_getFormula1() ? props.asc_getFormula1().asc_getValue() || '' : '');
@ -462,37 +462,37 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
var allow = this.cmbAllow.getValue(), var allow = this.cmbAllow.getValue(),
data = this.cmbData.getValue(); data = this.cmbData.getValue();
var between = (data==Asc.EDataValidationOperator.Between || data==Asc.EDataValidationOperator.NotBetween); var between = (data==Asc.EDataValidationOperator.Between || data==Asc.EDataValidationOperator.NotBetween);
var source = (allow==Asc.EDataValidationType.Custom || allow==Asc.EDataValidationType.List); var source = (allow==Asc.c_oAscEDataValidationType.Custom || allow==Asc.c_oAscEDataValidationType.List);
this.minMaxTr.toggleClass('hidden', allow==Asc.EDataValidationType.None || source || !between); this.minMaxTr.toggleClass('hidden', allow==Asc.c_oAscEDataValidationType.None || source || !between);
this.sourceTr.toggleClass('hidden', allow==Asc.EDataValidationType.None || !source && between ); this.sourceTr.toggleClass('hidden', allow==Asc.c_oAscEDataValidationType.None || !source && between );
this.dropdownTr.toggleClass('hidden', allow!=Asc.EDataValidationType.List); this.dropdownTr.toggleClass('hidden', allow!=Asc.c_oAscEDataValidationType.List);
this.chIgnore.setDisabled(allow===Asc.EDataValidationType.None); this.chIgnore.setDisabled(allow===Asc.c_oAscEDataValidationType.None);
this.cmbData.setDisabled(allow===Asc.EDataValidationType.None || allow===Asc.EDataValidationType.Custom || allow===Asc.EDataValidationType.List); this.cmbData.setDisabled(allow===Asc.c_oAscEDataValidationType.None || allow===Asc.c_oAscEDataValidationType.Custom || allow===Asc.c_oAscEDataValidationType.List);
var str = this.textSource; var str = this.textSource;
if (allow==Asc.EDataValidationType.Custom) if (allow==Asc.c_oAscEDataValidationType.Custom)
str = this.textFormula; str = this.textFormula;
else if (data==Asc.EDataValidationOperator.Equal || data==Asc.EDataValidationOperator.NotEqual) { // equals, not equals else if (data==Asc.EDataValidationOperator.Equal || data==Asc.EDataValidationOperator.NotEqual) { // equals, not equals
if (allow==Asc.EDataValidationType.Date) if (allow==Asc.c_oAscEDataValidationType.Date)
str = this.txtDate; str = this.txtDate;
else if (allow==Asc.EDataValidationType.TextLength) else if (allow==Asc.c_oAscEDataValidationType.TextLength)
str = this.txtLength; str = this.txtLength;
else if (allow==Asc.EDataValidationType.Time) else if (allow==Asc.c_oAscEDataValidationType.Time)
str = this.txtElTime; str = this.txtElTime;
else else
str = this.textCompare; str = this.textCompare;
} else if (data==Asc.EDataValidationOperator.GreaterThan || data==Asc.EDataValidationOperator.GreaterThanOrEqual) { // greater, greater or equals } else if (data==Asc.EDataValidationOperator.GreaterThan || data==Asc.EDataValidationOperator.GreaterThanOrEqual) { // greater, greater or equals
if (allow==Asc.EDataValidationType.Date) if (allow==Asc.c_oAscEDataValidationType.Date)
str = this.txtStartDate; str = this.txtStartDate;
else if (allow==Asc.EDataValidationType.Time) else if (allow==Asc.c_oAscEDataValidationType.Time)
str = this.txtStartTime; str = this.txtStartTime;
else else
str = this.textMin; str = this.textMin;
} else if (data==Asc.EDataValidationOperator.LessThan || data==Asc.EDataValidationOperator.LessThanOrEqual) { // less, less or equals } else if (data==Asc.EDataValidationOperator.LessThan || data==Asc.EDataValidationOperator.LessThanOrEqual) { // less, less or equals
if (allow==Asc.EDataValidationType.Date) if (allow==Asc.c_oAscEDataValidationType.Date)
str = this.txtEndDate; str = this.txtEndDate;
else if (allow==Asc.EDataValidationType.Time) else if (allow==Asc.c_oAscEDataValidationType.Time)
str = this.txtEndTime; str = this.txtEndTime;
else else
str = this.textMax; str = this.textMax;
@ -501,10 +501,10 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
var str1 = this.textMin, var str1 = this.textMin,
str2 = this.textMax; str2 = this.textMax;
if (allow==Asc.EDataValidationType.Date) { if (allow==Asc.c_oAscEDataValidationType.Date) {
str1 = this.txtStartDate; str1 = this.txtStartDate;
str2 = this.txtEndDate; str2 = this.txtEndDate;
} else if (allow==Asc.EDataValidationType.Time) { } else if (allow==Asc.c_oAscEDataValidationType.Time) {
str1 = this.txtStartTime; str1 = this.txtStartTime;
str2 = this.txtEndTime; str2 = this.txtEndTime;
} }
@ -515,7 +515,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
isRangeValid: function() { isRangeValid: function() {
var isvalid = Asc.c_oAscError.ID.No; var isvalid = Asc.c_oAscError.ID.No;
var type = this.cmbAllow.getValue(); var type = this.cmbAllow.getValue();
if (type!==Asc.EDataValidationType.None) { if (type!==Asc.c_oAscEDataValidationType.None) {
var focusedInput, var focusedInput,
lblField, lblField,
error, error,
@ -525,7 +525,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
focusedInput = minVisible ? this.inputRangeMin : this.inputRangeSource; focusedInput = minVisible ? this.inputRangeMin : this.inputRangeSource;
lblField = minVisible ? this.lblRangeMin : this.lblRangeSource; lblField = minVisible ? this.lblRangeMin : this.lblRangeSource;
} }
if (isvalid === Asc.c_oAscError.ID.No) { if (this.inputRangeMax.isVisible() && isvalid === Asc.c_oAscError.ID.No) {
isvalid = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.DataValidation, this.props.asc_getFormula2() ? this.props.asc_getFormula2().asc_getValue() : null, true, undefined, type); isvalid = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.DataValidation, this.props.asc_getFormula2() ? this.props.asc_getFormula2().asc_getValue() : null, true, undefined, type);
if (isvalid !== Asc.c_oAscError.ID.No) { if (isvalid !== Asc.c_oAscError.ID.No) {
focusedInput = this.inputRangeMax; focusedInput = this.inputRangeMax;
@ -552,7 +552,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
error = Common.Utils.String.format(this.errorMinGreaterMax, this.lblRangeMin.text(), this.lblRangeMax.text()); error = Common.Utils.String.format(this.errorMinGreaterMax, this.lblRangeMin.text(), this.lblRangeMax.text());
break; break;
case Asc.c_oAscError.ID.DataValidateInvalid: case Asc.c_oAscError.ID.DataValidateInvalid:
error = Common.Utils.String.format((type==Asc.EDataValidationType.Time) ? this.errorInvalidTime : this.errorInvalidDate, lblField.text()); error = Common.Utils.String.format((type==Asc.c_oAscEDataValidationType.Time) ? this.errorInvalidTime : ((type==Asc.c_oAscEDataValidationType.Date) ? this.errorInvalidDate : this.errorInvalid), lblField.text());
break; break;
} }
error && Common.UI.warning({ error && Common.UI.warning({
@ -622,6 +622,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
errorMustEnterValue: 'You must enter a value in field \"{0}\".', errorMustEnterValue: 'You must enter a value in field \"{0}\".',
errorInvalidDate: 'The date you entered for the field \"{0}\" is invalid.', errorInvalidDate: 'The date you entered for the field \"{0}\" is invalid.',
errorInvalidTime: 'The time you entered for the field \"{0}\" is invalid.', errorInvalidTime: 'The time you entered for the field \"{0}\" is invalid.',
errorInvalid: 'The value you entered for the field \"{0}\" is invalid.',
errorNotNumeric: 'The field \"{0}\" must be a numeric value, numeric expression, or refer to a cell containing a numeric value.', errorNotNumeric: 'The field \"{0}\" must be a numeric value, numeric expression, or refer to a cell containing a numeric value.',
errorNegativeTextLength: 'Negative values cannot be used in conditions \"{0}\".', errorNegativeTextLength: 'Negative values cannot be used in conditions \"{0}\".',
errorMinGreaterMax: 'The \"{1}\" field must be greater than or equal to the \"{0}\" field.' errorMinGreaterMax: 'The \"{1}\" field must be greater than or equal to the \"{0}\" field.'

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

@ -1538,6 +1538,7 @@
"SSE.Views.DataTab.tipUngroup": "Ungroup range of cells", "SSE.Views.DataTab.tipUngroup": "Ungroup range of cells",
"SSE.Views.DataValidationDialog.errorInvalidDate": "The date you entered for the field \"{0}\" is invalid.", "SSE.Views.DataValidationDialog.errorInvalidDate": "The date you entered for the field \"{0}\" is invalid.",
"SSE.Views.DataValidationDialog.errorInvalidTime": "The time you entered for the field \"{0}\" is invalid.", "SSE.Views.DataValidationDialog.errorInvalidTime": "The time you entered for the field \"{0}\" is invalid.",
"SSE.Views.DataValidationDialog.errorInvalid": "The value you entered for the field \"{0}\" is invalid.",
"SSE.Views.DataValidationDialog.errorMinGreaterMax": "The \"{1}\" field must be greater than or equal to the \"{0}\" field.", "SSE.Views.DataValidationDialog.errorMinGreaterMax": "The \"{1}\" field must be greater than or equal to the \"{0}\" field.",
"SSE.Views.DataValidationDialog.errorMustEnterBothValues": "You must enter a value in both field \"{0}\" and field \"{1}\".", "SSE.Views.DataValidationDialog.errorMustEnterBothValues": "You must enter a value in both field \"{0}\" and field \"{1}\".",
"SSE.Views.DataValidationDialog.errorMustEnterValue": "You must enter a value in field \"{0}\".", "SSE.Views.DataValidationDialog.errorMustEnterValue": "You must enter a value in field \"{0}\".",