From 127b792fd524c4e0fcf29bcc58bd1ec5fa6f5b73 Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Thu, 16 May 2024 16:06:42 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-120151=20feat:=20=E6=B7=BB=E5=8A=A0=20fo?=
 =?UTF-8?q?rkId=20=E5=92=8C=E7=9B=B8=E5=85=B3=E5=9F=8B=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/JTemplate.java  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 3cd8fdb78c..9697113e27 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
@@ -6,6 +6,7 @@ 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;
@@ -343,6 +344,18 @@ 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()));
+        }
+    }
+
     /**
      * 收集图表信息
      */
@@ -971,6 +984,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         }
         // 在保存之前，初始化 templateID
         generateNewTemplateIdForSaveAs();
+        computeForkIdIfAbsent();
 
         this.editingFILE = editingFILE;
         TemplateSaveInfoContext.getInstance().startCollect(template);
@@ -1855,6 +1869,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         }
         // 在保存之前，初始化 templateID
         generateNewTemplateIdForSaveAs();
+        computeForkIdIfAbsent();
+
         this.editingFILE = editingFILE;
         boolean result = this.saveToNewRealFile(oldName);
         if (result) {