Merge remote-tracking branch 'remotes/origin/develop' into fix/number…

…ing_zero
ONLYOFFICE · Nov 2, 2023 · 6396f9a · 6396f9a
2 parents d185554 + 72e2460
commit 6396f9a
Show file tree

Hide file tree

Showing 115 changed files with 31,603 additions and 14,827 deletions.
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
diff --git a/build/npm-shrinkwrap.json b/build/npm-shrinkwrap.json
diff --git a/build/package.json b/build/package.json
@@ -4,6 +4,7 @@
   "homepage": "https://www.onlyoffice.com",
   "private": true,
   "dependencies": {
+    "glob": "^8.1.0",
     "google-closure-compiler": "^20230228.0.0",
     "grunt": "^1.6.1",
     "grunt-contrib-clean": "^2.0.0",

diff --git a/cell/api.js b/cell/api.js
@@ -4021,9 +4021,13 @@ var editor;
 	}
 
 	if (window["NATIVE_EDITOR_ENJINE"]) {
-		var ws = this.wb.getWorksheet();
-		var activeCell = this.wbModel.getActiveWs().selectionRange.activeCell;
-		result = [ws.getCellLeftRelative(activeCell.col, 0), ws.getCellTopRelative(activeCell.row, 0)];
+        if (SearchEngine.Count > 0) {
+            var ws = this.wb.getWorksheet();
+            var activeCell = this.wbModel.getActiveWs().selectionRange.activeCell;
+            result = [ws.getCellLeftRelative(activeCell.col, 0), ws.getCellTopRelative(activeCell.row, 0)];
+        } else {
+            result = null;
+        }
 	} else {
 		result = SearchEngine.Count;
 	}
@@ -8616,9 +8620,20 @@ var editor;
 	};
 
 	spreadsheet_api.prototype.asc_openExternalReference = function(externalReference) {
+		let t = this;
 		let isLocalDesktop = window["AscDesktopEditor"] && window["AscDesktopEditor"]["IsLocalFile"]();
 		if (isLocalDesktop) {
-			alert("NEED SUPPORT LOCAL OPEN FILE");
+			window["AscDesktopEditor"]["openExternalReference"](externalReference.externalReference.Id, function(error) {
+				let internalError = Asc.c_oAscError.ID.No;
+				switch (error) {
+					case 0: internalError = Asc.c_oAscError.ID.ConvertationOpenError; break;
+					default: break;
+				}
+
+				if (Asc.c_oAscError.ID.No !== internalError) {
+					t.sendEvent("asc_onError", internalError, c_oAscError.Level.NoCritical);
+				}
+			});
 			return null;
 		} else {
 			return externalReference;