From 8f63daeb3c98f3828a79145d4e742af470eae1ed Mon Sep 17 00:00:00 2001 From: "Coral.Chen" Date: Mon, 14 Nov 2022 14:20:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-84313=20=E6=A8=A1=E6=9D=BF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B-=E6=8B=96=E5=8A=A8=E6=A8=A1=E6=9D=BF=E8=BF=9B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=EF=BC=8C=E6=97=A5=E5=BF=97=E4=B8=AD?= =?UTF-8?q?=E6=9C=89esd=E6=A3=80=E6=9F=A5=E9=94=99=E8=AF=AF=20=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=8B=96=E5=8A=A8=E6=A8=A1=E6=9D=BF=E8=BF=9B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=EF=BC=8C=E4=BC=9A=E6=9C=89=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/data/StrategyConfigAttrUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/StrategyConfigAttrUtils.java b/designer-base/src/main/java/com/fr/design/data/StrategyConfigAttrUtils.java index e2a75fc11b..a03ccc99dc 100644 --- a/designer-base/src/main/java/com/fr/design/data/StrategyConfigAttrUtils.java +++ b/designer-base/src/main/java/com/fr/design/data/StrategyConfigAttrUtils.java @@ -11,11 +11,11 @@ import com.fr.esd.event.DSMapping; import com.fr.esd.event.DsNameTarget; import com.fr.esd.event.StrategyEventsNotifier; import com.fr.esd.event.xml.XMLSavedHook; -import com.fr.file.FILE; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.workspace.WorkContext; +import java.nio.file.Paths; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -46,7 +46,9 @@ public class StrategyConfigAttrUtils { } //新建模版此时不存在，不需要注册钩子 - if (attr.getXmlSavedHook() == null && WorkContext.getWorkResource().exist(jTemplate.getPath())) { + //不处理外部路径，保存到设计器才处理 + String path = jTemplate.getPath(); + if (attr.getXmlSavedHook() == null && !Paths.get(path).isAbsolute() && WorkContext.getWorkResource().exist(path)) { attr.setXmlSavedHook(new StrategyConfigsAttrSavedHook(jTemplate.getPath(), attr)); } return attr; From 58ae83fdbbcc7d39834d74f32e029f1178e64221 Mon Sep 17 00:00:00 2001 From: "Coral.Chen" Date: Mon, 14 Nov 2022 15:45:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-83625=20=E9=80=82=E9=85=8DBaseCriter?= =?UTF-8?q?ia=E5=9C=A8cbb=E4=B8=AD=E7=9A=84=E5=8C=85=E5=90=8D=E6=94=B9?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/loghandler/DesignerLogHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index 621956ce6a..b36ca47294 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -1,6 +1,6 @@ package com.fr.design.mainframe.loghandler; -import com.finebi.cbb.base.tuple.Pair; +import com.fr.stable.collections.combination.Pair; import com.fr.base.BaseUtils; import com.fr.base.TRL; import com.fr.design.file.HistoryTemplateListCache; From 0ba7784424ff8d712b59cf861d8f7ae7acf31d3f Mon Sep 17 00:00:00 2001 From: "Coral.Chen" Date: Mon, 14 Nov 2022 15:52:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-83625=20=E9=80=82=E9=85=8DBaseCriter?= =?UTF-8?q?ia=E5=9C=A8cbb=E4=B8=AD=E7=9A=84=E5=8C=85=E5=90=8D=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=20=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/loghandler/DesignerLogHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index b36ca47294..621956ce6a 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -1,6 +1,6 @@ package com.fr.design.mainframe.loghandler; -import com.fr.stable.collections.combination.Pair; +import com.finebi.cbb.base.tuple.Pair; import com.fr.base.BaseUtils; import com.fr.base.TRL; import com.fr.design.file.HistoryTemplateListCache;