Commit 5ca6ec55 authored by Alexander.Trofimov's avatar Alexander.Trofimov

bug 33509

add method asc_getLockedSparkline
parent fc4784bb
...@@ -263,7 +263,8 @@ ...@@ -263,7 +263,8 @@
this.hyperlink = null; this.hyperlink = null;
this.comments = []; this.comments = [];
this.isLocked = false; this.isLocked = false;
this.isLockedTable = null; this.isLockedTable = false;
this.isLockedSparkline = false;
this.styleName = null; this.styleName = null;
this.numFormatType = null; this.numFormatType = null;
this.angle = null; this.angle = null;
...@@ -317,6 +318,9 @@ ...@@ -317,6 +318,9 @@
asc_CCellInfo.prototype.asc_getLockedTable = function () { asc_CCellInfo.prototype.asc_getLockedTable = function () {
return this.isLockedTable; return this.isLockedTable;
}; };
asc_CCellInfo.prototype.asc_getLockedSparkline = function () {
return this.isLockedSparkline;
};
asc_CCellInfo.prototype.asc_getStyleName = function () { asc_CCellInfo.prototype.asc_getStyleName = function () {
return this.styleName; return this.styleName;
}; };
...@@ -461,6 +465,7 @@ ...@@ -461,6 +465,7 @@
prot["asc_getComments"] = prot.asc_getComments; prot["asc_getComments"] = prot.asc_getComments;
prot["asc_getLocked"] = prot.asc_getLocked; prot["asc_getLocked"] = prot.asc_getLocked;
prot["asc_getLockedTable"] = prot.asc_getLockedTable; prot["asc_getLockedTable"] = prot.asc_getLockedTable;
prot["asc_getLockedSparkline"] = prot.asc_getLockedSparkline;
prot["asc_getStyleName"] = prot.asc_getStyleName; prot["asc_getStyleName"] = prot.asc_getStyleName;
prot["asc_getNumFormatType"] = prot.asc_getNumFormatType; prot["asc_getNumFormatType"] = prot.asc_getNumFormatType;
prot["asc_getAngle"] = prot.asc_getAngle; prot["asc_getAngle"] = prot.asc_getAngle;
......
...@@ -7015,10 +7015,11 @@ ...@@ -7015,10 +7015,11 @@
cell_info.flags.merge = null !== range.hasMerged(); cell_info.flags.merge = null !== range.hasMerged();
var sheetId = this.model.getId(); var sheetId = this.model.getId();
var lockInfo;
// Пересчет для входящих ячеек в добавленные строки/столбцы // Пересчет для входящих ячеек в добавленные строки/столбцы
var isIntersection = this._recalcRangeByInsertRowsAndColumns(sheetId, ar); var isIntersection = this._recalcRangeByInsertRowsAndColumns(sheetId, ar);
if (false === isIntersection) { if (false === isIntersection) {
var lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Range, /*subType*/null, sheetId, lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Range, /*subType*/null, sheetId,
new AscCommonExcel.asc_CCollaborativeRange(ar.c1, ar.r1, ar.c2, ar.r2)); new AscCommonExcel.asc_CCollaborativeRange(ar.c1, ar.r1, ar.c2, ar.r2));
if (false !== this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther, if (false !== this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther,
...@@ -7028,15 +7029,15 @@ ...@@ -7028,15 +7029,15 @@
} }
} }
if(null !== curTablePart){ if (null !== curTablePart) {
var tableAr = curTablePart.Ref.clone(); var tableAr = curTablePart.Ref.clone();
var isTableIntersection = this._recalcRangeByInsertRowsAndColumns(sheetId, tableAr); isIntersection = this._recalcRangeByInsertRowsAndColumns(sheetId, tableAr);
if (false === isTableIntersection) { if (false === isIntersection) {
var tableLockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Range, /*subType*/null, sheetId, lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Range, /*subType*/null, sheetId,
new AscCommonExcel.asc_CCollaborativeRange(tableAr.c1, tableAr.r1, tableAr.c2, tableAr.r2)); new AscCommonExcel.asc_CCollaborativeRange(tableAr.c1, tableAr.r1, tableAr.c2, tableAr.r2));
if (false !== this.collaborativeEditing.getLockIntersection(tableLockInfo, c_oAscLockTypes.kLockTypeOther, if (false !== this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther,
/*bCheckOnlyLockAll*/false)){ /*bCheckOnlyLockAll*/false)) {
// Уже таблицу кто-то редактирует // Уже таблицу кто-то редактирует
cell_info.isLockedTable = true; cell_info.isLockedTable = true;
} }
...@@ -7044,6 +7045,14 @@ ...@@ -7044,6 +7045,14 @@
} }
cell_info.sparklineInfo = this.model.getSparklineGroup(c1, r1); cell_info.sparklineInfo = this.model.getSparklineGroup(c1, r1);
if (sparklineInfo) {
lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Object, /*subType*/null, sheetId,
sparklineInfo.Get_Id());
if (false !== this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther,
/*bCheckOnlyLockAll*/false)) {
cell_info.isLockedSparkline = true;
}
}
return cell_info; return cell_info;
}; };
......
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