From 30058b7a4a5e424443ef83326e3ef416c4690715 Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 1 Jun 2022 17:39:29 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-72816=20=E8=BF=9C=E7=A8=8B=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=A0=A1=E9=AA=8C=E6=9C=BA=E5=88=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?-=E6=89=93=E5=BC=80=E4=B8=80=E5=BC=A0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95A->B->A=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=A8=A1=E6=9D=BF=E4=BC=9A=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E6=8F=90=E7=A4=BA=20=E3=80=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E5=8F=AA=E5=A4=84=E7=90=86=E4=BA=86=E6=9C=AA?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E6=A8=A1=E6=9D=BF=20=E3=80=90?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E4=B8=8D=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E6=98=AF=E5=90=A6=E4=BF=9D=E5=AD=98=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E8=A6=81=E6=98=AF=E7=8E=AF=E5=A2=83=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E9=83=BD=E5=81=9A=E4=B8=80=E6=AC=A1=E8=BD=AC=E5=8C=96=20?= =?UTF-8?q?=E3=80=90review=E5=BB=BA=E8=AE=AE=E3=80=91=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JTemplate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b8e5468dbc..c086ddac97 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 @@ -448,8 +448,8 @@ public abstract class JTemplate> */ public FILE templateToStashFile4Envchange() { FILE file = this.getEditingFILE(); - if (file.isEnvFile() && !isSaved()) { - // 切换工作目录时,存在未保存的环境文件时,将其转化为与环境无关的内存文件,再创建暂存文件 + if (file.isEnvFile()) { + // 切换工作目录时,模板锁信息被清除,因此这里需要将环境相关模板文件转化为与环境无关的内存模板文件,再创建暂存文件 return new StashedFILE(new MemFILE(file.getName()), exportBaseBook2ByteArray(), template.suffix()); } else { // 其它情况下,直接创建暂存文件