Feature/external data diagrams

cell/apiDefines.js

@@ -572,11 +572,7 @@ var c_oAscPopUpSelectorType = {
   };
 
   var c_nAscMaxAddCellWatchesCount = 10000;
-  var c_oAscExternalReferenceType = {
-    referenceData: 0,
-    link: 1,
-    path: 2
-  };
+
 
   var c_oAscPageBreaksDisableType = {
     none: 0,
@@ -1030,11 +1026,6 @@ var c_oAscPopUpSelectorType = {
   prot['Range'] = prot.Range;
 
   window['Asc']['c_nAscMaxAddCellWatchesCount'] = window['Asc'].c_nAscMaxAddCellWatchesCount = c_nAscMaxAddCellWatchesCount;
-  window['Asc']['c_oAscExternalReferenceType'] = window['Asc'].c_oAscExternalReferenceType = c_oAscExternalReferenceType;
-  prot = c_oAscExternalReferenceType;
-  prot['referenceData'] = prot.referenceData;
-  prot['link'] = prot.link;
-  prot['path'] = prot.path;
 
   window['Asc']['c_oAscPageBreaksDisableType'] = window['Asc'].c_oAscPageBreaksDisableType = c_oAscPageBreaksDisableType;
   prot = c_oAscPageBreaksDisableType;

cell/model/CollaborativeEditing.js

@@ -241,15 +241,14 @@
 
 				asc_applyFunction(callback, true);
 			} else if (result["error"]) {
-				if (Asc.editor && Asc.editor.isOleEditor && !Asc.editor.isEditOleMode) {
+				if (Asc.editor.frameManager.isLoadingOleEditor) {
 					Asc.editor.sync_closeOleEditor();
 				}
 
 				asc_applyFunction(callback, false);
 			}
-			if (Asc.editor && !Asc.editor.isEditOleMode) {
-				Asc.editor.isOleEditor = false;
-			}
+
+			Asc.editor.frameManager.endLoadOleEditor();
 		};
 		CCollaborativeEditing.prototype.addUnlock = function (LockClass) {
 			this.m_arrNeedUnlock.push(LockClass);

cell/model/DrawingObjects/Format/ChartSpacePrototype.js

@@ -246,12 +246,12 @@ CChartSpace.prototype.recalculateBounds = function()
 
 CChartSpace.prototype.recalculate = function()
 {
-    if(this.bDeleted)
+    if(this.bDeleted && !this.isFrameChart)
         return;
 
     var oController = this.getDrawingObjectsController();
     //Use this check to prevent charts recalculation on not initialized sheets bug 50467
-    if(!oController) {
+    if(!oController && !this.isFrameChart) {
         return;
     }
     //---------------------------------------------------
@@ -435,4 +435,185 @@ CChartSpace.prototype.Get_ColorMap = CShape.prototype.Get_ColorMap;
             this.worksheet.contentChanges.Refresh();
         }
     };
+
+	CChartSpace.prototype.addExternalReferenceToEditor = function (oPastedWb)
+	{
+		if (!oPastedWb)
+			return;
+
+		const oApi = Asc.editor;
+
+		const oWbModel = oApi.wbModel;
+		const oWs = oApi.wb.getWorksheet();
+		if (!oWs)
+			return;
+
+		const oCellPasteHelper = oWs.cellPasteHelper;
+
+		const oMockWb = oWbModel.getTemporaryExternalWb();
+		//todo: do we want to read already created links when copy-pasting?
+		//const oConvertedExternalReference = oExternalReference.convertToExternalReference();
+		const oCachedWorksheets = this.getWorksheetsFromCache(oMockWb);
+		let bNeedConvert = false;
+
+		let oMainExternalReference;
+		const sChartRange = this.getCommonRange();
+		const arrChartRanges = AscFormat.fParseChartFormulaExternal(sChartRange);
+		if (!(arrChartRanges && arrChartRanges.length)) {
+			return;
+		}
+		const mapRangeWorksheets = {};
+		for (let i = 0; i < arrChartRanges.length; i++) {
+			const oRange = arrChartRanges[i];
+			const oRangeWorksheet = oRange.worksheet;
+			const sWorksheetName = oRangeWorksheet.getName();
+			if (!mapRangeWorksheets[sWorksheetName]) {
+				mapRangeWorksheets[sWorksheetName] = [];
+			}
+			mapRangeWorksheets[sWorksheetName].push(oRange.bbox);
+		}
+		for (let sSheetName in oCachedWorksheets)
+		{
+			const arrRanges = mapRangeWorksheets[sSheetName];
+			if (!arrRanges) {
+				continue;
+			}
+			const oPastedWS = oCachedWorksheets[sSheetName].ws;
+			const oPastedLinkInfo = oCellPasteHelper.getPastedLinkInfo(oPastedWb, oPastedWS);
+
+			if (oPastedLinkInfo)
+			{
+				if (oPastedLinkInfo.type === -1)
+				{
+					const pasteSheetLinkName = oPastedLinkInfo.sheet;
+					//необходимо положить нужные данные в SheetDataSet
+					oMainExternalReference = oWbModel.externalReferences[oPastedLinkInfo.index - 1];
+					if (oMainExternalReference)
+					{
+						oMainExternalReference.updateSheetData(pasteSheetLinkName, oPastedWS, arrRanges);
+						oWbModel.changeExternalReference(oPastedLinkInfo.index, oMainExternalReference);
+					}
+					bNeedConvert = true;
+				}
+				else if (oPastedLinkInfo.type === -2)
+				{
+					if (!oMainExternalReference)
+					{
+						var referenceData;
+						var name = oPastedWb.Core.title;
+						if (window["AscDesktopEditor"] && window["AscDesktopEditor"]["IsLocalFile"]())
+						{
+							name = oPastedLinkInfo.path;
+						}
+						else
+						{
+							if (oPastedWb && oPastedWb.Core)
+							{
+								referenceData = {};
+								referenceData["fileKey"] = oPastedWb.Core.contentStatus;
+								referenceData["instanceId"] = oPastedWb.Core.category;
+							}
+						}
+
+						oMainExternalReference = new AscCommonExcel.ExternalReference();
+						oMainExternalReference.referenceData = referenceData;
+						oMainExternalReference.Id = name;
+					}
+
+					oMainExternalReference.addSheet(oPastedWS, arrRanges);
+					oWbModel.addExternalReferences([oMainExternalReference]);
+					bNeedConvert = true;
+				}
+			}
+		}
+		if (bNeedConvert)
+		{
+			this.convertRefsToExternal(oMainExternalReference, oPastedWb.externalReferences);
+		}
+	}
+	CChartSpace.prototype.convertRefsToExternal = function (oMainExternalReference, arrPastedExternalReferences)
+	{
+		const aSeries = this.getAllSeries();
+		for (let i = 0; i < aSeries.length; i += 1)
+		{
+			const oSeria = aSeries[i];
+			const oVal = oSeria.val || oSeria.yVal;
+			if (oVal && oVal.numRef)
+			{
+				oVal.numRef.updateToExternal(oMainExternalReference, arrPastedExternalReferences);
+			}
+			const oCat = oSeria.cat || oSeria.xVal;
+			if (oCat)
+			{
+				if (oCat.numRef)
+				{
+					oCat.numRef.updateToExternal(oMainExternalReference, arrPastedExternalReferences);
+				}
+				if (oCat.strRef)
+				{
+					oCat.strRef.updateToExternal(oMainExternalReference, arrPastedExternalReferences);
+				}
+			}
+			if (oSeria.tx && oSeria.tx.strRef)
+			{
+				oSeria.tx.strRef.updateToExternal(oMainExternalReference, arrPastedExternalReferences);
+			}
+		}
+		this.onDataUpdateRecalc();
+	};
+	CChartSpace.prototype.applySpecialPasteProps = function (oExternalWb)
+	{
+		if (!(this.XLSX && this.XLSX.length))
+		{
+			this.setXLSX(new Uint8Array(0));
+		}
+		if (oExternalWb)
+		{
+			this.addExternalReferenceToEditor(oExternalWb);
+		}
+		else
+		{
+			this.setExternalReference(null);
+		}
+	}
+	CChartSpace.prototype.canPasteExternal = function ()
+	{
+		const oExternalReference = this.getExternalReference();
+		if (oExternalReference)
+		{
+			const oReferenceData = oExternalReference.referenceData;
+			if (oReferenceData)
+			{
+				const oApi = Asc.editor || editor;
+				const oDocInfo = oApi.DocInfo;
+				const oDocumentReferenceData = oDocInfo && oDocInfo.ReferenceData;
+				if (oDocumentReferenceData)
+				{
+					return oDocumentReferenceData['fileKey'] === oReferenceData['fileKey'] && oDocumentReferenceData['instanceId'] === oReferenceData['instanceId'];
+				}
+			}
+			return true;
+		}
+		return false;
+
+	};
+	CChartSpace.prototype.getSpecialPasteProps = function ()
+	{
+		const oSpecialProps = Asc.c_oSpecialPasteProps;
+		const mapProps = {};
+
+		mapProps[oSpecialProps.destinationFormatting] = [];
+		mapProps[oSpecialProps.sourceformatting] = [];
+		mapProps[oSpecialProps.picture] = [oSpecialProps.picture];
+		if (this.canPasteExternal())
+		{
+			mapProps[oSpecialProps.destinationFormatting].push(oSpecialProps.destinationFormattingLink);
+			mapProps[oSpecialProps.sourceformatting].push(oSpecialProps.sourceFormattingLink);
+		}
+		return mapProps;
+	};
+	CChartSpace.prototype.isWorkbookChart = function () {
+		return true;
+	};
+
 })(window);