Merge branch release/v9.3.0 into master

Don't allow to insert other forms inside a fixed labeled checkbox

api.js

@@ -80,7 +80,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			AscFonts.FontPickerByCharacter.getFontBySymbol(nUncheckedSymbol);
 		}
 
-		function private_ApplyPrToCheckBox(oCC)
+		function private_ApplyPrToCheckBox(oCC, checkBoxPr)
 		{
 			if (!oCC)
 				return;
@@ -94,7 +94,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				else
 					private_CheckFormKey(oCC, oLogicDocument);
 			}
-
+			
 			if (oCommonPr)
 				oCC.SetContentControlPr(oCommonPr);
 		}
@@ -122,13 +122,13 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 					CheckType : AscCommon.changestype_Paragraph_Content
 				}))
 				{
-					oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox);
+					oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox, undefined, undefined, true);
 					oLogicDocument.RemoveSelection();
 
 					for (let nIndex = 0, nCount = arrSelectedParagraphs.length; nIndex < nCount; ++nIndex)
 					{
 						let oCC = arrSelectedParagraphs[nIndex].AddCheckBoxToStartPos(oPr);
-						private_ApplyPrToCheckBox(oCC);
+						private_ApplyPrToCheckBox(oCC, oPr);
 					}
 
 					oLogicDocument.LoadDocumentState(oState);
@@ -146,10 +146,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				oLogicDocument.RemoveTextSelection();
 				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);
-					private_ApplyPrToCheckBox(oCC);
+					private_ApplyPrToCheckBox(oCC, oPr);
 
 					oLogicDocument.UpdateInterface();
 					oLogicDocument.Recalculate();
@@ -182,7 +182,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		oLogicDocument.RemoveTextSelection();
 		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
 			let w = isSignature ? 150 / 72 * 25.4 : undefined;
@@ -327,6 +327,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			if (oCC && oCommonPr)
 				oCC.SetContentControlPr(oCommonPr);
 
+			oLogicDocument.AddMacroData(AscDFH.historydescription_Document_AddContentControlList, {isComboBox : isComboBox});
 			oLogicDocument.Recalculate();
 			oLogicDocument.UpdateInterface();
 			oLogicDocument.UpdateSelection();
@@ -344,7 +345,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		oLogicDocument.RemoveTextSelection();
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
 		{
-			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList);
+			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlDatePicker, undefined, undefined, true);
 			
 			let dateTimePr = null;
 			let formPr     = null;
@@ -464,8 +465,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			return null;
 
 		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)
 	{
@@ -491,7 +494,17 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		if (!form || !form.IsForm())
 			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)
 	{
@@ -669,6 +682,8 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		let formManager  = logicDocument.GetFormsManager();
 		let keyGenerator = formManager.GetKeyGenerator();
 		
+		form.SetFormRequired(formManager.IsRadioGroupRequired(groupKey));
+		
 		let formPr = form.GetFormPr().Copy();
 		if (!formPr)
 			return;
@@ -723,6 +738,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 	{
 		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))
 			return;
 		

apiBuilder.js

@@ -53,7 +53,7 @@
 	 * @class
 	 * @name Api
 	 */
-	var Api = window["Asc"]["asc_docs_api"] || window["Asc"]["spreadsheet_api"];
+	var Api = AscBuilder.Word.Api;
  
 	/**
 	 * Common form properties.
@@ -189,7 +189,7 @@
 	 * @returns {ApiTextForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateTextForm.js
 	 */
