Merge branch release/v7.3.0 into develop

.github/workflows/check.yml

@@ -24,6 +24,7 @@ jobs:
           npm install -g grunt-cli node-qunit-puppeteer
           npm install --prefix build
           grunt --gruntfile build/Gruntfile.js develop
+          node-qunit-puppeteer tests/common/api/api.html
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/FormulaTests.html
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/PivotTests.html
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/CopyPasteTests.html

cell/api.js

@@ -432,16 +432,23 @@ var editor;
 		return true;
     };
 
-  spreadsheet_api.prototype._printDesktop = function (options) {
-    window.AscDesktopEditor_PrintOptions = options;
+	spreadsheet_api.prototype._printDesktop = function (options) {
+		let advOpt = options && options.advancedOptions;
+		if (advOpt && advOpt.asc_getNativeOptions() && advOpt.asc_getNativeOptions()["quickPrint"]) {
+			advOpt.ignorePrintArea = true;
+			advOpt.printType = Asc.c_oAscPrintType.EntireWorkbook;
+		}
 
-    let desktopOptions = {};
-    if (options && options.advancedOptions)
-      desktopOptions["nativeOptions"] = options.advancedOptions.asc_getNativeOptions();
+		window.AscDesktopEditor_PrintOptions = options;
 
-    window["AscDesktopEditor"]["Print"](JSON.stringify(desktopOptions));
-    return true;
-  };
+		let desktopOptions = {};
+		if (advOpt) {
+			desktopOptions["nativeOptions"] = advOpt.asc_getNativeOptions();
+		}
+
+		window["AscDesktopEditor"]["Print"](JSON.stringify(desktopOptions));
+		return true;
+	};
 
   spreadsheet_api.prototype.asc_ChangePrintArea = function(type) {
 	var ws = this.wb.getWorksheet();
@@ -574,9 +581,9 @@ var editor;
 		}
 	};
 
