From 767406845e329b75bf0e2d4b1aec1d4382a5a21e Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 26 Dec 2024 14:56:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-145338=20=E4=BF=AE=E5=A4=8D=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E5=88=87=E6=8D=A2=E5=A4=A7=E9=87=8Fexist=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/data/StrategyConfigAttrUtils.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 a03ccc99dc..e4a25eb17a 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 @@ -4,8 +4,6 @@ import com.fr.base.io.IOFile; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.mainframe.JTemplate; import com.fr.esd.core.strategy.config.StrategyConfig; -import com.fr.esd.core.strategy.config.StrategyConfigHelper; -import com.fr.esd.core.strategy.config.service.StrategyConfigService; import com.fr.esd.core.strategy.persistence.StrategyConfigsAttr; import com.fr.esd.event.DSMapping; import com.fr.esd.event.DsNameTarget; @@ -13,7 +11,6 @@ import com.fr.esd.event.StrategyEventsNotifier; import com.fr.esd.event.xml.XMLSavedHook; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; -import com.fr.workspace.WorkContext; import java.nio.file.Paths; import java.util.HashMap; @@ -48,7 +45,9 @@ public class StrategyConfigAttrUtils { //新建模版此时不存在，不需要注册钩子 //不处理外部路径，保存到设计器才处理 String path = jTemplate.getPath(); - if (attr.getXmlSavedHook() == null && !Paths.get(path).isAbsolute() && WorkContext.getWorkResource().exist(path)) { + if (attr.getXmlSavedHook() == null + && !Paths.get(path).isAbsolute() + && jTemplate.getEditingFILE().isMemFile()) { attr.setXmlSavedHook(new StrategyConfigsAttrSavedHook(jTemplate.getPath(), attr)); } return attr; From 2956e0df00dba5921a8173b3c381cad86aa8606d Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 26 Dec 2024 17:20:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"REPORT-145338=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=BF=9C=E7=A8=8B=E5=88=87=E6=8D=A2=E5=A4=A7=E9=87=8F?= =?UTF-8?q?exist=E6=93=8D=E4=BD=9C=E7=9A=84=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 767406845e329b75bf0e2d4b1aec1d4382a5a21e. --- .../java/com/fr/design/data/StrategyConfigAttrUtils.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 e4a25eb17a..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 @@ -4,6 +4,8 @@ import com.fr.base.io.IOFile; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.mainframe.JTemplate; import com.fr.esd.core.strategy.config.StrategyConfig; +import com.fr.esd.core.strategy.config.StrategyConfigHelper; +import com.fr.esd.core.strategy.config.service.StrategyConfigService; import com.fr.esd.core.strategy.persistence.StrategyConfigsAttr; import com.fr.esd.event.DSMapping; import com.fr.esd.event.DsNameTarget; @@ -11,6 +13,7 @@ import com.fr.esd.event.StrategyEventsNotifier; import com.fr.esd.event.xml.XMLSavedHook; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; +import com.fr.workspace.WorkContext; import java.nio.file.Paths; import java.util.HashMap; @@ -45,9 +48,7 @@ public class StrategyConfigAttrUtils { //新建模版此时不存在，不需要注册钩子 //不处理外部路径，保存到设计器才处理 String path = jTemplate.getPath(); - if (attr.getXmlSavedHook() == null - && !Paths.get(path).isAbsolute() - && jTemplate.getEditingFILE().isMemFile()) { + if (attr.getXmlSavedHook() == null && !Paths.get(path).isAbsolute() && WorkContext.getWorkResource().exist(path)) { attr.setXmlSavedHook(new StrategyConfigsAttrSavedHook(jTemplate.getPath(), attr)); } return attr; From c6ef9c139948dd3e7b65ad61eafcca24174d42f0 Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 26 Dec 2024 17:26:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-145372=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=8F=8C=E5=87=BB=E6=A8=A1=E6=9D=BFtab?= =?UTF-8?q?=E6=A0=8F=E5=90=8E=E5=8F=B0NPE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/file/MultiTemplateTabPane.java | 23 ++++++++----------- .../mainframe/CenterRegionContainerPane.java | 3 +-- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java index 6f2d1c5719..dc70031db6 100644 --- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java @@ -116,7 +116,6 @@ public class MultiTemplateTabPane extends Row { private boolean hoverMoreAction = false; private Icon clodeIcon = new LazyIcon("clear"); private boolean isShowList = false; - private JButton leadingActionButton; private final UIToolbar leadingToolBar = new UIToolbar(); //自动新建的模板B若没有进行任何编辑，切换到其他 @@ -203,17 +202,6 @@ public class MultiTemplateTabPane extends Row { updateLeadingToolBar(); } - /** - * 为前导动作添加监听 - * - * @param l 监听器 - */ - public void addLeadingAction(ActionListener l) { - newTemplateAction = l; - leadingActionButton.removeActionListener(newTemplateAction); - leadingActionButton.addActionListener(newTemplateAction); - } - public void setToolBarEnable(boolean enable) { leadingToolBar.setEnabled(enable); } @@ -787,7 +775,9 @@ public class MultiTemplateTabPane extends Row { public void mouseClicked(MouseEvent e) { // 双击添加模板 if (e.getClickCount() == DOUBLE_CLICK - && isOverBlank(e.getX())) { + && isOverBlank(e.getX()) + && newTemplateAction != null + ) { newTemplateAction.actionPerformed(null); } } @@ -1003,6 +993,7 @@ public class MultiTemplateTabPane extends Row { /** * 创建新建模板的前导区工具按钮 + * * @return */ private ToolBarDef createLeadingToolBarDef() { @@ -1013,17 +1004,21 @@ public class MultiTemplateTabPane extends Row { /** * 创建新建文件的按钮数组 + * * @return */ public ShortCut[] createNewTemplateShortCuts() { ArrayList shortCuts = new ArrayList(); - shortCuts.add(new NewWorkBookToolButtonAction()); + NewWorkBookToolButtonAction action = new NewWorkBookToolButtonAction(); + shortCuts.add(action); + newTemplateAction = action; return shortCuts.toArray(new ShortCut[0]); } /** * 插入插件中的按钮 + * * @return */ protected void insertLeadingToolButton(ToolBarDef toolBarDef, String anchor) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java index e59628cd15..74d285b992 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java @@ -98,8 +98,7 @@ public class CenterRegionContainerPane extends JPanel { } private MultiTemplateTabPane initTemplateTabPane() { - MultiTemplateTabPane templateTabPane = MultiTemplateTabPane.getInstance(); - return templateTabPane; + return MultiTemplateTabPane.getInstance(); } public ToolBarMenuDock getToolBarMenuDock() { From b8fbc434ebb44a2edf05dfed8084126da94a4811 Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 26 Dec 2024 17:36:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-145379=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E8=B0=83=E8=AF=95=E5=B7=A5=E5=85=B7=E9=80=82=E9=85=8D?= =?UTF-8?q?gzip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remote/RemoteDesignNetWorkAction.java | 7 ----- .../remote/RemoteDesignNetWorkTablePane.java | 28 ++++++++++++++++++- .../fr/design/file/MultiTemplateTabPane.java | 3 +- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java index 15c2900e75..86adbc93a9 100644 --- a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java +++ b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java @@ -2,10 +2,8 @@ package com.fr.design.debug.remote; import com.fine.theme.utils.FineUIUtils; import com.fr.design.actions.UpdateAction; -import com.fr.design.dialog.FineJOptionPane; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.workspace.WorkContext; import javax.swing.JDialog; import javax.swing.KeyStroke; @@ -33,11 +31,6 @@ public class RemoteDesignNetWorkAction extends UpdateAction { @Override public void actionPerformed(ActionEvent e) { - if (WorkContext.getCurrent().isLocal()) { - FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - "Remote Design NetWork can't show on local environment."); - return; - } JDialog jDialog = new JDialog(DesignerContext.getDesignerFrame(), TITLE); jDialog.setSize(FineUIUtils.calPaneDimensionByContext(0.8, 0.6)); RemoteDesignNetWorkTablePane netWorkPane = new RemoteDesignNetWorkTablePane(); diff --git a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java index 5569919560..101ea19aff 100644 --- a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java +++ b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java @@ -5,11 +5,15 @@ import com.fine.theme.icon.LazyIcon; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIToggleButton; +import com.fr.design.ui.util.UIUtil; import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.Listener; import com.fr.workspace.WorkContext; +import com.fr.workspace.Workspace; +import com.fr.workspace.WorkspaceEvent; +import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; @@ -20,6 +24,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Component; import java.util.concurrent.atomic.AtomicLong; @@ -49,7 +54,8 @@ public class RemoteDesignNetWorkTablePane extends JPanel { model.addRow(new Object[]{ count.incrementAndGet(), dateFormat(requestInfo.getDate()), - requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1), + requestInfo.getHttpMethod() + " " + + requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1), requestInfo.getStatus(), simpleTime(requestInfo.getConsume()), simpleSize(requestInfo.getRequestSize()), @@ -125,9 +131,29 @@ public class RemoteDesignNetWorkTablePane extends JPanel { jToolBar.add(forbid); jToolBar.add(remove); jToolBar.add(refresh); + tip(jToolBar); add(jToolBar, BorderLayout.NORTH); } + private void tip(JToolBar jToolBar) { + JLabel jLabel = new JLabel(); + jLabel.setForeground(Color.ORANGE); + jToolBar.addSeparator(); + jToolBar.add(jLabel); + setTipIfNeed(jLabel); + EventDispatcher.listen(WorkspaceEvent.AfterSwitch, new Listener() { + @Override + public void on(Event event, Workspace workspace) { + setTipIfNeed(jLabel); + } + }); + } + + private static void setTipIfNeed(JLabel jLabel) { + UIUtil.invokeLaterIfNeeded(() -> jLabel.setText( + WorkContext.getCurrent().isLocal() ? "Remote Design NetWork can't show on local environment." : "")); + } + /** * 清理监听 */ diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java index dc70031db6..a7eeb3ba53 100644 --- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java @@ -776,8 +776,7 @@ public class MultiTemplateTabPane extends Row { // 双击添加模板 if (e.getClickCount() == DOUBLE_CLICK && isOverBlank(e.getX()) - && newTemplateAction != null - ) { + && newTemplateAction != null) { newTemplateAction.actionPerformed(null); } } From f2167af5b0914dae4e7f3f1ca1727237b2dd0552 Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 26 Dec 2024 17:36:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?Revert=20"REPORT-145379=20=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E8=AE=BE=E8=AE=A1=E8=B0=83=E8=AF=95=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E9=80=82=E9=85=8Dgzip"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b8fbc434ebb44a2edf05dfed8084126da94a4811. --- .../remote/RemoteDesignNetWorkAction.java | 7 +++++ .../remote/RemoteDesignNetWorkTablePane.java | 28 +------------------ .../fr/design/file/MultiTemplateTabPane.java | 3 +- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java index 86adbc93a9..15c2900e75 100644 --- a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java +++ b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java @@ -2,8 +2,10 @@ package com.fr.design.debug.remote; import com.fine.theme.utils.FineUIUtils; import com.fr.design.actions.UpdateAction; +import com.fr.design.dialog.FineJOptionPane; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.workspace.WorkContext; import javax.swing.JDialog; import javax.swing.KeyStroke; @@ -31,6 +33,11 @@ public class RemoteDesignNetWorkAction extends UpdateAction { @Override public void actionPerformed(ActionEvent e) { + if (WorkContext.getCurrent().isLocal()) { + FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), + "Remote Design NetWork can't show on local environment."); + return; + } JDialog jDialog = new JDialog(DesignerContext.getDesignerFrame(), TITLE); jDialog.setSize(FineUIUtils.calPaneDimensionByContext(0.8, 0.6)); RemoteDesignNetWorkTablePane netWorkPane = new RemoteDesignNetWorkTablePane(); diff --git a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java index 101ea19aff..5569919560 100644 --- a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java +++ b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java @@ -5,15 +5,11 @@ import com.fine.theme.icon.LazyIcon; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIToggleButton; -import com.fr.design.ui.util.UIUtil; import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.Listener; import com.fr.workspace.WorkContext; -import com.fr.workspace.Workspace; -import com.fr.workspace.WorkspaceEvent; -import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; @@ -24,7 +20,6 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Component; import java.util.concurrent.atomic.AtomicLong; @@ -54,8 +49,7 @@ public class RemoteDesignNetWorkTablePane extends JPanel { model.addRow(new Object[]{ count.incrementAndGet(), dateFormat(requestInfo.getDate()), - requestInfo.getHttpMethod() + " " - + requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1), + requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1), requestInfo.getStatus(), simpleTime(requestInfo.getConsume()), simpleSize(requestInfo.getRequestSize()), @@ -131,29 +125,9 @@ public class RemoteDesignNetWorkTablePane extends JPanel { jToolBar.add(forbid); jToolBar.add(remove); jToolBar.add(refresh); - tip(jToolBar); add(jToolBar, BorderLayout.NORTH); } - private void tip(JToolBar jToolBar) { - JLabel jLabel = new JLabel(); - jLabel.setForeground(Color.ORANGE); - jToolBar.addSeparator(); - jToolBar.add(jLabel); - setTipIfNeed(jLabel); - EventDispatcher.listen(WorkspaceEvent.AfterSwitch, new Listener() { - @Override - public void on(Event event, Workspace workspace) { - setTipIfNeed(jLabel); - } - }); - } - - private static void setTipIfNeed(JLabel jLabel) { - UIUtil.invokeLaterIfNeeded(() -> jLabel.setText( - WorkContext.getCurrent().isLocal() ? "Remote Design NetWork can't show on local environment." : "")); - } - /** * 清理监听 */ diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java index a7eeb3ba53..dc70031db6 100644 --- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java @@ -776,7 +776,8 @@ public class MultiTemplateTabPane extends Row { // 双击添加模板 if (e.getClickCount() == DOUBLE_CLICK && isOverBlank(e.getX()) - && newTemplateAction != null) { + && newTemplateAction != null + ) { newTemplateAction.actionPerformed(null); } }