From f3f16b295e72bca4fa5ad22fd1c52b94707919a7 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Mon, 29 Jul 2024 09:59:58 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"REPORT-120151=20feat:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20forkId=20=E5=92=8C=E7=9B=B8=E5=85=B3=E5=9F=8B?=
 =?UTF-8?q?=E7=82=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 127b792fd524c4e0fcf29bcc58bd1ec5fa6f5b73.
---
 .../java/com/fr/design/mainframe/JTemplate.java  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index c9ca4260e8..960ffe92a9 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -7,7 +7,6 @@ import com.fr.base.extension.FileExtension;
 import com.fr.base.info.TemplateSaveInfoContext;
 import com.fr.base.io.BaseBook;
 import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
-import com.fr.base.iofile.attr.ForkIdAttrMark;
 import com.fr.base.iofile.attr.TemplateIdAttrMark;
 import com.fr.base.iofile.attr.TemplateThemeAttrMark;
 import com.fr.base.svg.IconUtils;
@@ -344,18 +343,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         generateTemplateId();
     }
 
-    /**
-     * 如果没有 forkId, 则计算 forkId
-     * 要求在 templateId, 创建后执行。
-     */
-    protected void computeForkIdIfAbsent() {
-
-        ForkIdAttrMark forkIdAttrMark = this.template.getAttrMark(ForkIdAttrMark.XML_TAG);
-        if (forkIdAttrMark == null || StringUtils.isEmpty(forkIdAttrMark.getForkId())) {
-            this.template.addAttrMark(new ForkIdAttrMark(this.template.getTemplateID()));
-        }
-    }
-
     /**
      * 收集图表信息
      */
@@ -984,7 +971,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         }
         // 在保存之前，初始化 templateID
         generateNewTemplateIdForSaveAs();
-        computeForkIdIfAbsent();
 
         this.editingFILE = editingFILE;
         TemplateSaveInfoContext.getInstance().startCollect(template);
@@ -1854,8 +1840,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         }
         // 在保存之前，初始化 templateID
         generateNewTemplateIdForSaveAs();
-        computeForkIdIfAbsent();
-
         this.editingFILE = editingFILE;
         boolean result = this.saveToNewRealFile(oldName);
         if (result) {