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

Merge remote-tracking branch 'remotes/origin/hotfix/v7.3.3' into develop

Browse Source 
# Conflicts:
#	common/Drawings/Format/GraphicObjectBase.js
#	common/Drawings/Format/Shape.js
#	common/Local/common.js
#	common/editorscommon.js
#	tests/runAll.js
This commit is contained in:
Sergey Luzyanin
2023-03-10 20:19:33 +05:30
parent 24f2f43dbd 3944cf0eb1
commit 5c1069413b
57 changed files with 986 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
word/api_plugins.js
View File

@ -1064,7 +1064,7 @@
{
let fieldData = AscWord.CAddinFieldData.FromField(field);
if (fieldData)
result.push(fieldData);
result.push(fieldData.ToJson());
});
return result;
@ -1088,7 +1088,7 @@
let arrAddinData = [];
arrData.forEach(function(data)
{
arrAddinData.push(AscWord.CAddinFieldData.FromObject(data));
arrAddinData.push(AscWord.CAddinFieldData.FromJson(data));
})
logicDocument.UpdateAddinFieldsByData(arrAddinData);
@ -1109,7 +1109,7 @@
if (!logicDocument)
return;
logicDocument.AddAddinField(AscWord.CAddinFieldData.FromObject(data));
logicDocument.AddAddinField(AscWord.CAddinFieldData.FromJson(data));
};
/**
* Remove field wrapper, leave only the content of the field