Commit 46560c39 authored by Alexander Trofimov's avatar Alexander Trofimov Committed by GitHub

Merge pull request #65 from ONLYOFFICE/feature/selection

Feature/selection
parents 05b4fa7c a322998e
...@@ -321,6 +321,14 @@ var c_oAscFormulaRangeBorderColor = [ ...@@ -321,6 +321,14 @@ var c_oAscFormulaRangeBorderColor = [
new CColor(55, 127, 158) new CColor(55, 127, 158)
]; ];
var selectionLineType = {
Dash : 1,
RangeWithPromote: 2,
RangeWithResize : 3,
Range : 4,
RangeOut : 5
};
var c_oAscLockNameFrozenPane = "frozenPane"; var c_oAscLockNameFrozenPane = "frozenPane";
var c_oAscLockNameTabColor = "tabColor"; var c_oAscLockNameTabColor = "tabColor";
...@@ -369,6 +377,7 @@ var c_oAscPopUpSelectorType = { ...@@ -369,6 +377,7 @@ var c_oAscPopUpSelectorType = {
window['AscCommonExcel'].c_oAscCoAuthoringDottedWidth = c_oAscCoAuthoringDottedWidth; window['AscCommonExcel'].c_oAscCoAuthoringDottedWidth = c_oAscCoAuthoringDottedWidth;
window['AscCommonExcel'].c_oAscCoAuthoringDottedDistance = c_oAscCoAuthoringDottedDistance; window['AscCommonExcel'].c_oAscCoAuthoringDottedDistance = c_oAscCoAuthoringDottedDistance;
window['AscCommonExcel'].c_oAscFormulaRangeBorderColor = c_oAscFormulaRangeBorderColor; window['AscCommonExcel'].c_oAscFormulaRangeBorderColor = c_oAscFormulaRangeBorderColor;
window['AscCommonExcel'].selectionLineType = selectionLineType;
window['AscCommonExcel'].c_oAscLockNameFrozenPane = c_oAscLockNameFrozenPane; window['AscCommonExcel'].c_oAscLockNameFrozenPane = c_oAscLockNameFrozenPane;
window['AscCommonExcel'].c_oAscLockNameTabColor = c_oAscLockNameTabColor; window['AscCommonExcel'].c_oAscLockNameTabColor = c_oAscLockNameTabColor;
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
paddingPlusBorder: -1 paddingPlusBorder: -1
}; };
this.activeCellBorderColor = new CColor(126, 152, 63); this.activeCellBorderColor = new CColor(126, 152, 63);
this.activeCellBorderColor2 = new CColor(255, 255, 255, 0.75); this.activeCellBorderColor2 = new CColor(255, 255, 255, 1);
this.activeCellBackground = new CColor(157, 185, 85, 0.2); this.activeCellBackground = new CColor(157, 185, 85, 0.2);
// Цвет заливки границы выделения области автозаполнения // Цвет заливки границы выделения области автозаполнения
......
This diff is collapsed.
...@@ -3573,13 +3573,15 @@ function DrawingObjects() { ...@@ -3573,13 +3573,15 @@ function DrawingObjects() {
{ {
worksheet._drawElements(worksheet._drawSelectionElement, worksheet._drawElements(worksheet._drawSelectionElement,
asc.Range(drawing.bbox.serBBox.c1, drawing.bbox.serBBox.r1, drawing.bbox.serBBox.c2, asc.Range(drawing.bbox.serBBox.c1, drawing.bbox.serBBox.r1, drawing.bbox.serBBox.c2,
drawing.bbox.serBBox.r2, true), false, AscCommonExcel.c_oAscFormulaRangeBorderColor[1]); drawing.bbox.serBBox.r2, true), AscCommonExcel.selectionLineType.RangeWithResize,
AscCommonExcel.c_oAscFormulaRangeBorderColor[1]);
} }
if(drawing.bbox.catBBox) if(drawing.bbox.catBBox)
{ {
worksheet._drawElements(worksheet._drawSelectionElement, worksheet._drawElements(worksheet._drawSelectionElement,
asc.Range(drawing.bbox.catBBox.c1, drawing.bbox.catBBox.r1, drawing.bbox.catBBox.c2, asc.Range(drawing.bbox.catBBox.c1, drawing.bbox.catBBox.r1, drawing.bbox.catBBox.c2,
drawing.bbox.catBBox.r2, true), false, AscCommonExcel.c_oAscFormulaRangeBorderColor[2]); drawing.bbox.catBBox.r2, true), AscCommonExcel.selectionLineType.RangeWithResize,
AscCommonExcel.c_oAscFormulaRangeBorderColor[2]);
} }
var BB = drawing.bbox.seriesBBox; var BB = drawing.bbox.seriesBBox;
var range = asc.Range(BB.c1, BB.r1, BB.c2, BB.r2, true); var range = asc.Range(BB.c1, BB.r1, BB.c2, BB.r2, true);
......
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