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

Merge branch 'release/v6.3.0' of https://github.com/ONLYOFFICE/web-apps into release/v6.3.0

Browse source
This commit is contained in:
Maxim Kadushkin 2021-05-06 17:47:45 +03:00
parent 2df14e5a4e 39fab45644
commit 12cd63f48f
3 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/main/resources/less/combo-dataview.less
View file

@ -146,6 +146,7 @@
border: none;
//.box-shadow(0 0 0 @scaled-one-px-value-ie @background-normal-ie);
//.box-shadow(0 0 0 @scaled-one-px-value @background-normal);
background-color: @canvas-content-background;
> div {
background-repeat: no-repeat;

8
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1379,6 +1379,14 @@ define([
config.msg = this.errorStockChart;
break;
case Asc.c_oAscError.ID.MaxDataSeriesError:
config.msg = this.getApplication().getController('Toolbar').errorMaxRows;
break;
case Asc.c_oAscError.ID.ComboSeriesError:
config.msg = this.getApplication().getController('Toolbar').errorComboSeries;
break;
case Asc.c_oAscError.ID.DataRangeError:
config.msg = this.errorDataRange;
break;

54
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1088,32 +1088,36 @@ define([
var ischartedit = ( seltype == Asc.c_oAscSelectionType.RangeChart || seltype == Asc.c_oAscSelectionType.RangeChartText);
props = me.api.asc_getChartObject(true); // don't lock chart object
if (props) {
(ischartedit) ? props.changeType(type) : props.putType(type);
var range = props.getRange(),
isvalid = (!_.isEmpty(range)) ? me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, range, true, props.getInRows(), props.getType()) : Asc.c_oAscError.ID.No;
if (isvalid == Asc.c_oAscError.ID.No) {
!ischartedit && me.api.asc_addChartDrawingObject(props);
} else {
var msg = me.txtInvalidRange;
switch (isvalid) {
case isvalid == Asc.c_oAscError.ID.StockChartError:
msg = me.errorStockChart;
break;
case isvalid == Asc.c_oAscError.ID.MaxDataSeriesError:
msg = me.errorMaxRows;
break;
case isvalid == Asc.c_oAscError.ID.ComboSeriesError:
msg = me.errorComboSeries;
break;
}
Common.UI.warning({
msg: msg,
callback: function() {
_.defer(function(btn) {
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
})
if (ischartedit)
props.changeType(type);
else {
props.putType(type);
var range = props.getRange(),
isvalid = (!_.isEmpty(range)) ? me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, range, true, props.getInRows(), props.getType()) : Asc.c_oAscError.ID.No;
if (isvalid == Asc.c_oAscError.ID.No) {
me.api.asc_addChartDrawingObject(props);
} else {
var msg = me.txtInvalidRange;
switch (isvalid) {
case Asc.c_oAscError.ID.StockChartError:
msg = me.errorStockChart;
break;
case Asc.c_oAscError.ID.MaxDataSeriesError:
msg = me.errorMaxRows;
break;
case Asc.c_oAscError.ID.ComboSeriesError:
msg = me.errorComboSeries;
break;
}
});
Common.UI.warning({
msg: msg,
callback: function() {
_.defer(function(btn) {
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
})
}
});
}
}
}
}