From f17a135216daabddc24fc2244eb0ff0a453851ca Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 25 Jun 2021 09:51:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=BC=8F=E4=BC=A0?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E5=BC=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/FormWidgetDetailPane.java | 2 +- .../fr/design/form/images/version_not_match.png | Bin 0 -> 2082 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 designer-form/src/main/resources/com/fr/design/form/images/version_not_match.png diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java index 2c47e1e07..d792f0eca 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -125,7 +125,7 @@ public class FormWidgetDetailPane extends FormDockView{ isEmptyPane = true; this.removeAll(); JPanel panel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 5); - UILabel imagePanel = new UILabel(BaseUtils.readIcon("/com/fr/base/images/share/version_not_match.png")); + UILabel imagePanel = new UILabel(BaseUtils.readIcon("/com/fr/design/form/images/version_not_match.png")); imagePanel.setPreferredSize(new Dimension(240, 96)); imagePanel.setHorizontalAlignment(SwingConstants.CENTER); panel.add(imagePanel); diff --git a/designer-form/src/main/resources/com/fr/design/form/images/version_not_match.png b/designer-form/src/main/resources/com/fr/design/form/images/version_not_match.png new file mode 100644 index 0000000000000000000000000000000000000000..cb3eeffe2e84cb89a2b3a4e86ff70a3ac8aa1b57 GIT binary patch literal 2082 zcmV+-2;KLIP)1SDJPY>_U*3fdL-Rd>COku?Y@;tQu&gTlXFf|(9qD(Xb#4F z$;Zc6cLBU<0GCY5GBr2V5XUj1D7p&Zc>rIfHy<6H&&3aG_`Qzpz;+h6(I^4KFyMAv`g;MuVbL8~1Ox^NrdT(3 z9gqk@LPS`m6}60S7@B~Fp$TXhnt+C(31}F?1d!Tg7z^vU%4xP0V#EmAt_jLKBc zmj$5_5Jgeu_fu)YurN&%pt?-Plk)3L8s(OSZm%n~wp(d$pq@XSOxftIHVO6%0<`&lEyz?uS#(zzY4x!ts#tv&2%wdr z=lSfTv3lq^pkZXihBCVjIUckKs)sm=F&vIcwO{5OKw?Oy(_z~XMq%kE&b0+m<7)zH zqC&IjIiO)^0vd)UpkZhN8ippIVF-J~W__wzTGPDGRcltKAw)nJrqN|F3r(a2+(~&Qd^L$b;=ojsgtcD zuvm%+G726c6+>-_P)|CKhkk#+S53tgW3fcG#e$1vhO%sJWE_dcAP9J`E+-PnLL7!6 zi>Q+&Mz@xLRGgGm9FSGb|JJ{n{I>gtp|TjhekZDTyC-9GB75rn4uitY22CHVca&@*AL_l8#fH zW*ta_hskG4Dltu{^nKp{P3b7^l{%Hh#E!{+leX8o{Q)Y(hEju4LwlZ=Xfi=q>^Prs zi8CT>3$Ej^eFgMeYe6NDHvD8VWs64Y^(eWub{5pwzUQ-#IWf_pRe!f5g@}zLfZCSY zg&Lk#;Y5PyUgh*&^7oF%6HKQb^P4C8B9ijzVB-i#dp$YDsmHQ)x@6rwol8cn3=cbJ zc517q8)c5Bh6(%t{hNcN@u}fgX#Sx5{j@yauSIn32vG580cv#GdP+TUUG+~#+@L?i zncbb_w5+&%*_i}HQOp=s#cFJ@6>Ws!V7%7GKPjJyBw#ogB_@jswH`U4i5>KI+8>&D;_#VFYZH)|OS;(Mb|HG? z8#ivsIM*URy`0NNPG};euJ%>|YH%_ocwRm2BSjhuyT5<-V#oIaRThg+Ejz+kIRe<^8-#2ERs^>KcqFf?N{)a)oyJe`Xx@dDhbERyQw3oV z2MOa%WxsDIzpj|)UfHXm9!wD z6R76Xj7MW;n+FeuIygMY%&#os^xQVJjJ4}bqw=UOUC3a}vjK!1!SBuk#^L^syRcjg;=3Nj9P3-o1EMO^#onOo< zJ+_k0=%nve4ob}fi&`^G1hF!v2*RIv7lcLtJwG{bP_PIqN>i;&gM|vpT#L;TY37V% zLHwL|yON=a7LB&49G`W1JkNj}>PWUMtw7EFI`4v#fmx1iNfSTGI}T{EI6nEGDSsoz z7kL+yQ$wkDniR2Y%iJhoFmalGB;!W_-{obgy_dNtQC4W;+ffwV-R}>c zYybP44PnzXjU>{70=}@I?3lknoQT(pVuFw}2VAGOLC10Yj_(KLNO0S{@aM0MeGI@0 zb@L#3?|A{wPs%8G55Q+-5-yvBuNa1LMYJYs!YADM{Y0JOlAvB`6{Xjhzg9N!rkJB? z6g&&y+lK4$J%FbvXs_%Io8%Apm&f3I*--i40C*C>UsZ0}G>6RJoP_t+T<)g;9xqZk zv#^OCF|w+?1mIE`EkqDExV(RcFS;sYlU+`5Yk|)axGv@Rmrvo9+`n2Jj+) zhqy`Lx?q0P%RdJ2Fz@w0iB@ny`8qznDw=1TaXXjQ7kRYW9pqkEQs0ovb+TrD&Ofyp z=;-Kt=Kr^ifLYuI;2r>XaU#+e9UHu-{|ew2-phXzEi8`!jV1x$KM{pjFH4ao1ONa4 M07*qoM6N<$f_InS8vp Date: Mon, 28 Jun 2021 14:26:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-54454=20=E8=AE=BE=E7=BD=AE=E8=BE=B9?= =?UTF-8?q?=E8=B7=9D=E6=97=B6=E5=90=8E=EF=BC=8C=E5=B0=81=E9=9D=A2=E5=9B=BE?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E6=98=BE=E7=A4=BA=E6=9C=89=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/designer/creator/XCreator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java index 01d53f850..98dc7f218 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java @@ -692,7 +692,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo if (coverPanel != null) { coverPanel.setVisible(display); coverPanel.setPreferredSize(editor.getPreferredSize()); - coverPanel.setBounds(editor.getBounds()); + coverPanel.setBounds(new Rectangle(0, 0 , editor.getWidth(), editor.getHeight())); editor.repaint(); } } From 1b0cc9107e167db367b97acfe97dbcb0d661769b Mon Sep 17 00:00:00 2001 From: kuangshuai Date: Mon, 28 Jun 2021 17:34:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-54529=20=E6=8F=92=E4=BB=B6=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/designer/creator/XChartEditor.java | 2 +- .../java/com/fr/design/designer/creator/XCreator.java | 10 +++++----- .../com/fr/design/designer/creator/XElementCase.java | 2 +- .../fr/design/designer/creator/XWAbsoluteLayout.java | 2 +- .../creator/cardlayout/XWCardMainBorderLayout.java | 2 +- .../com/fr/design/mainframe/EditingMouseListener.java | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java index 682dcc4d4..354a60ecb 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java @@ -255,7 +255,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator { * @param e 鼠标点击事件 */ public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e) { - if (this.isShareConfigButtonFocus()) { + if (this.isHelpBtnOnFocus()) { CoverReportPane.showShareConfig(((XCreator) this.getParent()).toData()); return; } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java index 98dc7f218..265fa3618 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java @@ -67,7 +67,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo private int[] directions; private Rectangle backupBound; private String shareId = StringUtils.EMPTY;//如果组件是共享的会有这个属性 - private boolean isShareConfigButtonFocus = false;//焦点是否在帮助按钮上 + private boolean isHelpBtnOnFocus = false;//焦点是否在帮助按钮上 private static final int SHORTS_SEPARATOR_POS = 4; // 弹出菜单分割的位置 public XCreator(Widget ob, Dimension initSize) { @@ -671,12 +671,12 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo * 焦点是否在帮助按钮上 * @return 焦点是否在帮助按钮上 */ - public boolean isShareConfigButtonFocus() { - return isShareConfigButtonFocus; + public boolean isHelpBtnOnFocus() { + return isHelpBtnOnFocus; } - public void setShareConfigButtonFocus(boolean shareConfigButtonFocus) { - isShareConfigButtonFocus = shareConfigButtonFocus; + public void setHelpBtnOnFocus(boolean isHelpBtnOnFocus) { + this.isHelpBtnOnFocus = isHelpBtnOnFocus; } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java index 9c459e986..e08cb658c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java @@ -306,7 +306,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e) { super.respondClick(editingMouseListener, e); editingMouseListener.refreshTopXCreator(); - if (this.isShareConfigButtonFocus()) { + if (this.isHelpBtnOnFocus()) { CoverReportPane.showShareConfig(((XCreator) this.getParent()).toData()); } else { switchTab(e, editingMouseListener); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java index 32273ca08..60197ba12 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java @@ -467,7 +467,7 @@ public class XWAbsoluteLayout extends XLayoutContainer { * @param e 鼠标点击事件 */ public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e) { - if (this.isShareConfigButtonFocus()) { + if (this.isHelpBtnOnFocus()) { CoverReportPane.showShareConfig(this.toData()); return; } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java index 2d5b5ba91..b2dcae61a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java @@ -358,7 +358,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout { */ @Override public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e){ - if (this.isShareConfigButtonFocus()) { + if (this.isHelpBtnOnFocus()) { CoverReportPane.showShareConfig(this.toData()); return; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java index fd1236091..931b66828 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java @@ -435,7 +435,7 @@ public class EditingMouseListener extends MouseInputAdapter { } private void processCoverMouseMove(XCreator component, MouseEvent e) { - component.setShareConfigButtonFocus(false); + component.setHelpBtnOnFocus(false); Insets insets; if (component instanceof XBorderStyleWidgetCreator) { insets = ((XBorderStyleWidgetCreator) component).getInsets(); @@ -447,7 +447,7 @@ public class EditingMouseListener extends MouseInputAdapter { } if (isShareConfigButton(e, component, insets)) { designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - component.setShareConfigButtonFocus(true); + component.setHelpBtnOnFocus(true); } else if (isEditButton(e, component, insets)) { designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } From 7352c73ba4ea88b342a20e7d3379ed36018e28ea Mon Sep 17 00:00:00 2001 From: pengda Date: Tue, 29 Jun 2021 14:21:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-54574=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E7=8E=AF=E5=A2=83=E4=B8=8D=E4=B8=80=E8=87=B4=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9=E4=B8=AD=EF=BC=8C=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=8B=E7=9A=84=E5=85=AD=E4=B8=AA=E5=8C=85?= =?UTF-8?q?=E8=A2=AB=E5=88=86=E5=88=AB=E8=AF=86=E5=88=AB=E4=B8=BA=E4=BA=86?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../versioncheck/VersionCheckUtils.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java b/designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java index e63395ff6..045d54413 100644 --- a/designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java +++ b/designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java @@ -39,6 +39,7 @@ import java.lang.reflect.Method; import java.text.ParsePosition; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -59,6 +60,21 @@ public class VersionCheckUtils { private static final String ID = "id"; private static final String VERSION = "version"; private static final String NAME = "name"; + private static final Set pluginsNeedIgnore = new HashSet<>(); + static { + pluginsNeedIgnore.addAll(Arrays.asList( + "com.fr.plugin.performance.newexecutetool", + "com.fr.plugin.performance.newline", + "com.fr.plugin.performance.pdfstream", + "com.fr.plugin.performance.dzstartemptyfile", + "com.fr.plugin.performance.treenode.button.optimization", + "com.fr.plugin.performance.druid", + "com.fr.plugin.performance.reducecalculation", + "com.fr.plugin.performance.fasttree", + "com.fr.plugin.performance.paralleldsloader", + "com.fr.plugin.cloud.analytics.v10" + )); + } public static boolean versionCheck(String envName) { @@ -236,6 +252,9 @@ public class VersionCheckUtils { continue; } String remotePluginID = remotePlugin.getString(ID); + if (pluginsNeedIgnore.contains(remotePluginID)) { + continue; + } if (localPluginsMap.containsKey(remotePluginID)) { if (ComparatorUtils.equals(localPluginsMap.get(remotePluginID).getVersion(), remotePlugin.getString(VERSION))) { continue;