[pdf] Move pages

ONLYOFFICE · Feb 4, 2025 · b94c47d · b94c47d
1 parent 5da1111
commit b94c47d
Show file tree

Hide file tree

Showing 21 changed files with 621 additions and 301 deletions.
diff --git a/common/Drawings/TrackObjects/MoveTracks.js b/common/Drawings/TrackObjects/MoveTracks.js
@@ -712,7 +712,8 @@ function MoveAnnotationTrack(originalObject)
     {
         // рисуем на отдельном канвасе
         let nPage = this.pageIndex;
-        this.objectToDraw.SetPage(nPage);
+        let oPageInfo = this.viewer.doc.GetPageInfo(this.pageIndex);
+        this.objectToDraw.SetParentPage(oPageInfo);
 
         let page = this.viewer.drawingPages[nPage];
         if (!page)

diff --git a/common/HistoryCommon.js b/common/HistoryCommon.js
@@ -4087,6 +4087,7 @@
 	window['AscDFH'].historyitem_PDF_Document_RotatePage      = window['AscDFH'].historyitem_type_PDF_Document | 5;
 	window['AscDFH'].historyitem_PDF_Document_RecognizePage   = window['AscDFH'].historyitem_type_PDF_Document | 6;
 	window['AscDFH'].historyitem_PDF_Document_SetDocument     = window['AscDFH'].historyitem_type_PDF_Document | 7;
+	window['AscDFH'].historyitem_PDF_Document_MovePage		  = window['AscDFH'].historyitem_type_PDF_Document | 8;
 
 
 	AscDFH.historyitem_CustomPropertiesAddProperty = AscDFH.historyitem_type_CustomProperties | 0;
@@ -4574,6 +4575,7 @@
 	window['AscDFH'].historydescription_Pdf_ChangeStrokeColor	= 0x2b1;
 	window['AscDFH'].historydescription_Pdf_ChangeFillColor		= 0x2b2;
 	window['AscDFH'].historydescription_Pdf_ChangeOpacity		= 0x2b3;
+	window['AscDFH'].historydescription_Pdf_MovePage			= 0x2b4;
 
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/pdf/src/annotations/base.js b/pdf/src/annotations/base.js
@@ -36,7 +36,7 @@
 	 * Class representing a base annotation.
 	 * @constructor
     */
-    function CAnnotationBase(sName, nType, nPage, aOrigRect, oDoc)
+    function CAnnotationBase(sName, nType, aOrigRect, oDoc)
     {
         // если аннотация не shape based
         if (this.Id == undefined) {
@@ -63,7 +63,6 @@
         this._modDate               = undefined;
         this._name                  = undefined;
         this._opacity               = 1;
-        this._page                  = undefined;
         this._origRect              = [];
         this._refType               = undefined;
         this._seqNum                = undefined;
@@ -96,7 +95,6 @@
 
         this.SetDocument(oDoc);
         this.SetName(sName);
-        this.SetPage(nPage);
         this.SetRect(aOrigRect);
     };
     CAnnotationBase.prototype = Object.create(AscFormat.CBaseNoIdObject.prototype);
@@ -612,39 +610,33 @@
         this.parentPage = oParent;
     };
     CAnnotationBase.prototype.GetParentPage = function() {
+        let oReplyTo = this.GetReplyTo();
+        if (oReplyTo && !this.parentPage) {
+            return oReplyTo.GetParentPage();
+        }
+
         return this.parentPage;
     };
     CAnnotationBase.prototype.SetPage = function(nPage) {
-        let nCurPage = this.GetPage();
-        if (nPage == nCurPage)
+        if (this.GetPage() == nPage) {
             return;
-
-        let oViewer     = editor.getDocumentRenderer();
+        }
+
         let oDoc        = this.GetDocument();
-        let oPageInfo   = oViewer.pagesInfo.pages[nCurPage];
+        let oNewPage    = oDoc.GetPageInfo(nPage);
 
-        let nCurIdxOnPage = oPageInfo && oPageInfo.annots ? oPageInfo.annots.indexOf(this) : -1;
-        if (oViewer.pagesInfo.pages[nPage]) {
-            if (oDoc.annots.indexOf(this) != -1) {
-                if (nCurIdxOnPage != -1) {
-                    oPageInfo.annots.splice(nCurIdxOnPage, 1);
-                }
-
-                if (this.IsUseInDocument() && oViewer.pagesInfo.pages[nPage].annots.indexOf(this) == -1)
-                    oViewer.pagesInfo.pages[nPage].annots.push(this);
-
-                // добавляем в перерисовку исходную страницу
-                this.AddToRedraw();
-            }
-
-            oDoc.History.Add(new CChangesPDFAnnotPage(this, nCurPage, nPage));
-            this._page = nPage;
-            this.selectStartPage = nPage;
-            this.AddToRedraw();
+        if (oNewPage) {
+            oDoc.RemoveAnnot(this.GetId());
+            oDoc.AddAnnot(this, nPage);
         }
     };
     CAnnotationBase.prototype.GetPage = function() {
-        return this._page;
+        let oParentPage = this.GetParentPage();
+        if (!oParentPage || !(oParentPage instanceof AscPDF.CPageInfo)) {
+            return -1;
+        }
+
+        return oParentPage.GetIndex();
     };
     CAnnotationBase.prototype.SetDocument = function(oDoc) {
         if (this._doc == oDoc) {
@@ -1036,7 +1028,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oNewAnnot = new CAnnotationBase(AscCommon.CreateGUID(), this.type, this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oNewAnnot = new CAnnotationBase(AscCommon.CreateGUID(), this.type, this.GetOrigRect().slice(), oDoc);
 
         oNewAnnot.lazyCopy = true;
 

diff --git a/pdf/src/annotations/circle.js b/pdf/src/annotations/circle.js
@@ -36,10 +36,10 @@
 	 * Class representing a Ink annotation.
 	 * @constructor
     */
-    function CAnnotationCircle(sName, nPage, aRect, oDoc)
+    function CAnnotationCircle(sName, aRect, oDoc)
     {
         AscPDF.CPdfShape.call(this);
-        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Circle, nPage, aRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Circle, aRect, oDoc);
 
         AscPDF.initShape(this);
         this.spPr.setGeometry(AscFormat.CreateGeometry("ellipse"));
@@ -66,7 +66,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oCircle = new CAnnotationCircle(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oCircle = new CAnnotationCircle(AscCommon.CreateGUID(), this.GetOrigRect().slice(), oDoc);
         oCircle.lazyCopy = true;
 
         this.fillObject(oCircle);

diff --git a/pdf/src/annotations/freeText.js b/pdf/src/annotations/freeText.js
@@ -51,10 +51,10 @@
 	 * Class representing a free text annotation.
 	 * @constructor
     */
-    function CAnnotationFreeText(sName, nPage, aRect, oDoc)
+    function CAnnotationFreeText(sName, aRect, oDoc)
     {
         AscFormat.CGroupShape.call(this);
-        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.FreeText, nPage, aRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.FreeText, aRect, oDoc);
 
         initGroupShape(this);
 
@@ -483,7 +483,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oFreeText = new CAnnotationFreeText(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oFreeText = new CAnnotationFreeText(AscCommon.CreateGUID(), this.GetOrigRect().slice(), oDoc);
 
         oFreeText.lazyCopy = true;
 

diff --git a/pdf/src/annotations/highlights.js b/pdf/src/annotations/highlights.js
@@ -36,9 +36,9 @@
 	 * Class representing a base highlight annotation.
 	 * @constructor
     */
-    function CAnnotationTextMarkup(sName, nType, nPage, aRect, oDoc)
+    function CAnnotationTextMarkup(sName, nType, aRect, oDoc)
     {
-        AscPDF.CAnnotationBase.call(this, sName, nType, nPage, aRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, nType, aRect, oDoc);
 
         this._quads         = [];
         this._richContents  = undefined;

diff --git a/pdf/src/annotations/ink.js b/pdf/src/annotations/ink.js
@@ -36,10 +36,10 @@
 	 * Class representing a Ink annotation.
 	 * @constructor
     */
-    function CAnnotationInk(sName, nPage, aRect, oDoc)
+    function CAnnotationInk(sName, aRect, oDoc)
     {
         AscPDF.CPdfShape.call(this);
-        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Ink, nPage, aRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Ink, aRect, oDoc);
 
         AscCommon.History.StartNoHistoryMode();
         initShape(this);
@@ -342,7 +342,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oNewInk = new CAnnotationInk(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oNewInk = new CAnnotationInk(AscCommon.CreateGUID(), this.GetOrigRect().slice(), oDoc);
 
         oNewInk.lazyCopy = true;
 

diff --git a/pdf/src/annotations/line.js b/pdf/src/annotations/line.js
@@ -64,10 +64,10 @@
 	 * Class representing a Ink annotation.
 	 * @constructor
     */
-    function CAnnotationLine(sName, nPage, aRect, oDoc)
+    function CAnnotationLine(sName, aRect, oDoc)
     {
         AscPDF.CPdfShape.call(this);
-        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Line, nPage, aRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Line, aRect, oDoc);
 
         AscPDF.initShape(this);
 
@@ -194,7 +194,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oLine = new CAnnotationLine(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oLine = new CAnnotationLine(AscCommon.CreateGUID(), this.GetOrigRect().slice(), oDoc);
 
         oLine.lazyCopy = true;
 

diff --git a/pdf/src/annotations/polyLine.js b/pdf/src/annotations/polyLine.js
@@ -42,10 +42,10 @@
 	 * Class representing a Ink annotation.
 	 * @constructor
     */
-    function CAnnotationPolyLine(sName, nPage, aRect, oDoc)
+    function CAnnotationPolyLine(sName, aRect, oDoc)
     {
         AscPDF.CPdfShape.call(this);
-        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.PolyLine, nPage, aRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.PolyLine, aRect, oDoc);
 
         AscPDF.initShape(this);
 
@@ -139,7 +139,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oPolyline = new CAnnotationPolyLine(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oPolyline = new CAnnotationPolyLine(AscCommon.CreateGUID(), this.GetOrigRect().slice(), oDoc);
         oPolyline.lazyCopy = true;
 
         this.fillObject(oPolyline);

diff --git a/pdf/src/annotations/polygon.js b/pdf/src/annotations/polygon.js
@@ -42,10 +42,10 @@
 	 * Class representing a Ink annotation.
 	 * @constructor
     */
-    function CAnnotationPolygon(sName, nPage, aRect, oDoc)
+    function CAnnotationPolygon(sName, aRect, oDoc)
     {
         AscPDF.CPdfShape.call(this);
-        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Polygon, nPage, aRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Polygon, aRect, oDoc);
 
         AscPDF.initShape(this);
 
@@ -148,7 +148,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oPolygon = new CAnnotationPolygon(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oPolygon = new CAnnotationPolygon(AscCommon.CreateGUID(), this.GetOrigRect().slice(), oDoc);
         oPolygon.lazyCopy = true;
 
         this.fillObject(oPolygon);

diff --git a/pdf/src/annotations/square.js b/pdf/src/annotations/square.js
@@ -36,10 +36,10 @@
 	 * Class representing a Ink annotation.
 	 * @constructor
     */
-    function CAnnotationSquare(sName, nPage, aRect, oDoc)
+    function CAnnotationSquare(sName, aRect, oDoc)
     {
         AscPDF.CPdfShape.call(this);
-        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Square, nPage, aRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Square, aRect, oDoc);
 
         AscPDF.initShape(this);
         this.spPr.setGeometry(AscFormat.CreateGeometry("rect"));
@@ -62,7 +62,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oSquare = new CAnnotationSquare(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oSquare = new CAnnotationSquare(AscCommon.CreateGUID(), this.GetOrigRect().slice(), oDoc);
 
         oSquare.lazyCopy = true;
 

diff --git a/pdf/src/annotations/stamp.js b/pdf/src/annotations/stamp.js
@@ -70,10 +70,10 @@
 	 * Class representing a stamp annotation.
 	 * @constructor
     */
-    function CAnnotationStamp(sName, nPage, aRect, oDoc)
+    function CAnnotationStamp(sName, aRect, oDoc)
     {
         AscPDF.CPdfShape.call(this);
-        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Stamp, nPage, aRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Stamp, aRect, oDoc);
 
         this._rotate = 0;
         this._stampType = undefined;
@@ -373,7 +373,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oNewStamp = new CAnnotationStamp(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oNewStamp = new CAnnotationStamp(AscCommon.CreateGUID(), this.GetOrigRect().slice(), oDoc);
 
         oNewStamp.inRect = this.inRect;
         oNewStamp.lazyCopy = true;

diff --git a/pdf/src/annotations/text.js b/pdf/src/annotations/text.js
@@ -75,9 +75,9 @@
 	 * Class representing a text annotation.
 	 * @constructor
     */
-    function CAnnotationText(sName, nPage, aOrigRect, oDoc)
+    function CAnnotationText(sName, aOrigRect, oDoc)
     {
-        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Text, nPage, aOrigRect, oDoc);
+        AscPDF.CAnnotationBase.call(this, sName, AscPDF.ANNOTATIONS_TYPES.Text, aOrigRect, oDoc);
 
         this._noteIcon      = NOTE_ICONS_TYPES.Comment;
         this._point         = undefined;
@@ -131,7 +131,7 @@
         this._replies = [];
     };
     CAnnotationText.prototype.AddReply = function(CommentData, nPos) {
-        let oReply = new CAnnotationText(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), this.GetDocument());
+        let oReply = new CAnnotationText(AscCommon.CreateGUID(), this.GetOrigRect().slice(), this.GetDocument());
 
         oReply.SetCreationDate(CommentData.m_sOOTime);
         oReply.SetModDate(CommentData.m_sOOTime);
@@ -226,7 +226,7 @@
         let oDoc = this.GetDocument();
         oDoc.StartNoHistoryMode();
 
-        let oNewAnnot = new CAnnotationText(AscCommon.CreateGUID(), this.GetPage(), this.GetOrigRect().slice(), oDoc);
+        let oNewAnnot = new CAnnotationText(AscCommon.CreateGUID(), this.GetOrigRect().slice(), oDoc);
 
         oNewAnnot.lazyCopy = true;
         oNewAnnot._originView = this._originView;
@@ -262,15 +262,15 @@
 
         let nX          = aOrigRect[0];
         let nY          = aOrigRect[1];
-        let nWidth      = 21 / oDoc.Viewer.zoom;
-        let nHeight     = 21 / oDoc.Viewer.zoom;
+        let nWidth      = 21 / (oGraphics.isThumbnails ? 1 : oDoc.Viewer.zoom);
+        let nHeight     = 21 / (oGraphics.isThumbnails ? 1 : oDoc.Viewer.zoom);
 
         let oCtx = oGraphics.GetContext();
         oCtx.save();
         oGraphics.EnableTransform();
         oCtx.iconFill = "rgb(" + oRGB.r + "," + oRGB.g + "," + oRGB.b + ")";
 
-        let nScale = 1 / oDoc.Viewer.zoom;
+        let nScale = 1 / (oGraphics.isThumbnails ? 1 : oDoc.Viewer.zoom);
         let drawFunc = this.GetIconDrawFunc();
         drawFunc(oCtx, nX , nY, nScale, nScale, -nRotAngle * Math.PI / 180);
 

diff --git a/pdf/src/defines.js b/pdf/src/defines.js
@@ -100,8 +100,17 @@
     FIELD_TYPES["listbox"]      = FIELD_TYPES.listbox;
     FIELD_TYPES["signature"]    = FIELD_TYPES.signature;
 
+    let CommandType = {
+        editPage:   0,
+        addPage:    1,
+        removePage: 2,
+        widgetInfo: 3,
+        movePage:   4
+    }
+
     Object.freeze(FIELD_TYPES);
     asc["FIELD_TYPES"]          = asc.FIELD_TYPES            = FIELD_TYPES;
     asc["BORDER_EFFECT_STYLES"] = asc.BORDER_EFFECT_STYLES   = BORDER_EFFECT_STYLES;
     asc["REF_TO_REASON"]        = asc.REF_TO_REASON          = REF_TO_REASON;
+    asc.CommandType             = CommandType;
 })();