pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

[se] Added fix for getting and parse external defnames when reading the file (#486)

Browse Source 
[se] Added fix for getting and parse external defnames

Co-authored-by: GoshaZotov <Igor.Zotov@onlyoffice.com>
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/sdkjs/pulls/486
Co-authored-by: Dmitriy Orlov <dmitriy.orlov@onlyoffice.com>
Co-committed-by: Dmitriy Orlov <dmitriy.orlov@onlyoffice.com>
This commit is contained in:
Dmitriy Orlov
2025-01-15 09:46:27 +00:00
committed by Igor Zotov
parent a0e40519c5
commit 8ab3c3fbf3
1 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cell/model/WorkbookElems.js
View File

@ -15018,8 +15018,8 @@ function RangeDataManagerElem(bbox, data)
this.DefinedNames[i].parent = this;
}
}
this.initWorksheetsFromSheetDataSet();
this.initWorkbook();
this.initWorksheetsFromSheetDataSet();
return res;
};
@ -15363,6 +15363,9 @@ function RangeDataManagerElem(bbox, data)
if (!sheetDataSet || !sheetDataSet.Row) {
return;
}
let api = Asc.editor || editor;
let originalWb = api.wbModel;
let isLockRecalc = false;
for (var i = 0; i < sheetDataSet.Row.length; i++) {
if (!sheetDataSet.Row[i] || !sheetDataSet.Row[i].Cell) {
continue;
@ -15376,12 +15379,19 @@ function RangeDataManagerElem(bbox, data)
// this.CellValue = null;
AscFormat.ExecuteNoHistory(function(){
AscCommonExcel.executeInR1C1Mode(false, function () {
if (!isLockRecalc) {
originalWb && originalWb.dependencyFormulas.lockRecal();
isLockRecalc = true;
}
var range = ws.getRange2(sheetDataSet.Row[i].Cell[j].Ref);
range.setValue(sheetDataSet.Row[i].Cell[j].CellValue);
});
});
}
}
if (isLockRecalc) {
originalWb && originalWb.dependencyFormulas.unlockRecal();
}
}
};
@ -15391,11 +15401,36 @@ function RangeDataManagerElem(bbox, data)
for (let i = 0; i < this.DefinedNames.length; i++) {
let defName = this.DefinedNames[i];
let ws = this.getSheetByIndex(defName.SheetId);
if (!ws && defName.RefersTo) {
// try to find sheetname by RefersTo string
let exclamationMarkIndex = defName.RefersTo.lastIndexOf("!");
if (exclamationMarkIndex !== -1) {
let sheetNamePart = defName.RefersTo.slice(0, exclamationMarkIndex);
// remove equal sign
if (sheetNamePart[0] === "=") {
sheetNamePart = sheetNamePart.substring(1);
}
// regex to find string enclosed in single qoutes
let regex = /^'(.*)'$/;
let match = regex.exec(sheetNamePart);
if (match && match[1]) {
sheetNamePart = match[1];
}
ws = this.worksheets[sheetNamePart];
}
}
if (ws != null) {
//on parse name3d use g_DefNameWorksheet
let RealDefNameWorksheet = AscCommonExcel.g_DefNameWorksheet;
AscCommonExcel.g_DefNameWorksheet = ws;
let oDefName = new Asc.asc_CDefName(defName.Name, defName.RefersTo);
let stringToParse;
if (defName && defName.RefersTo && defName.RefersTo[0] === "=") {
stringToParse = defName.RefersTo.substring(1);
}
let oDefName = new Asc.asc_CDefName(defName.Name, stringToParse ? stringToParse : defName.RefersTo);
wb.editDefinesNames(null, oDefName);
AscCommonExcel.g_DefNameWorksheet = RealDefNameWorksheet;
}