pengjunjie/sdkjs-forms
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs-forms.git synced 2026-03-31 10:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch release/v9.2.0 into master

Browse Source
This commit is contained in:
papacarlo
2025-12-01 07:30:49 +00:00
parent 8b80309475 f2901a3dc7
commit 29c2f86cb8
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
api.js
View File

@ -80,7 +80,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
AscFonts.FontPickerByCharacter.getFontBySymbol(nUncheckedSymbol); AscFonts.FontPickerByCharacter.getFontBySymbol(nUncheckedSymbol);
} }
function private_ApplyPrToCheckBox(oCC) function private_ApplyPrToCheckBox(oCC, checkBoxPr)
{ {
if (!oCC) if (!oCC)
return; return;
@ -94,7 +94,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
else else
private_CheckFormKey(oCC, oLogicDocument); private_CheckFormKey(oCC, oLogicDocument);
} }
if (oCommonPr) if (oCommonPr)
oCC.SetContentControlPr(oCommonPr); oCC.SetContentControlPr(oCommonPr);
} }
@ -122,13 +122,13 @@ window["AscOForm"] = window.AscOForm = AscOForm;
CheckType : AscCommon.changestype_Paragraph_Content CheckType : AscCommon.changestype_Paragraph_Content
})) }))
{ {
oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox); oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox, undefined, undefined, true);
oLogicDocument.RemoveSelection(); oLogicDocument.RemoveSelection();
for (let nIndex = 0, nCount = arrSelectedParagraphs.length; nIndex < nCount; ++nIndex) for (let nIndex = 0, nCount = arrSelectedParagraphs.length; nIndex < nCount; ++nIndex)
{ {
let oCC = arrSelectedParagraphs[nIndex].AddCheckBoxToStartPos(oPr); let oCC = arrSelectedParagraphs[nIndex].AddCheckBoxToStartPos(oPr);
private_ApplyPrToCheckBox(oCC); private_ApplyPrToCheckBox(oCC, oPr);
} }
oLogicDocument.LoadDocumentState(oState); oLogicDocument.LoadDocumentState(oState);
@ -146,10 +146,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
oLogicDocument.RemoveTextSelection(); oLogicDocument.RemoveTextSelection();
if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content)) if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
{ {
oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox); oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox, undefined, undefined, true);
var oCC = oLogicDocument.AddContentControlCheckBox(oPr); var oCC = oLogicDocument.AddContentControlCheckBox(oPr);
private_ApplyPrToCheckBox(oCC); private_ApplyPrToCheckBox(oCC, oPr);
oLogicDocument.UpdateInterface(); oLogicDocument.UpdateInterface();
oLogicDocument.Recalculate(); oLogicDocument.Recalculate();
@ -182,7 +182,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
oLogicDocument.RemoveTextSelection(); oLogicDocument.RemoveTextSelection();
if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content)) if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
{ {
oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlPicture); oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlPicture, undefined, undefined, true);
// 150x32pt for Signature // 150x32pt for Signature
let w = isSignature ? 150 / 72 * 25.4 : undefined; let w = isSignature ? 150 / 72 * 25.4 : undefined;
@ -309,7 +309,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
oLogicDocument.RemoveTextSelection(); oLogicDocument.RemoveTextSelection();
if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content)) if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
{ {
oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList); oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList, undefined, undefined, isComboBox);
var oCC; var oCC;
if (isComboBox) if (isComboBox)
@ -344,7 +344,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
oLogicDocument.RemoveTextSelection(); oLogicDocument.RemoveTextSelection();
if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content)) if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
{ {
oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList); oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList, undefined, undefined, true);
let dateTimePr = null; let dateTimePr = null;
let formPr = null; let formPr = null;
@ -464,8 +464,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
return null; return null;
let mainForm = form.GetMainForm(); let mainForm = form.GetMainForm();
if (!mainForm || !mainForm.IsComplexForm() || mainForm.IsLabeledCheckBox())
return null;
return (mainForm.IsComplexForm() ? mainForm : null); return mainForm;
}; };
window['Asc']['asc_docs_api'].prototype['asc_ConvertFormToJson'] = window['Asc']['asc_docs_api'].prototype.asc_ConvertFormToJson = function(form) window['Asc']['asc_docs_api'].prototype['asc_ConvertFormToJson'] = window['Asc']['asc_docs_api'].prototype.asc_ConvertFormToJson = function(form)
{ {
@ -491,7 +493,17 @@ window["AscOForm"] = window.AscOForm = AscOForm;
if (!form || !form.IsForm()) if (!form || !form.IsForm())
return; return;
return this.private_SetFormValue(form.GetId(), value); if (typeof(value) === "string")
{
let _t = this;
AscFonts.FontPickerByCharacter.checkText(value, this, function() {
_t.private_SetFormValue(form.GetId(), value);
});
}
else
{
this.private_SetFormValue(form.GetId(), value);
}
}; };
window['Asc']['asc_docs_api'].prototype['asc_GetFormValue'] = window['Asc']['asc_docs_api'].prototype.asc_GetFormValue = function(formId) window['Asc']['asc_docs_api'].prototype['asc_GetFormValue'] = window['Asc']['asc_docs_api'].prototype.asc_GetFormValue = function(formId)
{ {
@ -725,6 +737,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
{ {
let form = logicDocument.GetContentControl(); let form = logicDocument.GetContentControl();
let mainForm = form ? form.GetMainForm() : null;
if (mainForm && mainForm.IsLabeledCheckBox())
return mainForm.MoveCursorOutsideForm(false);
if (!form || !form.IsForm() || (form.IsComplexForm() && !isComplex)) if (!form || !form.IsForm() || (form.IsComplexForm() && !isComplex))
return; return;