-	spreadsheet_api.prototype._getFileFromUrl = function (url, fileType, callback) {
+	spreadsheet_api.prototype._getFileFromUrl = function (url, fileType, token, outputFormat, callback) {
 		if (this.canEdit()) {
-			var document = {url: url, format: "XLSX"};
+			var document = {url: url, format: fileType, token: token};
 			this.insertDocumentUrlsData = {
 				imageMap: null, documents: [document], convertCallback: function (_api, url) {
 					_api.insertDocumentUrlsData.imageMap = url;
@@ -593,7 +600,7 @@ var editor;
 				}
 			};
 
-			var _options = new Asc.asc_CDownloadOptions(fileType);
+			var _options = new Asc.asc_CDownloadOptions(outputFormat);
 			_options.isNaturalDownload = true;
 			_options.isGetTextFromUrl = true;
 			this.downloadAs(Asc.c_oAscAsyncAction.DownloadAs, _options);
@@ -653,90 +660,107 @@ var editor;
 	spreadsheet_api.prototype.asc_ImportXmlStart = function (callback) {
 		let t = this;
 
-		if (window["AscDesktopEditor"]) {
+		if (window["AscDesktopEditor"] && window["AscDesktopEditor"]["IsLocalFile"]()) {
 			// TODO: add translations
 			window["AscDesktopEditor"]["OpenFilenameDialog"]("(*xml)", false, function (_file) {
 				let file = _file;
-				if (Array.isArray(file))
+				if (Array.isArray(file)) {
 					file = file[0];
-				if (!file)
+				}
+				if (!file) {
+					callback(null);
 					return;
+				}
 
-				window["AscDesktopEditor"]["loadLocalFile"](file, function(uint8Array) {
-					if (!uint8Array)
-						return;
-
-					t._convertFromXml({data: uint8Array, format: "xml"}, callback);
+				window["AscDesktopEditor"]["convertFile"](file, 0x2002, function (convertedFile) {
+					let stream = null;
+					if (convertedFile) {
+						stream = convertedFile["get"](/*Editor.bin*/);
+						convertedFile["close"]();
+					}
+					callback(stream ? new Uint8Array(stream) : null);
 				});
 			});
-			return;
-		}
-
-		AscCommon.ShowXmlFileDialog(function (error, files) {
-			if (Asc.c_oAscError.ID.No !== error) {
-				t.sendEvent("asc_onError", error, Asc.c_oAscError.Level.NoCritical);
-				return;
-			}
+		} else if (!window["NATIVE_EDITOR_ENJINE"]) {
+			AscCommon.ShowXmlFileDialog(function (error, files) {
+				if (Asc.c_oAscError.ID.No !== error) {
+					t.sendEvent("asc_onError", error, Asc.c_oAscError.Level.NoCritical);
+					callback(null);
+					return;
+				}
 
-			let format = AscCommon.GetFileExtension(files[0].name);
-			let reader = new FileReader();
-			reader.onload = function () {
-				t._convertFromXml({data: new Uint8Array(reader.result), format: format}, callback);
-			};
-			reader.onerror = function () {
-				t.sendEvent("asc_onError", Asc.c_oAscError.ID.Unknown, Asc.c_oAscError.Level.NoCritical);
-			};
+				let format = AscCommon.GetFileExtension(files[0].name);
+				let reader = new FileReader();
+				reader.onload = function () {
+					t._convertFromXml({data: new Uint8Array(reader.result), format: format}, callback);
+				};
+				reader.onerror = function () {
+					t.sendEvent("asc_onError", Asc.c_oAscError.ID.Unknown, Asc.c_oAscError.Level.NoCritical);
+					callback(null);
+				};
 
-			reader.readAsArrayBuffer(files[0]);
-		});
+				reader.readAsArrayBuffer(files[0]);
+			});
+		} else {
+			callback(null);
+		}
 	};
 
 	spreadsheet_api.prototype.asc_ImportXmlEnd = function (stream, dataRef, newSheetName) {
 		let t = this;
 
 
 		let doInsertXml = function (_dataRef, _ws) {
-			let jsZlib = new AscCommon.ZLib();
-			if (!jsZlib.open(stream)) {
-				//t.model.handlers.trigger("asc_onErrorUpdateExternalReference", eR.Id);
-				return false;
+			let binaryData = stream;
+			if (!window["AscDesktopEditor"]) {
+				//xlst
+				binaryData = null;
+				let jsZlib = new AscCommon.ZLib();
+				if (!stream || !jsZlib.open(stream)) {
+					//t.model.handlers.trigger("asc_onErrorUpdateExternalReference", eR.Id);
+					return false;
+				}
+
+				if (jsZlib.files && jsZlib.files.length) {
+					binaryData = jsZlib.getFile(jsZlib.files[0]);
+				}
 			}
 
-			if (jsZlib.files && jsZlib.files.length) {
-				let binaryData = jsZlib.getFile(jsZlib.files[0]);
+			if (!binaryData) {
+				return;
+			}
 
-				//заполняем через банарник
-				let oBinaryFileReader = new AscCommonExcel.BinaryFileReader(true);
-				//чтобы лишнего не читать, проставляю флаг копипаст
-				oBinaryFileReader.InitOpenManager.copyPasteObj = {
-					isCopyPaste: true, activeRange: null, selectAllSheet: true
-				};
+			//заполняем через банарник
+			let oBinaryFileReader = new AscCommonExcel.BinaryFileReader(true);
+			//чтобы лишнего не читать, проставляю флаг копипаст
+			oBinaryFileReader.InitOpenManager.copyPasteObj = {
+				isCopyPaste: true, activeRange: null, selectAllSheet: true
+			};
 
-				let wb = new AscCommonExcel.Workbook();
-				wb.DrawingDocument = Asc.editor.wbModel.DrawingDocument;
+			let wb = new AscCommonExcel.Workbook();
+			wb.DrawingDocument = Asc.editor.wbModel.DrawingDocument;
 
-				AscFormat.ExecuteNoHistory(function () {
-					AscCommonExcel.executeInR1C1Mode(false, function () {
-						oBinaryFileReader.Read(binaryData, wb);
-					});
+			AscFormat.ExecuteNoHistory(function () {
+				AscCommonExcel.executeInR1C1Mode(false, function () {
+					oBinaryFileReader.Read(binaryData, wb);
 				});
+			});
 
-				if (wb.aWorksheets) {
-					let arrSheets = wb.aWorksheets;
-					let pastedSheet = arrSheets && arrSheets[0];
-					if (pastedSheet) {
-						if (_ws) {
-							t.wbModel.setActive(_ws.index);
-							t.wb.updateWorksheetByModel();
-							t.wb.showWorksheet();
-						}
-						let ws = t.wb.getWorksheet();
-						if (_dataRef) {
-							ws.setSelection(_dataRef);
-						}
-						AscCommonExcel.g_clipboardExcel.pasteProcessor.activeRange = new Asc.Range(0, 0, Math.max(pastedSheet.nColsCount - 1, 0), Math.max(pastedSheet.nRowsCount - 1, 0)).getName();
-						t.wb.getWorksheet().setSelectionInfo('paste', {data: pastedSheet, fromBinary: true, fontsNew: [], pasteAllSheet: true, wb: wb});
+			if (wb.aWorksheets) {
+				let arrSheets = wb.aWorksheets;
+				let pastedSheet = arrSheets && arrSheets[0];
+				if (pastedSheet) {
+					if (_ws) {
+						t.wbModel.setActive(_ws.index);
+						t.wb.updateWorksheetByModel();
+						t.wb.showWorksheet();
+					}
+					let ws = t.wb.getWorksheet();
+					if (_dataRef) {
+						ws.setSelection(_dataRef);
 					}
+					AscCommonExcel.g_clipboardExcel.pasteProcessor.activeRange = new Asc.Range(0, 0, Math.max(pastedSheet.nColsCount - 1, 0), Math.max(pastedSheet.nRowsCount - 1, 0)).getName();
+					t.wb.getWorksheet().setSelectionInfo('paste', {data: pastedSheet, fromBinary: true, fontsNew: [], pasteAllSheet: true, wb: wb});
 				}
 			}
 		};
@@ -956,11 +980,15 @@ var editor;
   };
 
   spreadsheet_api.prototype.asc_Undo = function() {
+    if (!this.canUndoRedoByRestrictions())
+      return;
     this.wb.undo();
     this.wb.restoreFocus();
   };
 
   spreadsheet_api.prototype.asc_Redo = function() {
+    if (!this.canUndoRedoByRestrictions())
+      return;
     this.wb.redo();
     this.wb.restoreFocus();
   };
@@ -3196,8 +3224,8 @@ var editor;
 			}
 			this.asc_Resize();
 		}
-
-		if (this.asc_getExternalReferences()) {
+		
+		if (this.canEdit() && this.asc_getExternalReferences()) {
 			this.handlers.trigger("asc_onNeedUpdateExternalReferenceOnOpen");
 		}
 		//this.asc_Resize(); // Убрал, т.к. сверху приходит resize (http://bugzilla.onlyoffice.com/show_bug.cgi?id=14680)
@@ -4415,24 +4443,24 @@ var editor;
     const arrBinaryData = oBinaryFileWriter.Write().split(';');
     const sCleanBinaryData = arrBinaryData[arrBinaryData.length - 1];
     const oBinaryInfo = {};
-    const arrWorksheets = this.wb.wsViews;
     const arrRasterImageIds = [];
-    for (let i = 0; i < arrWorksheets.length; i += 1) {
-        const oWorksheet = arrWorksheets[i];
-        const arrDrawings = oWorksheet.model.Drawings;
-        if (arrDrawings) {
-            for (let i = 0; i < arrDrawings.length; i += 1) {
-                const oDrawing = arrDrawings[i];
-                oDrawing.graphicObject.getAllRasterImages(arrRasterImageIds);
-            }
+    const arrWorksheetLength = this.wbModel.aWorksheets.length;
+    for (let i = 0; i < arrWorksheetLength; i += 1) {
+      const oWorksheet = this.wbModel.aWorksheets[i];
+      const arrDrawings = oWorksheet.Drawings;
+      if (arrDrawings) {
+        for (let j = 0; j < arrDrawings.length; j += 1) {
+          const oDrawing = arrDrawings[j];
+          oDrawing.graphicObject.getAllRasterImages(arrRasterImageIds);
         }
+      }
     }
     const urlsForAddToHistory = [];
     for (let i = 0; i < arrRasterImageIds.length; i += 1) {
-        const url = AscCommon.g_oDocumentUrls.mediaPrefix + arrRasterImageIds[i];
-        if (!(this.imagesFromGeneralEditor && this.imagesFromGeneralEditor[url] && this.imagesFromGeneralEditor[url] === AscCommon.g_oDocumentUrls.getUrls()[url])) {
-            urlsForAddToHistory.push(arrRasterImageIds[i]);
-        }
+      const url = AscCommon.g_oDocumentUrls.mediaPrefix + arrRasterImageIds[i];
+      if (!(this.imagesFromGeneralEditor && this.imagesFromGeneralEditor[url] && this.imagesFromGeneralEditor[url] === AscCommon.g_oDocumentUrls.getUrls()[url])) {
+        urlsForAddToHistory.push(arrRasterImageIds[i]);
+      }
     }
 
 
@@ -4441,9 +4469,9 @@ var editor;
     oBinaryInfo["isFromSheetEditor"] = this.isFromSheetEditor;
     oBinaryInfo["imagesForAddToHistory"] = urlsForAddToHistory;
     if (this.saveImageCoefficients) {
-        oBinaryInfo["widthCoefficient"] = this.saveImageCoefficients.widthCoefficient;
-        oBinaryInfo["heightCoefficient"] = this.saveImageCoefficients.heightCoefficient;
-        delete this.saveImageCoefficients;
+      oBinaryInfo["widthCoefficient"] = this.saveImageCoefficients.widthCoefficient;
+      oBinaryInfo["heightCoefficient"] = this.saveImageCoefficients.heightCoefficient;
+      delete this.saveImageCoefficients;
     }
 
     return oBinaryInfo;
@@ -7721,10 +7749,7 @@ var editor;
   };
 
   spreadsheet_api.prototype.onUpdateRestrictions = function () {
-    var oHistory = AscCommon.History;
-    if (this.isRestrictionSignatures() && oHistory && !oHistory.Have_Changes()) {
-        oHistory.Clear();
-    }
+    this._onUpdateDocumentCanUndoRedo();
   };
   spreadsheet_api.prototype.isShowShapeAdjustments = function()
   {
@@ -8193,34 +8218,36 @@ var editor;
 	{
 		let wb = this.wb;
 		if (!wb)
-			return;
+			return false;
 
-		wb.EnterText(codePoints);
+		return wb.EnterText(codePoints);
 	};
 
 	spreadsheet_api.prototype.asc_correctEnterText = function(oldValue, newValue)
 	{
 		let wb = this.wb;
 		if (!wb)
-			return;
+			return false;
 
-		wb.CorrectEnterText(oldValue, newValue);
+		return wb.CorrectEnterText(oldValue, newValue);
 	};
 
 	spreadsheet_api.prototype.asc_getExternalReferences = function() {
 		return this.wb.getExternalReferences();
 	};
 
 	spreadsheet_api.prototype.asc_updateExternalReferences = function(arr) {
-		if (this.canEdit()) {
-			this.wb.updateExternalReferences(arr);
+		if (this.collaborativeEditing.getGlobalLock() || !this.canEdit()) {
+			return;
 		}
+		this.wb.updateExternalReferences(arr);
 	};
 
 	spreadsheet_api.prototype.asc_removeExternalReferences = function(arr) {
-		if (this.canEdit()) {
-			this.wb.removeExternalReferences(arr);
+		if (this.collaborativeEditing.getGlobalLock() || !this.canEdit()) {
+			return;
 		}
+		this.wb.removeExternalReferences(arr);
 	};
 
 	spreadsheet_api.prototype.asc_fillHandleDone = function(range) {
@@ -8692,6 +8719,7 @@ var editor;
   prot["asc_getAddPivotTableOptions"] = prot.asc_getAddPivotTableOptions;
   prot["asc_insertPivotNewWorksheet"] = prot.asc_insertPivotNewWorksheet;
   prot["asc_insertPivotExistingWorksheet"] = prot.asc_insertPivotExistingWorksheet;
+  prot["asc_refreshAllPivots"] = prot.asc_refreshAllPivots;
 	// signatures
   prot["asc_addSignatureLine"] 		     = prot.asc_addSignatureLine;
   prot["asc_CallSignatureDblClickEvent"] = prot.asc_CallSignatureDblClickEvent;

cell/apiBuilder.js

@@ -216,10 +216,10 @@
 
 	/**
      * Possible values for the position of chart tick labels (either horizontal or vertical).
-     * * **"none"** - does not display the selected tick labels.
-     * * **"nextTo"** - sets the position of the selected tick labels next to the main label.
-     * * **"low"** - sets the position of the selected tick labels in the part of the chart with lower values.
-     * * **"high"** - sets the position of the selected tick labels in the part of the chart with higher values.
+     * * <b>"none"</b> - does not display the selected tick labels.
+     * * <b>"nextTo"</b> - sets the position of the selected tick labels next to the main label.
+     * * <b>"low"</b> - sets the position of the selected tick labels in the part of the chart with lower values.
+     * * <b>"high"</b> - sets the position of the selected tick labels in the part of the chart with higher values.
 	 * @typedef {("none" | "nextTo" | "low" | "high")} TickLabelPosition
 	 * **/
 
@@ -1429,7 +1429,7 @@
 	 * @typeofeditors ["CSE"]
 	 * @param {string} sRange - The range where the hyperlink will be added to.
 	 * @param {string} sAddress - The link address.
-	 * @param {string} subAddress - The subaddress of the hyperlink.
+	 * @param {string} subAddress - The link subaddress to insert internal sheet hyperlinks.
 	 * @param {string} sScreenTip - The screen tip text.
 	 * @param {string} sTextToDisplay - The link text that will be displayed on the sheet.
 	 * */