Merge pull request #4790 in DESIGN/design from final/10.0 to persist/10.0

* commit '1ce361aa74aa9ca6afbf4a4ced9d0c4784934a5a':
  REPORT-54574 远程设计环境不一致提示内容中，性能插件下的六个包被分别识别为了插件
  REPORT-54529 插件兼容问题
  REPORT-54454 设置边距时后，封面图边框显示有偏移
  之前漏传了一张图片

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<String> 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;

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;
         }

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() {
+	public boolean isHelpBtnOnFocus() {
-		return isShareConfigButtonFocus;
+		return isHelpBtnOnFocus;
 	}
 
-	public void setShareConfigButtonFocus(boolean shareConfigButtonFocus) {
+	public void setHelpBtnOnFocus(boolean isHelpBtnOnFocus) {
-		isShareConfigButtonFocus = shareConfigButtonFocus;
+		this.isHelpBtnOnFocus = isHelpBtnOnFocus;
 	}
 
 
@@ -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();
 		}
 	}

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);

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;
         }

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;
 		}

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));
         }

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);