Skip to content

S
sdkjs
Commit da5c05f1 authored by Sergey Luzyanin's avatar Sergey Luzyanin
Browse files
Options

fix Bug 33283

parent 8c370d36
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 43 deletions
common/Drawings/CommonController.js
View file @ da5c05f1
......@@ -965,6 +965,7 @@ DrawingObjectsController.prototype =
if(!isRealObject(group))
{
this.resetInternalSelection();
this.updateOverlay();
if(!b_is_inline)
this.changeCurrentState(new AscFormat.PreMoveState(this, x, y, e.ShiftKey, e.CtrlKey, object, is_selected, /*true*/!bInSelect));
else
......@@ -975,6 +976,7 @@ DrawingObjectsController.prototype =
else
{
group.resetInternalSelection();
this.updateOverlay();
this.changeCurrentState(new AscFormat.PreMoveInGroupState(this, group, x, y, e.ShiftKey, e.CtrlKey, object, is_selected));
}
if(e.ClickCount > 1 && !e.ShiftKey && !e.CtrlKey && ((this.selection.groupSelection && this.selection.groupSelection.selectedObjects.length === 1) || this.selectedObjects.length === 1))
......@@ -2726,7 +2728,7 @@ DrawingObjectsController.prototype =
c1: chart_space.bbox.serBBox.c1, c2: chart_space.bbox.serBBox.c2};
}
var chartSeries = AscFormat.getChartSeries(ws_view.model, chartSettings, catHeadersBBox, serHeadersBBox);
chart_space.clearFormatting(true);
//chart_space.clearFormatting(true);
b_clear_formatting = true;
chart_space.rebuildSeriesFromAsc(chartSeries);
}
......
common/Drawings/DrawingObjectsHandlers.js
View file @ da5c05f1
......@@ -331,9 +331,10 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
var ret = false, i, title;
if(drawing.hit(x, y))
{
var bClickFlag = drawingObjectsController.handleEventMode === AscFormat.HANDLE_EVENT_MODE_CURSOR || e.ClickCount < 2;
var selector = group ? group : drawingObjectsController;
var legend = drawing.getLegend();
if(legend && !window["NATIVE_EDITOR_ENJINE"] && legend.hit(x, y))
if(legend && !window["NATIVE_EDITOR_ENJINE"] && legend.hit(x, y) && bClickFlag)
{
if(drawing.selection.legend != legend)
{
......@@ -397,11 +398,11 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
var oLabels;
var arrLabels = [];
if(drawing.chart.plotArea.catAx && drawing.chart.plotArea.catAx.labels && !window["NATIVE_EDITOR_ENJINE"])
if(drawing.chart.plotArea.catAx && drawing.chart.plotArea.catAx.labels && !window["NATIVE_EDITOR_ENJINE"] && bClickFlag)
{
arrLabels.push(drawing.chart.plotArea.catAx.labels);
}
if(drawing.chart.plotArea.valAx && drawing.chart.plotArea.valAx.labels && !window["NATIVE_EDITOR_ENJINE"])
if(drawing.chart.plotArea.valAx && drawing.chart.plotArea.valAx.labels && !window["NATIVE_EDITOR_ENJINE"] && bClickFlag)
{
arrLabels.push(drawing.chart.plotArea.valAx.labels);
}
......@@ -428,7 +429,7 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
}
}
if(drawing.chart.plotArea.chart && drawing.chart.plotArea.chart.series && !window["NATIVE_EDITOR_ENJINE"])
if(drawing.chart.plotArea.chart && drawing.chart.plotArea.chart.series && !window["NATIVE_EDITOR_ENJINE"] && bClickFlag)
{
var series = drawing.chart.plotArea.chart.series;
var _len = drawing.chart.plotArea.chart.getObjectType() === AscDFH.historyitem_type_PieChart ? 1 : series.length;
......@@ -538,56 +539,62 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
//todo gridlines
//plotArea
var oChartSizes = drawing.getChartSizes();
var oInvertTransform = drawing.invertTransform;
var dTx = oInvertTransform.TransformPointX(x, y);
var dTy = oInvertTransform.TransformPointY(x, y);
if(dTx >= oChartSizes.startX && dTx <= oChartSizes.startX + oChartSizes.w
&& dTy >= oChartSizes.startY && dTy <= oChartSizes.startY + oChartSizes.h)
{
if(drawingObjectsController.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
if(bClickFlag){
var oChartSizes = drawing.getChartSizes();
var oInvertTransform = drawing.invertTransform;
var dTx = oInvertTransform.TransformPointX(x, y);
var dTy = oInvertTransform.TransformPointY(x, y);
if(dTx >= oChartSizes.startX && dTx <= oChartSizes.startX + oChartSizes.w
&& dTy >= oChartSizes.startY && dTy <= oChartSizes.startY + oChartSizes.h)
{
if(drawing.selection.plotArea == null || !AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(drawing) || !drawing.chartObj || !drawing.chartObj.processor3D)
{
drawingObjectsController.checkChartTextSelection();
selector.resetSelection();
selector.selectObject(drawing, pageIndex);
selector.selection.chartSelection = drawing;
drawing.selection.plotArea = drawing.chart.plotArea;
}
else
if(drawingObjectsController.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
{
drawing.selection.plotArea = drawing.chart.plotArea;
drawing.selection.rotatePlotArea = true;
drawingObjectsController.updateSelectionState();
drawingObjectsController.updateOverlay();
drawingObjectsController.arrPreTrackObjects.length = 0;
drawingObjectsController.arrPreTrackObjects.push(new AscFormat.Chart3dAdjustTrack(drawing, 0, x, y));
if(!isRealObject(group))
if(drawing.selection.plotArea == null || !AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(drawing) || !drawing.chartObj || !drawing.chartObj.processor3D)
{
drawingObjectsController.changeCurrentState(new AscFormat.PreChangeAdjState(drawingObjectsController, drawing));
drawingObjectsController.checkChartTextSelection();
selector.resetSelection();
selector.selectObject(drawing, pageIndex);
selector.selection.chartSelection = drawing;
drawing.selection.plotArea = drawing.chart.plotArea;
}
else
{
drawingObjectsController.changeCurrentState(new AscFormat.PreChangeAdjInGroupState(drawingObjectsController, group));
drawing.selection.plotArea = drawing.chart.plotArea;
drawing.selection.rotatePlotArea = true;
drawingObjectsController.updateSelectionState();
drawingObjectsController.updateOverlay();
drawingObjectsController.arrPreTrackObjects.length = 0;
drawingObjectsController.arrPreTrackObjects.push(new AscFormat.Chart3dAdjustTrack(drawing, 0, x, y));
if(!isRealObject(group))
{
drawingObjectsController.changeCurrentState(new AscFormat.PreChangeAdjState(drawingObjectsController, drawing));
}
else
{
drawingObjectsController.changeCurrentState(new AscFormat.PreChangeAdjInGroupState(drawingObjectsController, group));
}
var bOldIsLocked = e.IsLocked;
e.IsLocked = true;
drawingObjectsController.OnMouseMove(e, x, y, pageIndex);
e.IsLocked = bOldIsLocked;
return true;
}
return true;
}
drawingObjectsController.updateSelectionState();
drawingObjectsController.updateOverlay();
return true;
}
else
{
return {objectId: drawing.Get_Id(), cursorType: "default", bMarker: false};
drawingObjectsController.updateSelectionState();
drawingObjectsController.updateOverlay();
return true;
}
else
{
return {objectId: drawing.Get_Id(), cursorType: "default", bMarker: false};
}
}
}
}
}
return ret;
}
......
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