-	Api.prototype.CreateTextForm = function(formPr)
+	Api.CreateTextForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -210,7 +210,7 @@
 	 * @returns {ApiCheckBoxForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateCheckBoxForm.js
 	 */
-	Api.prototype.CreateCheckBoxForm = function(formPr)
+	Api.CreateCheckBoxForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -285,7 +285,7 @@
 	 * @returns {ApiComboBoxForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateComboBoxForm.js
 	 */
-	Api.prototype.CreateComboBoxForm = function(formPr)
+	Api.CreateComboBoxForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -355,7 +355,7 @@
 	 * @returns {ApiPictureForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreatePictureForm.js
 	 */
-	Api.prototype.CreatePictureForm = function(formPr)
+	Api.CreatePictureForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -407,7 +407,7 @@
 	 * @returns {ApiDateForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateDateForm.js
 	 */
-	Api.prototype.CreateDateForm = function(formPr)
+	Api.CreateDateForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -428,7 +428,7 @@
 	 * @returns {ApiComplexForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateComplexForm.js
 	 */
-	Api.prototype.CreateComplexForm = function(formPr)
+	Api.CreateComplexForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -800,12 +800,12 @@
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Export
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	Api.prototype["CreateTextForm"]     = Api.prototype.CreateTextForm;
-	Api.prototype["CreatePictureForm"]  = Api.prototype.CreatePictureForm;
-	Api.prototype["CreateDateForm"]		= Api.prototype.CreateDateForm;
-	Api.prototype["CreateCheckBoxForm"] = Api.prototype.CreateCheckBoxForm;
-	Api.prototype["CreateComboBoxForm"] = Api.prototype.CreateComboBoxForm;
-	Api.prototype["CreateComplexForm"]	= Api.prototype.CreateComplexForm;
+	Api["CreateTextForm"]     = Api.CreateTextForm;
+	Api["CreatePictureForm"]  = Api.CreatePictureForm;
+	Api["CreateDateForm"]     = Api.CreateDateForm;
+	Api["CreateCheckBoxForm"] = Api.CreateCheckBoxForm;
+	Api["CreateComboBoxForm"] = Api.CreateComboBoxForm;
+	Api["CreateComplexForm"]  = Api.CreateComplexForm;
 	
 	ApiDocument.prototype["InsertTextForm"] = ApiDocument.prototype.InsertTextForm;
 	ApiDocument.prototype["GetFormRoles"]   = ApiDocument.prototype.GetFormRoles;

apiPlugins.js

@@ -168,6 +168,29 @@
 
 		return "";
 	};
+	/**
+	 * Checks whether the specified form has been digitally signed.
+	 * @memberof Api
+	 * @typeofeditors ["CDE"]
+	 * @alias IsFormSigned
+	 * @returns {boolean} Returns true if the form is signed, false otherwise.
+	 * @since 9.3.0
+	 * @see office-js-api/Examples/Plugins/Forms/Api/Methods/IsFormSigned.js
+	 */
+	Api.prototype["pluginMethod_IsFormSigned"] = function()
+	{
+		let signatures = this.signatures;
+		if (!signatures || !Array.isArray(signatures))
+			return false;
+		
+		for (let i = 0; i < signatures.length; ++i)
+		{
+			if (signatures[i].isForm)
+				return true;
+		}
+		
+		return false;
+	};
 
 })(window);
 

oform/OForm.js

@@ -175,7 +175,6 @@
 		
 		let fields = fieldGroup.getAllFields();
 		
-		
 		let delegateIndex = this.getRoleIndex(delegateName);
 		
 		// На самом деле можно убрать эту проверку, но тогда мы просто удалим группу по умолчнию и заново её добавим
@@ -188,14 +187,14 @@
 			{
 				if (!this.startAction(AscDFH.historydescription_OForm_RemoveRole))
 					return false;
-				
+
 				defaultUserMaster.initDefaultUser();
-				
+
 				this.NeedRedraw = true;
 				this.endAction();
 				return true;
 			}
-			
+
 			return false;
 		}
 			
@@ -243,6 +242,38 @@
 			
 			delegateFieldGroup.addUser(delegateUserMaster);
 			this.Format.addFieldGroup(delegateFieldGroup);
+			
+			if (!this.getDefaultRole() && delegateUserMaster)
+				this.Format.setDefaultUser(delegateUserMaster);
+		}
+		
+		if (!this.getDefaultRole())
+		{
+			let delegateUserMaster;
+			if (-1 === delegateIndex || delegateIndex === roleIndex)
+			{
+				this.updateRoles();
+				if (this.Roles.length <= 0)
+				{
+					let defaultGroup = new AscOForm.CFieldGroup();
+					defaultGroup.setWeight(this.Format.getMaxWeight() + 1);
+					this.Format.addFieldGroup(defaultGroup);
+					defaultGroup.addUser(this.Format.getDefaultUserMaster());
+					delegateUserMaster = this.Format.getDefaultUserMaster();
+					delegateUserMaster.initDefaultUser();
+				}
+				else
+				{
+					delegateUserMaster = this.Roles[0].getUserMaster();
+				}
+			}
+			else
+			{
+				delegateUserMaster = this.Roles[delegateIndex].getUserMaster();
+			}
+			
+			if (delegateUserMaster)
+				this.Format.setDefaultUser(delegateUserMaster);
 		}
 		
 		this.NeedRedraw = true;
@@ -658,6 +689,14 @@
 		}
 		return true;
 	};
