From 95f3f7f12050ea5d884bab17c9eb330f04996934 Mon Sep 17 00:00:00 2001 From: pengda Date: Tue, 20 Apr 2021 16:27:55 +0800 Subject: [PATCH 01/11] =?UTF-8?q?REPORT-51162=20=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=99=90=E5=88=B6=E5=A4=B1=E6=95=88=20&=20RE?= =?UTF-8?q?PORT-51260=20redshift=E7=9A=84=E7=89=B9=E5=AE=9Aurl=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=97=A0=E6=B3=95=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/datapane/connect/JDBCDefPane.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index 18681ca186..4331828238 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -51,9 +51,10 @@ public class JDBCDefPane extends JPanel { public static final String DRIVER_TYPE = "driver_type"; public static final String USER_NAME = "user_name"; private static final String OTHER_DB = "Others"; - private static final Pattern ORACLE_URL = Pattern.compile("^jdbc:oracle:thin:@[/]*([0-9a-zA-Z_\\.]+)(:([0-9]+|port))?([:/](.*))?.*", Pattern.CASE_INSENSITIVE); - private static final Pattern GENERAL_URL = Pattern.compile("^jdbc:(mysql|sqlserver|db2|derby|postgresql|inceptor|inceptor2|hive2)://([0-9a-zA-Z_\\.]+)(:([0-9]+|port))?((/|;DatabaseName=)(.*))?.*", Pattern.CASE_INSENSITIVE); + private static final Pattern ORACLE_URL = Pattern.compile("^jdbc:oracle:thin:@[/]*([-0-9a-zA-Z_\\.]+)(:([0-9]+|port))?([:/](.*))?.*", Pattern.CASE_INSENSITIVE); + private static final Pattern GENERAL_URL = Pattern.compile("^jdbc:(mysql|sqlserver|db2|derby|postgresql|inceptor|inceptor2|hive2)://([-0-9a-zA-Z_\\.]+)(:([0-9]+|port))?((/|;DatabaseName=)(.*))?.*", Pattern.CASE_INSENSITIVE); private static final Pattern PORT = Pattern.compile("^0$|^[1-9][\\d]*[\\d]*$"); + private static final Pattern CHAR_NEED_ESCAPE = Pattern.compile("[?|$^*\\\\\\[\\](){}.+]"); // 编码转换. private String originalCharSet = null; private static Map jdbcMap = new HashMap(); @@ -389,6 +390,9 @@ public class JDBCDefPane extends JPanel { InputMethodListener portInputMethodListener = new InputMethodListener() { @Override public void inputMethodTextChanged(InputMethodEvent event) { + if (null == event.getText()) { + return; + } char ch = event.getText().current(); if (!(ch >= '0' && ch <= '9')) { event.consume(); @@ -484,13 +488,13 @@ public class JDBCDefPane extends JPanel { KeyListener portKeyListener = new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - String port = portTextField.getText().trim(); + String port = portTextField.getText(); if (isPortValid(port)) { updateURL(); } else { - portTextField.setText(port.replaceAll(e.getKeyChar() + "", "")); + portTextField.setText(port.replaceAll(getCharNeedReplace(e.getKeyChar()) , "")); if (!isPortValid(portTextField.getText())) { - portTextField.setText(""); + portTextField.setText(StringUtils.EMPTY); updateURL(); } } @@ -501,6 +505,15 @@ public class JDBCDefPane extends JPanel { return PORT.matcher(port).find(); } + private String getCharNeedReplace(char c) { + String charNeedReplace = c + ""; + Matcher matcher = CHAR_NEED_ESCAPE.matcher(charNeedReplace); + if (matcher.find()) { + charNeedReplace = "\\" + charNeedReplace; + } + return charNeedReplace; + } + DocumentListener updateURLListener = new DocumentListener() { @Override From 8cb25024fd09f40cce2892456f17f67724f95041 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Tue, 20 Apr 2021 17:35:50 +0800 Subject: [PATCH 02/11] =?UTF-8?q?REPORT-51199=20=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E9=A2=84=E8=A7=88=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/images/m_file/preview_disabled.svg | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/preview_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/preview_disabled.svg index 217f23e156..6f2c4afa1f 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_file/preview_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/preview_disabled.svg @@ -1,11 +1,7 @@ - - icon_报表web属性_打印预览_normal - - - - - - + + icon_预览_disabled + + - + \ No newline at end of file From 9a8d4a66d71e28df762d47f43634175eab1d2377 Mon Sep 17 00:00:00 2001 From: lucian Date: Tue, 20 Apr 2021 18:16:19 +0800 Subject: [PATCH 03/11] =?UTF-8?q?REPORT-50908=20=E5=A1=AB=E6=8A=A5-?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE-?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E5=B1=9E=E6=80=A7=E4=B8=AD=E5=AF=B9=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9A=E4=BD=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/gui/icombobox/SearchPreTaskTreeComboBox.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/SearchPreTaskTreeComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/SearchPreTaskTreeComboBox.java index 9e453471ef..9ee2a59495 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/SearchPreTaskTreeComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/SearchPreTaskTreeComboBox.java @@ -1,5 +1,6 @@ package com.fr.design.gui.icombobox; +import com.fr.design.ui.util.UIUtil; import com.fr.log.FineLoggerFactory; import javax.swing.JTree; @@ -64,7 +65,12 @@ public class SearchPreTaskTreeComboBox extends FRTreeComboBox { // 任务执行后置空，否则会被别的操作重复触发 setPreSearchTask(null); } - search(); + UIUtil.invokeLaterIfNeeded(new Runnable() { + @Override + public void run() { + search(); + } + }); return null; } }.execute(); From 9abed876cd2355a8cda9ab917b4749f616e721cc Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 20 Apr 2021 19:59:28 +0800 Subject: [PATCH 04/11] =?UTF-8?q?CHART-18997=20=E5=A4=84=E7=90=86=E4=B8=8B?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=A8=A1=E6=9D=BF=E5=87=BA=E9=94=99=E6=97=B6?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/file/EditEnvAction.java | 11 +++++ .../design/actions/file/SwitchExistEnv.java | 12 ++++- .../design/dialog/link/MessageWithLink.java | 49 ++++++++++++------- .../fr/design/mainframe/DesktopCardPane.java | 29 +++++++++-- .../mainframe/EastRegionContainerPane.java | 2 +- .../com/fr/design/mainframe/JTemplate.java | 11 ++++- .../fr/design/mainframe/OpenLoadingPane.java | 5 +- .../main/java/com/fr/design/menu/MenuDef.java | 2 +- .../com/fr/design/worker/open/OpenWorker.java | 44 +++++++++++++++-- 9 files changed, 136 insertions(+), 29 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java b/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java index a4b7c88034..d007e315fe 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java @@ -3,6 +3,8 @@ package com.fr.design.actions.file; import com.fr.design.EnvChangeEntrance; import com.fr.design.actions.UpdateAction; +import com.fr.design.file.HistoryTemplateListCache; +import com.fr.design.mainframe.JTemplate; import java.awt.event.ActionEvent; @@ -17,4 +19,13 @@ public class EditEnvAction extends UpdateAction { public void actionPerformed(ActionEvent e) { EnvChangeEntrance.getInstance().chooseEnv(); } + + @Override + public void update() { + super.update(); + JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); + if (template != null) { + this.setEnabled(!template.isSaving()); + } + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index bc88f72fd0..c59a92b975 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -1,10 +1,11 @@ package com.fr.design.actions.file; -import com.fr.base.svg.IconUtils; import com.fr.design.DesignerEnvManager; import com.fr.design.EnvChangeEntrance; import com.fr.design.actions.UpdateAction; import com.fr.design.env.DesignerWorkspaceInfo; +import com.fr.design.file.HistoryTemplateListCache; +import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.KeySetUtils; import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; @@ -68,5 +69,14 @@ public class SwitchExistEnv extends MenuDef { EnvChangeEntrance.getInstance().switch2Env(envName); } } + + @Override + public void update() { + super.update(); + JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); + if (template != null) { + this.setEnabled(!template.isSaving()); + } + } } } diff --git a/designer-base/src/main/java/com/fr/design/dialog/link/MessageWithLink.java b/designer-base/src/main/java/com/fr/design/dialog/link/MessageWithLink.java index 8a1f55cbdf..889a0c3c9c 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/link/MessageWithLink.java +++ b/designer-base/src/main/java/com/fr/design/dialog/link/MessageWithLink.java @@ -9,6 +9,7 @@ import java.awt.Font; import java.net.URI; import javax.swing.JEditorPane; import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; /** * 用来构建JOptionPane带超链的消息提示 @@ -19,31 +20,45 @@ import javax.swing.event.HyperlinkEvent; */ public class MessageWithLink extends JEditorPane { + private static final UILabel LABEL = new UILabel(); + + public MessageWithLink(String message, String linkName, String link) { - super("text/html", "" + message + "" + linkName + "" + ""); - addHyperlinkListener(e -> { - if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) { - try { - Desktop.getDesktop().browse(URI.create(link)); - } catch (Exception exception) { - FineLoggerFactory.getLogger().error(exception.getMessage(), exception); - } - } - }); - setEditable(false); - setBorder(null); + this(message, linkName, link, LABEL.getBackground(), LABEL.getFont()); } public MessageWithLink(String linkName, String link ) { this(StringUtils.EMPTY, linkName, link); } - private static StringBuilder getStyle() { - // 构建和相同风格样式 - UILabel label = new UILabel(); - Font font = label.getFont(); - Color color = label.getBackground(); + public MessageWithLink(String message, String linkName, String link, Color color) { + this(message, linkName, link, color, LABEL.getFont()); + } + + public MessageWithLink(String message, String linkName, String link, Color color, Font font) { + super("text/html", "" + message + "" + linkName + "" + ""); + initListener(link); + setEditable(false); + setBorder(null); + } + + protected void initListener(String link) { + addHyperlinkListener(new HyperlinkListener() { + @Override + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) { + try { + Desktop.getDesktop().browse(URI.create(link)); + } catch (Exception exception) { + FineLoggerFactory.getLogger().error(exception.getMessage(), exception); + } + } + } + }); + } + private static StringBuilder generateStyle(Color color, Font font) { + // 构建相同风格样式 StringBuilder style = new StringBuilder("font-family:" + font.getFamily() + ";"); style.append("font-weight:").append(font.isBold() ? "bold" : "normal").append(";"); style.append("font-size:").append(font.getSize()).append("pt;"); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java index f940f89045..a2cc6f8065 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java @@ -21,10 +21,16 @@ import javax.swing.JLayeredPane; */ public class DesktopCardPane extends BasicPane implements TargetModifiedListener { + private static final int CONTENT_LAYER = 0; + private static final int TRANSPARENT_LAYER = 1; + private static final int LOADING_LAYER = 2; + private static final int FAILED_LAYER = 3; + private static final long serialVersionUID = 1L; private JTemplate component; private TransparentPane transparentPane = new TransparentPane(); private OpenLoadingPane loadingPane = new OpenLoadingPane(); + private OpenFailedPane failedPane = new OpenFailedPane(); private JLayeredPane layeredPane = new JLayeredPane() { @Override public void doLayout() { @@ -36,8 +42,9 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener protected DesktopCardPane() { setLayout(new BorderLayout()); - layeredPane.add(transparentPane, 1); - layeredPane.add(loadingPane, 2); + layeredPane.add(transparentPane, TRANSPARENT_LAYER); + layeredPane.add(failedPane, FAILED_LAYER); + add(layeredPane, BorderLayout.CENTER); } protected void showJTemplate(final JTemplate jt) { @@ -53,7 +60,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener layeredPane.remove(component); } component = jt; - layeredPane.add(component, 0); + layeredPane.add(component, CONTENT_LAYER); checkSavingAndOpening(jt); add(layeredPane, BorderLayout.CENTER); validate(); @@ -69,18 +76,34 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener showCover(); } else if (jt.isOpening()) { showOpenStatus(); + } else if (jt.isOpenFailed()) { + showOpenFailedCover(); } else { hideCover(); } } + /** + * 让loadingPane懒加载 + */ + private void checkLoadingPane() { + if (layeredPane.getComponent(LOADING_LAYER) != loadingPane) { + layeredPane.add(loadingPane, LOADING_LAYER); + } + } + private void showOpenStatus() { DesignerContext.getDesignerFrame().refreshUIToolBar(); DesignerFrameFileDealerPane.getInstance().stateChange(); EastRegionContainerPane.getInstance().updateAllPropertyPane(); + checkLoadingPane(); layeredPane.moveToFront(loadingPane); } + public void showOpenFailedCover() { + layeredPane.moveToFront(failedPane); + } + public void showCover() { layeredPane.moveToFront(transparentPane); DesignerContext.getDesignerFrame().refreshUIToolBar(); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java index 8097d02f40..3bf9848de2 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java @@ -794,7 +794,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public void setEnabled(boolean isEnabled) { JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); if (template != null) { - this.isEnabled = isEnabled && !template.isOpening() && !template.isSaving(); + this.isEnabled = isEnabled && template.checkEnable(); } else { this.isEnabled = isEnabled; } 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 b374dbbf97..8d526971cb 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 @@ -115,6 +115,7 @@ public abstract class JTemplate> protected TimeConsumeTimer consumeTimer = new TimeConsumeTimer(); private volatile boolean saving = false; private volatile boolean opening = false; + private volatile boolean openFailed = false; private PluginEventListener pluginListener; @@ -1585,8 +1586,16 @@ public abstract class JTemplate> this.opening = opening; } + public boolean isOpenFailed() { + return openFailed; + } + + public void setOpenFailed(boolean openFailed) { + this.openFailed = openFailed; + } + public boolean checkEnable() { - return !isSaving() && !isOpening(); + return !isSaving() && !isOpening() && !isOpenFailed(); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java b/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java index 5a81319739..9ee095c996 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java @@ -1,7 +1,6 @@ package com.fr.design.mainframe; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.IOUtils; import java.awt.Color; import java.awt.Component; import java.awt.Container; @@ -17,6 +16,8 @@ import javax.swing.JPanel; */ public class OpenLoadingPane extends JPanel { + private static final ImageIcon LOADING_ICON = new ImageIcon(OpenLoadingPane.class.getResource("/com/fr/design/images/mainframe/loading.gif")); + private UILabel loadingLabel; public OpenLoadingPane() { @@ -53,7 +54,7 @@ public class OpenLoadingPane extends JPanel { } }); setBackground(Color.WHITE); - loadingLabel = new UILabel(new ImageIcon(IOUtils.readImage("com/fr/plugin/chart/vanchart/export/loading.png"))); + loadingLabel = new UILabel(LOADING_ICON); add(loadingLabel); } diff --git a/designer-base/src/main/java/com/fr/design/menu/MenuDef.java b/designer-base/src/main/java/com/fr/design/menu/MenuDef.java index 55b80c0ec8..cee1658b91 100644 --- a/designer-base/src/main/java/com/fr/design/menu/MenuDef.java +++ b/designer-base/src/main/java/com/fr/design/menu/MenuDef.java @@ -411,7 +411,7 @@ public class MenuDef extends ShortCut { JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); boolean flag = true; if (template != null) { - flag = !template.isSaving() && !template.isOpening(); + flag = template.checkEnable(); } component.setEnabled(flag); if (!flag) { diff --git a/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java b/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java index f166020513..2da4d335ec 100644 --- a/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java +++ b/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java @@ -1,11 +1,15 @@ package com.fr.design.worker.open; +import com.fr.chart.exception.ChartNotFoundException; +import com.fr.design.dialog.FineJOptionPane; import com.fr.design.file.HistoryTemplateListCache; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrameFileDealerPane; import com.fr.design.mainframe.EastRegionContainerPane; import com.fr.design.mainframe.JTemplate; import com.fr.design.worker.WorkerManager; +import com.fr.exception.DecryptTemplateException; import com.fr.file.FILE; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; @@ -13,7 +17,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.CancellationException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import javax.swing.JOptionPane; import javax.swing.SwingWorker; +import javax.swing.UIManager; /** * 模板打开的worker @@ -54,11 +60,34 @@ public class OpenWorker extends SwingWorker { result = get(); } catch (CancellationException ignored) { return; - } catch (Exception e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); + } catch (Throwable t) { + processFailed(); + Throwable cause = t.getCause(); + if (cause instanceof DecryptTemplateException) { + FineJOptionPane.showMessageDialog( + DesignerContext.getDesignerFrame(), + Toolkit.i18nText("Fine-Design_Encrypt_Decrypt_Exception"), + Toolkit.i18nText("Fine-Design_Basic_Alert"), + JOptionPane.WARNING_MESSAGE, + UIManager.getIcon("OptionPane.errorIcon") + ); + } + if (cause instanceof ChartNotFoundException) { + FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), + Toolkit.i18nText("Fine-Design_Chart_Not_Found_Exception"), + Toolkit.i18nText("Fine-Design_Basic_Error"), + JOptionPane.ERROR_MESSAGE, + UIManager.getIcon("OptionPane.errorIcon")); + } + FineLoggerFactory.getLogger().error(t.getMessage(), t); + return; } - this.template.setOpening(false); // 后续动作 + processResult(); + } + + private void processResult() { + this.template.setOpening(false); if (slowly && templateCallable != null) { try { JTemplate book = templateCallable.call(); @@ -89,6 +118,15 @@ public class OpenWorker extends SwingWorker { WorkerManager.getInstance().removeWorker(taskName); } + private void processFailed() { + this.template.setOpenFailed(true); + this.template.setOpening(false); + DesignerContext.getDesignerFrame().getCenterTemplateCardPane().showOpenFailedCover(); + DesignerFrameFileDealerPane.getInstance().stateChange(); + WorkerManager.getInstance().removeWorker(taskName); + + } + public void addCallBack(Callable> templateCallable) { this.templateCallable = templateCallable; } From 907e2957afe37bad882a49c5d1ae6dd1dfeb2f33 Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 20 Apr 2021 20:06:24 +0800 Subject: [PATCH 05/11] =?UTF-8?q?CHART-18997=20=E5=A4=84=E7=90=86=E4=B8=8B?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=A8=A1=E6=9D=BF=E5=87=BA=E9=94=99=E6=97=B6?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/OpenFailedPane.java | 92 ++++++++++++++++++ .../fr/design/images/mainframe/loading.gif | Bin 0 -> 17443 bytes .../design/images/mainframe/open_failed.png | Bin 0 -> 2550 bytes 3 files changed, 92 insertions(+) create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/OpenFailedPane.java create mode 100644 designer-base/src/main/resources/com/fr/design/images/mainframe/loading.gif create mode 100644 designer-base/src/main/resources/com/fr/design/images/mainframe/open_failed.png diff --git a/designer-base/src/main/java/com/fr/design/mainframe/OpenFailedPane.java b/designer-base/src/main/java/com/fr/design/mainframe/OpenFailedPane.java new file mode 100644 index 0000000000..101585abb3 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/mainframe/OpenFailedPane.java @@ -0,0 +1,92 @@ +package com.fr.design.mainframe; + +import com.fr.design.dialog.link.MessageWithLink; +import com.fr.design.file.HistoryTemplateListCache; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.i18n.Toolkit; +import com.fr.general.IOUtils; +import com.fr.stable.StringUtils; +import java.awt.Color; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.LayoutManager; +import javax.swing.JPanel; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; + +/** + * @author hades + * @version 10.0 + * Created by hades on 2021/4/20 + */ +public class OpenFailedPane extends JPanel { + + private UILabel label; + private MessageWithLink link; + + public OpenFailedPane() { + this.setLayout(new LayoutManager() { + @Override + public void addLayoutComponent(String name, Component comp) { + + } + + @Override + public void removeLayoutComponent(Component comp) { + + } + + @Override + public Dimension preferredLayoutSize(Container parent) { + return parent.getPreferredSize(); + } + + @Override + public Dimension minimumLayoutSize(Container parent) { + return null; + } + + @Override + public void layoutContainer(Container parent) { + int width = parent.getParent().getWidth(); + int height = parent.getParent().getHeight(); + int labelWidth = label.getPreferredSize().width; + int labelHeight = label.getPreferredSize().height; + int labelX = (width - labelWidth) / 2; + int labelY = (height - labelHeight) / 2; + int linkWidth = link.getPreferredSize().width; + int linkHeight = link.getPreferredSize().height; + int linkX = (width - linkWidth) / 2; + int linkY = (height - labelHeight) / 2 + labelHeight; + label.setBounds(labelX, labelY, labelWidth, labelHeight); + link.setBounds(linkX, linkY, linkWidth, linkHeight); + } + }); + this.setBackground(Color.WHITE); + label = new UILabel(IOUtils.readIcon("/com/fr/design/images/mainframe/open_failed.png"), UILabel.CENTER); + link = new MessageWithLink(Toolkit.i18nText("Fine-Design_Open_Failed_Tip"), Toolkit.i18nText("Fine-Design_Open_Failed_Retry"), StringUtils.EMPTY, Color.WHITE) { + @Override + protected void initListener(String link) { + addHyperlinkListener(new HyperlinkListener() { + @Override + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) { + // 重试 + JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); + template = JTemplateFactory.createJTemplate(template.getEditingFILE()); + DesignerContext.getDesignerFrame().addAndActivateJTemplate(template); + HistoryTemplateListCache.getInstance(). setCurrentEditingTemplate(template); + } + } + }); + } + }; + link.setBackground(Color.WHITE); + this.add(label); + this.add(link); + } + + + +} diff --git a/designer-base/src/main/resources/com/fr/design/images/mainframe/loading.gif b/designer-base/src/main/resources/com/fr/design/images/mainframe/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..c77b4fe1006d29f61dddeb03fa96d3614184947c GIT binary patch literal 17443 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 G Date: Wed, 21 Apr 2021 10:57:51 +0800 Subject: [PATCH 06/11] =?UTF-8?q?REPORT-51292=20mongodb=E6=8F=92=E4=BB=B6-?= =?UTF-8?q?feature=E5=88=86=E6=94=AF=E4=B8=8B=E7=82=B9=E5=87=BB=E7=A1=AE?= =?UTF-8?q?=E5=AE=9A=E5=90=8E=E4=BF=9D=E5=AD=98=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datapane/connect/DatabaseConnectionPane.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index 3e1e1f5315..61988cc69a 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -73,6 +73,7 @@ public abstract class DatabaseConnectionPane Date: Wed, 21 Apr 2021 11:48:37 +0800 Subject: [PATCH 07/11] =?UTF-8?q?REPORT-47952=20=E5=85=AC=E5=BC=8F?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=AD=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=8E=B7=E5=8F=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/DesignModelAdapter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java b/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java index 7a237ffb59..04fcd5144f 100644 --- a/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java @@ -283,6 +283,9 @@ public abstract class DesignModelAdapter map, Filter filter) { + + // 兼容下通过老数据集参数获取 + tableDataParameters = getLatestTableDataParameters(); // 处理初始化添加 if (tableDataParametersMap.isEmpty()) { From b72d94b00377a0dfe844b2470e3127ecc525f3cf Mon Sep 17 00:00:00 2001 From: lucian Date: Wed, 21 Apr 2021 15:25:16 +0800 Subject: [PATCH 08/11] =?UTF-8?q?REPORT-50908=20=E5=A1=AB=E6=8A=A5-?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE-?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E5=B1=9E=E6=80=A7=E4=B8=AD=E5=AF=B9=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9A=E4=BD=8D=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/data/datapane/ChoosePane.java | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java index 6460cadb9e..2a8446f893 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java @@ -1,7 +1,6 @@ package com.fr.design.data.datapane; import com.fr.base.TableData; -import com.fr.concurrent.NamedThreadFactory; import com.fr.data.core.DataCoreUtils; import com.fr.data.core.db.DBUtils; import com.fr.data.core.db.TableProcedure; @@ -18,7 +17,7 @@ import com.fr.design.data.datapane.preview.PreviewLabel.Previewable; import com.fr.design.data.datapane.preview.PreviewTablePane; import com.fr.design.data.tabledata.Prepare4DataSourceChange; import com.fr.design.dialog.FineJOptionPane; -import com.fr.design.gui.icombobox.SearchPreTaskTreeComboBox; +import com.fr.design.gui.icombobox.FRTreeComboBox; import com.fr.design.gui.icombobox.FilterableComboBoxModel; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxEditor; @@ -60,10 +59,6 @@ import java.util.Collection; import java.util.Enumeration; import java.util.List; import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.FutureTask; /** * @author zhou @@ -85,25 +80,20 @@ public class ChoosePane extends BasicBeanPane implements Refresha /** * 表名 */ - protected SearchPreTaskTreeComboBox tableNameComboBox; + protected FRTreeComboBox tableNameComboBox; private SwingWorker populateWorker; - private static final ExecutorService SERVICE = Executors.newSingleThreadExecutor(new NamedThreadFactory("ChoosePaneThread")); - private PopupMenuListener popupMenuListener = new PopupMenuListener() { @Override public void popupMenuWillBecomeVisible(PopupMenuEvent e) { - FutureTask task = new FutureTask(new Callable() { + new Thread() { @Override - public Object call() { + public void run() { calculateTableDataNames(); - return null; } - }); - SERVICE.submit(task); - tableNameComboBox.setPreSearchTask(task); + }.start(); } @Override @@ -167,7 +157,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha schemaBox = new StringUIComboBox(); schemaBox.setEditor(new ComboBoxEditor()); - tableNameComboBox = new SearchPreTaskTreeComboBox(new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer, false); + tableNameComboBox = new FRTreeComboBox(new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer, false); tableNameComboBox.setEditable(true); tableNameComboBox.setRenderer(listCellRenderer); registerDSChangeListener(); From e8a70ea8bf01de9cb99a8a0b468a21d883ee50fb Mon Sep 17 00:00:00 2001 From: shine Date: Thu, 22 Apr 2021 14:20:43 +0800 Subject: [PATCH 09/11] =?UTF-8?q?CHART-18997design=20=E8=A1=A8=E5=8D=95=20?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=9B=BE=E8=A1=A8=E5=9B=BE=E8=A1=A8=E5=9D=97?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E5=A4=B1=E8=B4=A5=20=E4=B8=8D=E5=90=9E?= =?UTF-8?q?=E6=8A=9B=E9=94=99rethrow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/DesignerFrame.java | 2 +- .../main/java/com/fr/design/worker/open/OpenWorker.java | 9 +++++---- .../main/java/com/fr/design/mainframe/app/CptApp.java | 2 +- .../main/java/com/fr/design/mainframe/app/CptxApp.java | 2 +- .../main/java/com/fr/design/mainframe/app/FormApp.java | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java index b66e6046bf..abedf38805 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java @@ -4,7 +4,7 @@ package com.fr.design.mainframe; import com.fr.base.BaseUtils; -import com.fr.chart.exception.ChartNotFoundException; +import com.fr.base.chart.exception.ChartNotFoundException; import com.fr.design.DesignModelAdapter; import com.fr.design.DesignState; import com.fr.design.DesignerEnvManager; diff --git a/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java b/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java index 2da4d335ec..f556eb612e 100644 --- a/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java +++ b/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java @@ -1,6 +1,6 @@ package com.fr.design.worker.open; -import com.fr.chart.exception.ChartNotFoundException; +import com.fr.base.chart.exception.ChartNotFoundException; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.i18n.Toolkit; @@ -13,13 +13,14 @@ import com.fr.exception.DecryptTemplateException; import com.fr.file.FILE; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; + +import javax.swing.JOptionPane; +import javax.swing.SwingWorker; +import javax.swing.UIManager; import java.util.concurrent.Callable; import java.util.concurrent.CancellationException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.swing.JOptionPane; -import javax.swing.SwingWorker; -import javax.swing.UIManager; /** * 模板打开的worker diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java index b55640990a..5733151c16 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java @@ -3,9 +3,9 @@ package com.fr.design.mainframe.app; import com.fr.base.BaseUtils; import com.fr.base.Style; import com.fr.base.TempNameStyle; +import com.fr.base.chart.exception.ChartNotFoundException; import com.fr.base.extension.FileExtension; import com.fr.base.io.XMLEncryptUtils; -import com.fr.chart.exception.ChartNotFoundException; import com.fr.config.ServerPreferenceConfig; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.server.StyleListAction; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java index c7411e942f..95104e2f8e 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java @@ -1,9 +1,9 @@ package com.fr.design.mainframe.app; +import com.fr.base.chart.exception.ChartNotFoundException; import com.fr.base.extension.FileExtension; import com.fr.base.frpx.exception.FRPackageRunTimeException; import com.fr.base.frpx.exception.InvalidWorkBookException; -import com.fr.chart.exception.ChartNotFoundException; import com.fr.design.i18n.Toolkit; import com.fr.exception.DecryptTemplateException; import com.fr.exception.RemoteDesignPermissionDeniedException; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java index 6f801e058c..616d4be079 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java @@ -1,8 +1,8 @@ package com.fr.design.mainframe.app; import com.fr.base.Parameter; +import com.fr.base.chart.exception.ChartNotFoundException; import com.fr.base.io.XMLEncryptUtils; -import com.fr.chart.exception.ChartNotFoundException; import com.fr.design.DesignerEnvManager; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.AbstractAppProvider; From 1a028c69f12910ccccd58db15560fc0b9393ad0c Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 23 Apr 2021 10:36:48 +0800 Subject: [PATCH 10/11] =?UTF-8?q?REPORT-51446=20=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E8=A1=A8=E5=90=AF=E5=8A=A8=E8=AE=BE=E8=AE=A1=E5=99=A8=E4=BC=9A?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=B9=B6=E9=97=AA=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/start/BaseDesigner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/start/BaseDesigner.java b/designer-base/src/main/java/com/fr/start/BaseDesigner.java index 5eaab74a52..b3945d0d7f 100644 --- a/designer-base/src/main/java/com/fr/start/BaseDesigner.java +++ b/designer-base/src/main/java/com/fr/start/BaseDesigner.java @@ -155,7 +155,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { isException = true;//此时有文件nullpointer异常，执行打开空文件 } } - if (file.exists() && !isException) { + if (file != null && file.exists() && !isException) { df.openTemplate(file); } else { df.addAndActivateJTemplate(); From fb0d6575de14889736788e0819b4e0d528989cae Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 23 Apr 2021 14:59:09 +0800 Subject: [PATCH 11/11] =?UTF-8?q?REPORT-51317=20=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=EF=BC=8C=E4=BF=9D=E5=AD=98=E4=B8=AD?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=8A=A8=E7=94=BB=E8=BF=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/worker/save/SaveWorker.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java b/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java index 2ce5089705..f6c21f208d 100644 --- a/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java +++ b/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java @@ -52,13 +52,19 @@ public class SaveWorker extends SwingWorker { try { success = get(); } catch (Exception e) { + processResult(); FineLoggerFactory.getLogger().error(e.getMessage(), e); FineJOptionPane.showMessageDialog( DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design-Basic_Save_Failure"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.ERROR_MESSAGE); + return; } + processResult(); + } + + private void processResult() { this.template.setSaving(false); // 恢复界面 if (slowly && ComparatorUtils.equals(this.template.getName(), HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getName())) {