Compare commits

..

5 Commits

Author SHA1 Message Date
a7a38e5910 Merge branch hotfix/v7.2.1 into develop 2022-11-11 11:10:30 +00:00
c3a09d65fc Merge pull request #24 from ONLYOFFICE/release/v7.3.0
Release/v7.3.0
2022-11-03 17:42:44 +03:00
7b1dfa675d Merge branch 'hotfix/v7.2.1' of https://github.com/ONLYOFFICE/sdkjs-forms into hotfix/v7.2.1 2022-10-18 18:17:24 +03:00
3ee8a16410 Fix bug #59422
Fix the problem with creating ComboBox form using the Builder
2022-10-18 18:17:06 +03:00
a526f92f65 Fix bug #59422
Fix the problem with creating ComboBox form using the Builder
2022-10-18 18:03:52 +03:00
2 changed files with 2 additions and 21 deletions

View File

@ -333,26 +333,6 @@
CheckFormKey(oCC);
return new AscBuilder.ApiPictureForm(oCC);
};
/**
* Creates a complex form with the specified base form properties.
* @memberof Api
* @param {FormPrBase} oFormPr - base form property.
* @returns {ApiComplexForm}
*/
Api.prototype.CreateComplexForm = function(oFormPr)
{
if (!oFormPr)
oFormPr = {};
let oCC = CreateCommonForm(oFormPr);
let oComplexPr = new AscWord.CSdtComplexFormPr();
oCC.SetComplexFormPr(oComplexPr);
CheckFormKey(oCC);
return new AscBuilder.ApiComplexForm(oCC);
};
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Private area
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -408,5 +388,5 @@
Api.prototype["CreatePictureForm"] = Api.prototype.CreatePictureForm;
Api.prototype["CreateCheckBoxForm"] = Api.prototype.CreateCheckBoxForm;
Api.prototype["CreateComboBoxForm"] = Api.prototype.CreateComboBoxForm;
Api.prototype["CreateComplexForm"] = Api.prototype.CreateComplexForm;
}(window, null));

View File

@ -44,6 +44,7 @@
AscDFH.changesFactory[AscDFH.historyitem_FormFieldMaster_User] = CChangesContent;
AscDFH.changesFactory[AscDFH.historyitem_FormFieldMaster_Field] = CChangesObject;
AscDFH.changesFactory[AscDFH.historyitem_FormFieldMaster_SignRequest] = CChangesObject;
AscDFH.changesFactory[AscDFH.historyitem_FormField_FieldData] = CChangesString;
AscDFH.changesFactory[AscDFH.historyitem_FormField_Content] = CChangesObject;
AscDFH.changesFactory[AscDFH.historyitem_FormField_EncryptedData] = CChangesContent;
AscDFH.changesFactory[AscDFH.historyitem_FormField_FieldMaster] = CChangesObject;