Skip to content

S
sdkjs
Commit 2d99b1e8 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov
Browse files
Options

Bug fix 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51192 954022d7-b5bf-4e40-9824-e11837661b57
parent 17d443fb
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 34 deletions
Common/Charts/DrawingObjects.js
View file @ 2d99b1e8
......@@ -963,10 +963,8 @@ asc_CChart.prototype = {
break;
}
if ( ws ) {
//ws.objectRender.rebuildChartGraphicObjects();
//ws.objectRender.showDrawingObjects(false);
}
if ( ws )
ws.objectRender.rebuildChartGraphicObjects();
},
Redo: function(type, data) {
......@@ -1071,10 +1069,8 @@ asc_CChart.prototype = {
this.legend.bOverlay = data.newValue;
break;
}
if ( ws ) {
//ws.objectRender.rebuildChartGraphicObjects();
//ws.objectRender.showDrawingObjects(false);
}
if ( ws )
ws.objectRender.rebuildChartGraphicObjects();
}
}
......@@ -3792,7 +3788,7 @@ function DrawingObjects() {
_this.rebuildChartGraphicObjects = function() {
for (var i = 0; i < aObjects.length; i++) {
var graphicObject = aObjects[i].graphicObject;
if ( graphicObject.isChart() ) {
if ( graphicObject.isChart() && graphicObject.chart.range.intervalObject ) {
graphicObject.chart.rebuildSeries();
graphicObject.recalculate();
}
......@@ -4367,6 +4363,7 @@ function DrawingObjects() {
_this.deleteDrawingBase = function(graphicId) {
var position = null;
var bRedraw = false;
for (var i = 0; i < aObjects.length; i++) {
if ( aObjects[i].graphicObject.Id == graphicId ) {
......@@ -4375,14 +4372,15 @@ function DrawingObjects() {
worksheet.arrActiveChartsRanges = [];
aObjects.splice(i, 1);
bRedraw = true;
return i;
position = i;
break;
}
}
if ( bRedraw )
_this.showDrawingObjects(true);
return null;
return position;
};
_this.checkGraphicObjectPosition = function(x, y, w, h) {
......
Excel/model/DrawingObjects/Format/Chart.js
View file @ 2d99b1e8
......@@ -472,55 +472,57 @@ CChartAsGroup.prototype =
setChart: function(chart, isCollaborative)
{
var sheetId = this.drawingObjects.getWorksheet().model.Id;
if ( !(isCollaborative === true) ) {
History.Create_NewPoint();
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, sheetId, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
}
// type, subType, styleId
if ( (this.chart.type != chart.type) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_Type, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.type, chart.type)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_Type, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.type, chart.type)));
this.chart.type = chart.type;
}
if ( (this.chart.subType != chart.subType) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_SubType, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.subType, chart.subType)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_SubType, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.subType, chart.subType)));
this.chart.subType = chart.subType;
}
if ( (this.chart.styleId != chart.styleId) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_Style, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.styleId, chart.styleId)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_Style, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.styleId, chart.styleId)));
this.chart.styleId = chart.styleId;
}
// showValue, showBorder
if ( (this.chart.bShowValue != chart.bShowValue) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_IsShowValue, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.bShowValue, chart.bShowValue)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_IsShowValue, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.bShowValue, chart.bShowValue)));
this.chart.bShowValue = chart.bShowValue;
}
if ( (this.chart.bShowBorder != chart.bShowBorder) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_IsShowBorder, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.bShowBorder, chart.bShowBorder)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_IsShowBorder, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.bShowBorder, chart.bShowBorder)));
this.chart.bShowBorder = chart.bShowBorder;
}
// range
if ( (this.chart.range.interval != chart.range.interval) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_RangeInterval, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.range.interval, chart.range.interval)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_RangeInterval, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.range.interval, chart.range.interval)));
this.chart.range.interval = chart.range.interval;
this.chart.range.intervalObject = convertFormula(this.chart.range.interval, this.drawingObjects.getWorksheet());
this.chart.rebuildSeries();
}
if ( (this.chart.range.rows != chart.range.rows) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_RangeRowColumns, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.range.rows, chart.range.rows)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_RangeRowColumns, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.range.rows, chart.range.rows)));
this.chart.range.rows = chart.range.rows;
this.chart.range.columns = !chart.range.rows;
}
// header
if ( (this.chart.header.title != chart.header.title) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_HeaderTitle, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.header.title, chart.header.title)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_HeaderTitle, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.header.title, chart.header.title)));
this.chart.header.title = chart.header.title;
if(!(isCollaborative === true))
{
......@@ -544,18 +546,18 @@ CChartAsGroup.prototype =
}
if ( (this.chart.header.subTitle != chart.header.subTitle) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_HeaderSubTitle, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.header.subTitle, chart.header.subTitle)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_HeaderSubTitle, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.header.subTitle, chart.header.subTitle)));
this.chart.header.subTitle = chart.header.subTitle;
}
if ( (this.chart.header.bDefaultTitle != chart.header.bDefaultTitle) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_IsDefaultHeaderTitle, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.header.bDefaultTitle, chart.header.bDefaultTitle)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_IsDefaultHeaderTitle, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.header.bDefaultTitle, chart.header.bDefaultTitle)));
this.chart.header.bDefaultTitle = chart.header.bDefaultTitle;
}
// xAxis
if ( (this.chart.xAxis.title != chart.xAxis.title) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_xAxisTitle, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.xAxis.title, chart.xAxis.title)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_xAxisTitle, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.xAxis.title, chart.xAxis.title)));
this.chart.xAxis.title = chart.xAxis.title;
if(!(isCollaborative === true))
{
......@@ -579,12 +581,12 @@ CChartAsGroup.prototype =
}
if ( (this.chart.xAxis.bDefaultTitle != chart.xAxis.bDefaultTitle) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_xAxisIsDefaultTitle, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.xAxis.bDefaultTitle, chart.xAxis.bDefaultTitle)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_xAxisIsDefaultTitle, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.xAxis.bDefaultTitle, chart.xAxis.bDefaultTitle)));
this.chart.xAxis.bDefaultTitle = chart.xAxis.bDefaultTitle;
}
if ( (this.chart.xAxis.bShow != chart.xAxis.bShow) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_xAxisIsShow, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.xAxis.bShow, chart.xAxis.bShow)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_xAxisIsShow, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.xAxis.bShow, chart.xAxis.bShow)));
this.chart.xAxis.bShow = chart.xAxis.bShow;
if(!this.chart.xAxis.bShow)
{
......@@ -593,13 +595,13 @@ CChartAsGroup.prototype =
}
if ( (this.chart.xAxis.bGrid != chart.xAxis.bGrid) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_xAxisIsGrid, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.xAxis.bGrid, chart.xAxis.bGrid)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_xAxisIsGrid, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.xAxis.bGrid, chart.xAxis.bGrid)));
this.chart.xAxis.bGrid = chart.xAxis.bGrid;
}
// yAxis
if ( (this.chart.yAxis.title != chart.yAxis.title) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_yAxisTitle, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.yAxis.title, chart.yAxis.title)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_yAxisTitle, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.yAxis.title, chart.yAxis.title)));
this.chart.yAxis.title = chart.yAxis.title;
if(!(isCollaborative === true))
{
......@@ -624,12 +626,12 @@ CChartAsGroup.prototype =
}
if ( (this.chart.yAxis.bDefaultTitle != chart.yAxis.bDefaultTitle) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_yAxisIsDefaultTitle, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.yAxis.bDefaultTitle, chart.yAxisbDefaultTitle)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_yAxisIsDefaultTitle, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.yAxis.bDefaultTitle, chart.yAxisbDefaultTitle)));
this.chart.yAxis.bDefaultTitle = chart.yAxis.bDefaultTitle;
}
if ( (this.chart.yAxis.bShow != chart.yAxis.bShow) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_yAxisIsShow, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.yAxis.bShow, chart.yAxis.bShow)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_yAxisIsShow, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.yAxis.bShow, chart.yAxis.bShow)));
this.chart.yAxis.bShow = chart.yAxis.bShow;
if(!this.chart.yAxis.bShow)
{
......@@ -638,29 +640,29 @@ CChartAsGroup.prototype =
}
if ( (this.chart.yAxis.bGrid != chart.yAxis.bGrid) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_yAxisIsGrid, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.yAxis.bGrid, chart.yAxis.bGrid)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_yAxisIsGrid, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.yAxis.bGrid, chart.yAxis.bGrid)));
this.chart.yAxis.bGrid = chart.yAxis.bGrid;
}
// legend
if ( (this.chart.legend.position != chart.legend.position) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_LegendPosition, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.legend.position, chart.legend.position)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_LegendPosition, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.legend.position, chart.legend.position)));
this.chart.legend.position = chart.legend.position;
}
if ( (this.chart.legend.bShow != chart.legend.bShow) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_LegendIsShow, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.legend.bShow, chart.legend.bShow)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_LegendIsShow, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.legend.bShow, chart.legend.bShow)));
this.chart.legend.bShow = chart.legend.bShow;
}
if ( (this.chart.legend.bOverlay != chart.legend.bOverlay) || (isCollaborative === true) ) {
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_LegendIsOverlay, null, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.legend.bOverlay, chart.legend.bOverlay)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_LegendIsOverlay, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.legend.bOverlay, chart.legend.bOverlay)));
this.chart.legend.bOverlay = chart.legend.bOverlay;
}
if ( !(isCollaborative === true) ) {
this.chart.rebuildSeries();
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, null, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, sheetId, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
}
},
......
Excel/view/WorksheetView.js
View file @ 2d99b1e8
......@@ -4973,6 +4973,8 @@
var oHyperlink = new Hyperlink();
oHyperlink.Hyperlink = drawingInfo.hyperlink.Value;
oHyperlink.Tooltip = drawingInfo.hyperlink.ToolTip;
var _r = this.activeRange.clone(true);
oHyperlink.Ref = this.model.getRange3(_r.r1, _r.c1, _r.r2, _r.c2);
var cellCursor = {cursor: kCurCells, target: "cells", col: (c ? c.col : -1),
row: (r ? r.row : -1), userId: userId,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7