+	OForm.prototype.isFinal = function()
+	{
+		return this.Format.isFinal();
+	};
+	OForm.prototype.setFinal = function(isFinal)
+	{
+		return this.Format.setFinal(isFinal);
+	};
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Private area
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -679,11 +718,18 @@
 		if (!logicDocument)
 			return;
 		
-		this.onEndAction();
-		
 		logicDocument.UpdateInterface();
 		logicDocument.FinalizeAction();
 	};
+	OForm.prototype.sendEvent = function()
+	{
+		let logicDocument = this.getDocument();
+		let api;
+		if (!logicDocument || !(api = logicDocument.GetApi()))
+			return;
+		
+		api.sendEvent.apply(api, arguments);
+	};
 	//--------------------------------------------------------export----------------------------------------------------
 	AscOForm.OForm = OForm;
 	//---------------------------------------------interface export-----------------------------------------------------

oform/format/Document.js

@@ -57,6 +57,7 @@
 		this.Type        = null;
 		this.Application = null;
 		this.DocumentId  = null;
+		this.Final       = false;
 		this.FieldGroups = [];
 
 		// Массивы всех имеющихся пользователей и полей
@@ -153,6 +154,19 @@
 	{
 		return this.DocumentId;
 	};
+	CDocument.prototype.setFinal = function(isFinal)
+	{
+		if (this.Final === isFinal)
+			return;
+		
+		AscCommon.History.Add(new AscDFH.CChangesOFormDocumentFinal(this, this.Final, isFinal));
+		this.Final = isFinal;
+		this.onChangeFinal();
+	};
+	CDocument.prototype.isFinal = function()
+	{
+		return this.Final;
+	};
 	CDocument.prototype.addFieldGroup = function(fieldGroup)
 	{
 		if (-1 !== this.FieldGroups.indexOf(fieldGroup))
@@ -303,6 +317,9 @@
 				case "description":
 					this.setDescription(reader.GetTextDecodeXml());
 					break;
+				case "final":
+					this.setFinal(reader.GetTextBool());
+					break
 				case "type":
 					this.setType(reader.GetTextDecodeXml());
 					break;
@@ -357,6 +374,9 @@
 		if (application)
 			writer.WriteXmlNodeWithText("application", application);
 		
+		if (this.isFinal())
+			writer.WriteXmlNodeWithText("final", "1");
+		
 		let documentId = this.getDocumentId();
 		if (documentId)
 			writer.WriteXmlNodeWithText("id", documentId);
@@ -625,6 +645,13 @@
 				this.removeFieldMasterByIndex(fieldIndex);
 		}
 	};
+	CDocument.prototype.onChangeFinal = function()
+	{
+		if (!this.OForm)
+			return;
+		
+		this.OForm.sendEvent("asc_onOFormChangeFinal", this.isFinal());
+	};
 	
 	//--------------------------------------------------------export----------------------------------------------------
 	AscOForm.CDocument = CDocument;

oform/format/UserMaster.js

@@ -134,6 +134,10 @@
 	{
 		return this.Role ? this.Role : "";
 	};
+	CUserMaster.prototype.isNoRole = function()
+	{
+		return (this === AscOForm.getNoRole());
+	};
 	CUserMaster.prototype.setColor = function(r, g, b)
 	{
 		let newColor = undefined !== r && null !== r ? new AscWord.CDocumentColor(r, g, b) : undefined;

oform/format/changes/DocumentChanges.js

@@ -45,6 +45,7 @@
 	window['AscDFH'].historyitem_OForm_Document_UserMaster  = window['AscDFH'].historyitem_type_OForm_Document | 9;
 	window['AscDFH'].historyitem_OForm_Document_FieldMaster = window['AscDFH'].historyitem_type_OForm_Document | 10;
 	window['AscDFH'].historyitem_OForm_Document_DefaultUser = window['AscDFH'].historyitem_type_OForm_Document | 11;
+	window['AscDFH'].historyitem_OForm_Document_Final       = window['AscDFH'].historyitem_type_OForm_Document | 12;
 
 	/**
 	 * @constructor
@@ -325,5 +326,26 @@
 		false
 	);
 	window['AscDFH'].CChangesOFormDocumentDefaultUser = CChangesOFormDocumentDefaultUser;
+	
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseBoolProperty}
+	 */
+	function CChangesOFormDocumentFinal(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseBoolProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormDocumentFinal,
+		window['AscDFH'].CChangesBaseBoolProperty,
+		window['AscDFH'].historyitem_OForm_Document_Final,
+		function(value)
+		{
+			this.Class.Final = value;
+			this.Class.onChangeFinal();
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormDocumentFinal = CChangesOFormDocumentFinal;
 
 })(window);