Skip to content

S
sdkjs
Commit bc63f12a authored by Dmitry.Vikulov's avatar Dmitry.Vikulov
Browse files
Options

- Добавлены asc_классы для текстовых свойств автофигур 

- Исправлен баг с неверным отображением граф.объектов на разных листах при разных значениях скрола

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48795 954022d7-b5bf-4e40-9824-e11837661b57
parent 87ecaee6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 469 additions and 29 deletions
Common/Charts/DrawingObjects.js
View file @ bc63f12a
This diff is collapsed.
Excel/model/DrawingObjects/DrawingObjectsController.js
View file @ bc63f12a
......@@ -14,6 +14,8 @@ function DrawingObjectsController(drawingObjects)
this.arrPreTrackObjects = [];
this.arrTrackObjects = [];
this.defaultColorMap = GenerateDefaultColorMap().color_map;
var ascSelectedObjects = [];
}
DrawingObjectsController.prototype =
......@@ -746,7 +748,91 @@ DrawingObjectsController.prototype =
getGraphicObjectProps: function()
{
var shape_props, image_props, chart_props;
ascSelectedObjects = [];
// Текстовые свойства объекта
var flag = false;
if(this.curState.id === STATES_ID_TEXT_ADD || this.curState.id === STATES_ID_TEXT_ADD_IN_GROUP)
{
flag = true;
}
else
{
if(this.curState.id != STATES_ID_GROUP)
{
var s_arr2 = this.selectedObjects;
if(s_arr2.length === 1 && s_arr2[0] instanceof CShape && !isRealObject(s_arr2[0].txBody))
flag = true;
for(var i = 0; i < this.selectedObjects.length; ++i)
{
if(this.selectedObjects[i].isShape() && this.selectedObjects[i].txBody)
{
flag = true;
break;
}
}
}
else
{
var gr_sel_array = this.curState.group.selectionInfo.selectionArray;
for(var i = 0; i < gr_sel_array.length; ++i)
{
if(gr_sel_array[i].isShape() && gr_sel_array[i].textBoxContent)
{
flag = true;
break;
}
}
}
}
if(flag)
{
var cur_state = this.curState;
switch(this.curState.id)
{
case STATES_ID_TEXT_ADD:
{
var text_object = cur_state.textObject;
if(text_object != null && text_object != null && text_object.txBody.content != null)
text_object.txBody.content.Document_UpdateInterfaceState();
break;
}
case STATES_ID_TEXT_ADD_IN_GROUP:
{
text_object = cur_state.textObject;
if(text_object != null && text_object.txBody.content != null)
text_object.txBody.content.Document_UpdateInterfaceState();
break;
}
default:
{
var para_pr = this.getParagraphParaPr();
if(this.selectedObjects.length === 1
&& this.selectedObjects[0] instanceof CShape
&& !isRealObject(this.selectedObjects[0].textBoxContent))
{
if(isRealObject(this.selectedObjects[0].Parent) && typeof this.selectedObjects[0].Parent.Get_CompiledPr2 === "function")
{
var para_pr2 = this.selectedObjects[0].Parent.Get_CompiledPr2(false).ParaPr;
if(isRealObject(para_pr2) && isRealObject(para_pr2.Ind))
{
para_pr.Ind = para_pr2.Ind;
}
}
}
//editor.UpdateParagraphProp(para_pr);
//editor.UpdateTextPr(this.getParagraphTextPr());
break;
}
}
//ascSelectedObjects.push(new asc_CSelectedObject( c_oAscTypeSelectElement.Paragraph, new asc_CParagraphProperty( prProp ) );
}
// Основные свойства объекта
if(isRealObject(this.curState.group))
{
var selected_objects = this.curState.group.selectedObjects;
......@@ -1000,8 +1086,7 @@ DrawingObjectsController.prototype =
{
ret.push(chart_props);
}
var ascSelectedObjects = [];
for (var i = 0; i < ret.length; i++) {
ascSelectedObjects.push(new asc_CSelectedObject( c_oAscTypeSelectElement.Image, new asc_CImgProperty(ret[i]) ));
}
......
Excel/model/DrawingObjects/Format/DocumentContent.js
View file @ bc63f12a
......@@ -5271,13 +5271,13 @@ CDocumentContent.prototype =
{
StartPr = this.Content[0].Get_CompiledPr2().ParaPr;
Pr = StartPr.Copy();
Pr.Locked = this.Content[0].Lock.Is_Locked();
//Pr.Locked = this.Content[0].Lock.Is_Locked();
}
else if ( type_Table == this.Content[0].GetType() )
{
StartPr = this.Content[0].Get_Paragraph_ParaPr();
Pr = StartPr.Copy();
Pr.Locked = StartPr.Locked;
//Pr.Locked = StartPr.Locked;
}
for ( var Index = 1; Index < this.Content.length; Index++ )
......@@ -5288,7 +5288,7 @@ CDocumentContent.prototype =
if ( type_Paragraph == Item.GetType() )
{
TempPr = Item.Get_CompiledPr2(false).ParaPr.Copy();
TempPr.Locked = Item.Lock.Is_Locked();
//TempPr.Locked = Item.Lock.Is_Locked();
}
else if ( type_Table == Item.GetType() )
{
......@@ -5333,13 +5333,13 @@ CDocumentContent.prototype =
{
StartPr = this.Content[StartPos].Get_CompiledPr2(false).ParaPr;
Pr = StartPr.Copy();
Pr.Locked = this.Content[StartPos].Lock.Is_Locked();
//Pr.Locked = this.Content[StartPos].Lock.Is_Locked();
}
else if ( type_Table == this.Content[StartPos].GetType() )
{
StartPr = this.Content[StartPos].Get_Paragraph_ParaPr();
Pr = StartPr.Copy();
Pr.Locked = StartPr.Locked;
//Pr.Locked = StartPr.Locked;
}
for ( var Index = StartPos + 1; Index <= EndPos; Index++ )
......@@ -5350,7 +5350,7 @@ CDocumentContent.prototype =
if ( type_Paragraph == Item.GetType() )
{
TempPr = Item.Get_CompiledPr2(false).ParaPr;
TempPr.Locked = Item.Lock.Is_Locked();
//TempPr.Locked = Item.Lock.Is_Locked();
}
else if ( type_Table == Item.GetType() )
{
......@@ -5370,7 +5370,7 @@ CDocumentContent.prototype =
Pr.Ind.FirstLine = StartPr.Ind.FirstLine;
Result_ParaPr = Pr;
Result_ParaPr.CanAddTable = ( true === Locked ? false : true );
//Result_ParaPr.CanAddTable = ( true === Locked ? false : true );
}
else
{
......@@ -5378,11 +5378,11 @@ CDocumentContent.prototype =
if ( type_Paragraph == Item.GetType() )
{
var ParaPr = Item.Get_CompiledPr2(false).ParaPr;
var Locked = Item.Lock.Is_Locked();
//var Locked = Item.Lock.Is_Locked();
Result_ParaPr = ParaPr.Copy();
Result_ParaPr.Locked = Locked;
Result_ParaPr.CanAddTable = ( ( true === Locked ) ? ( ( true === Item.Cursor_IsEnd() ) ? true : false ) : true );
//Result_ParaPr.CanAddTable = ( ( true === Locked ) ? ( ( true === Item.Cursor_IsEnd() ) ? true : false ) : true );
}
else if ( type_Table == Item.GetType() )
{
......@@ -5644,10 +5644,10 @@ CDocumentContent.prototype =
if ( null != ParaPr )
{
if ( undefined != ParaPr.Tabs )
editor.Update_ParaTab( Default_Tab_Stop, ParaPr.Tabs );
//if ( undefined != ParaPr.Tabs )
// editor.Update_ParaTab( Default_Tab_Stop, ParaPr.Tabs );
editor.UpdateParagraphProp( ParaPr );
//editor.UpdateParagraphProp( ParaPr );
}
},
......@@ -5656,8 +5656,8 @@ CDocumentContent.prototype =
{
var TextPr = this.Get_Paragraph_TextPr();
if ( null != TextPr )
editor.UpdateTextPr(TextPr);
//if ( null != TextPr )
// editor.UpdateTextPr( TextPr );
},
Interface_Update_DrawingPr : function(Flag)
......
Excel/model/DrawingObjects/States.js
View file @ bc63f12a
......@@ -772,7 +772,7 @@ function PreMoveInternalChartObjectState(drawingObjectsController, drawingObject
this.isPointInDrawingObjects = function(x, y)
{
return {objectId: this.chartElement.chartGroup.Id, cursorType:"move"};
return {objectId: this.chartElement.chartGroup.Id, cursorType: "move"};
};
}
......@@ -1433,7 +1433,10 @@ function TextAddState(drawingObjectsController, drawingObjects, textObject)
this.isPointInDrawingObjects = function(x, y)
{
return this.nullState.isPointInDrawingObjects(x, y);
var cursorInfo = this.nullState.isPointInDrawingObjects(x, y);
//if ( cursorInfo )
// cursorInfo.cursorType = "text";
return cursorInfo;
};
// Уменьшение размера шрифта
......@@ -2339,7 +2342,7 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
this.isPointInDrawingObjects = function(x, y)
{
return {objectId:this.majorObject.Id, cursorType: "move"}
return { objectId: this.majorObject.Id, cursorType: "move" };
};
}
......
Excel/view/WorkbookView.js
View file @ bc63f12a
......@@ -958,6 +958,7 @@
// Мы меняли zoom, но не перерисовывали данный лист (он был не активный)
if (ws.updateZoom)
ws.changeZoom(true);
ws.objectRender.restoreScrollOffset();
ws.draw();
this._onSelectionNameChanged(ws.getSelectionName(/*bRangeText*/false));
this._onWSSelectionChanged(ws.getSelectionInfo());
......
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