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

Fix bug #71734

Browse Source 
Fix the problem with saving/loading recalculate object for the field char
This commit is contained in:
Ilya Kirillov
2024-11-26 01:47:20 +03:00
parent 57f1cb2de7
commit 3e0d62add3
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
word/Editor/Paragraph/ComplexField.js
View File

@ -381,10 +381,12 @@ ParaFieldChar.prototype.IsNeedSaveRecalculateObject = function()
};
ParaFieldChar.prototype.SaveRecalculateObject = function(isCopy)
{
return new AscWord.PageNumRecalculateObject(this.Type, this.graphemes, this.widths, this.Width, isCopy);
return new FieldCharRecalculateObject(this.Type, this.numText, this.checkBox, this.graphemes, this.widths, this.Width, isCopy);
};
ParaFieldChar.prototype.LoadRecalculateObject = function(recalcObj)
{
this.numText = recalcObj.numText;
this.checkBox = recalcObj.checkBox;
this.graphemes = recalcObj.graphemes;
this.widths = recalcObj.widths;
this.Width = recalcObj.width;
@ -394,6 +396,8 @@ ParaFieldChar.prototype.PrepareRecalculateObject = function()
{
this.graphemes = [];
this.widths = [];
this.checkBox = null;
this.numText = null;
};
ParaFieldChar.prototype.IsValid = function()
{
@ -425,6 +429,19 @@ ParaFieldChar.prototype.FindNextFillingForm = function(isNext, isCurrent, isStar
return (this.IsEnd() && (!isCurrent || isNext) ? this.ComplexField : null);
};
/**
* @constructor
*/
function FieldCharRecalculateObject(type, numText, checkBox, graphemes, widths, totalWidth, isCopy)
{
this.type = type;
this.numText = numText;
this.checkBox = checkBox;
this.graphemes = graphemes && isCopy ? graphemes.slice() : graphemes;
this.widths = widths && isCopy ? widths.slice() : widths;
this.width = totalWidth;
}
/**
* Класс представляющий символ инструкции сложного поля
* @param {Number} nCharCode

10
word/Editor/Paragraph/RunContent/PageNum.js
View File

@ -175,15 +175,9 @@
function PageNumRecalculateObject(type, graphemes, widths, totalWidth, isCopy)
{
this.type = type;
this.graphemes = graphemes;
this.widths = widths;
this.graphemes = graphemes && isCopy ? graphemes.slice() : graphemes;
this.widths = widths && isCopy ? widths.slice() : widths;
this.width = totalWidth;
if (isCopy)
{
this.graphemes = graphemes.slice();
this.widths = widths.slice();
}
}
//--------------------------------------------------------export----------------------------------------------------