add lock sparklines

add undo/redo sparklines

cell/api.js

@@ -1615,6 +1615,29 @@ var editor;
     this.collaborativeEditing.addCheckLock(lockInfo);
     this.collaborativeEditing.onEndCheckLock(callback);
   };
+  spreadsheet_api.prototype._isLockedSparkline = function (id, callback) {
+    var lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Object, /*subType*/null,
+        this.asc_getActiveWorksheetId(), id);
+    if (false === this.collaborativeEditing.getCollaborativeEditing()) {
+      // Пользователь редактирует один: не ждем ответа, а сразу продолжаем редактирование
+      AscCommonExcel.applyFunction(callback, true);
+      callback = undefined;
+    }
+    if (false !== this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeMine, false)) {
+      // Редактируем сами
+      AscCommonExcel.applyFunction(callback, true);
+      return;
+    } else if (false !==
+        this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther, false)) {
+      // Уже ячейку кто-то редактирует
+      AscCommonExcel.applyFunction(callback, false);
+      return;
+    }
+
+    this.collaborativeEditing.onStartCheckLock();
+    this.collaborativeEditing.addCheckLock(lockInfo);
+    this.collaborativeEditing.onEndCheckLock(callback);
+  };
 
   spreadsheet_api.prototype._addWorksheet = function (name, i) {
     var t = this;
@@ -2608,12 +2631,18 @@ var editor;
   };
 
   spreadsheet_api.prototype.asc_setSparklineGroup = function (id, oSparklineGroup) {
-    var changedSparkline = AscCommon.g_oTableId.Get_ById(id);
-    if (changedSparkline) {
-      changedSparkline.set(oSparklineGroup);
-      this.wb._onWSSelectionChanged();
-      this.wb.getWorksheet().draw();
-    }
+    var t = this;
+    var changeSparkline = function(res) {
+      if (res) {
+        var changedSparkline = AscCommon.g_oTableId.Get_ById(id);
+        if (changedSparkline) {
+          changedSparkline.set(oSparklineGroup);
+          t.wb._onWSSelectionChanged();
+          t.wb.getWorksheet().draw();
+        }
+      }
+    };
+    this._isLockedSparkline(id, changeSparkline);
   };
 
   // Cell interface

cell/model/History.js

@@ -144,6 +144,31 @@ function (window, undefined) {
 	window['AscCH'].historyitem_AutoFilter_ChangeTableName = 14;
 	window['AscCH'].historyitem_AutoFilter_ClearFilterColumn = 15;
 
+	window['AscCH'].historyitem_Sparkline_LineWeight = 1;
+	window['AscCH'].historyitem_Sparkline_Type = 2;
+	window['AscCH'].historyitem_Sparkline_DateAxis = 3;
+	window['AscCH'].historyitem_Sparkline_DisplayEmptyCellsAs = 4;
+	window['AscCH'].historyitem_Sparkline_Markers = 5;
+	window['AscCH'].historyitem_Sparkline_High = 6;
+	window['AscCH'].historyitem_Sparkline_Low = 7;
+	window['AscCH'].historyitem_Sparkline_First = 8;
+	window['AscCH'].historyitem_Sparkline_Last = 9;
+	window['AscCH'].historyitem_Sparkline_Negative = 10;
+	window['AscCH'].historyitem_Sparkline_DisplayXAxis = 11;
+	window['AscCH'].historyitem_Sparkline_DisplayHidden = 12;
+	window['AscCH'].historyitem_Sparkline_MinAxisType = 13;
+	window['AscCH'].historyitem_Sparkline_MaxAxisType = 14;
+	window['AscCH'].historyitem_Sparkline_RightToLeft = 15;
+	window['AscCH'].historyitem_Sparkline_ManualMax = 16;
+	window['AscCH'].historyitem_Sparkline_ManualMin = 17;
+	window['AscCH'].historyitem_Sparkline_ColorSeries = 18;
+	window['AscCH'].historyitem_Sparkline_ColorNegative = 19;
+	window['AscCH'].historyitem_Sparkline_ColorAxis = 20;
+	window['AscCH'].historyitem_Sparkline_ColorMarkers = 21;
+	window['AscCH'].historyitem_Sparkline_ColorFirst = 22;
+	window['AscCH'].historyitem_Sparkline_colorLast = 23;
+	window['AscCH'].historyitem_Sparkline_ColorHigh = 24;
+	window['AscCH'].historyitem_Sparkline_ColorLow = 25;
 
 function CHistory()
 {