Merge pull request #4786 in DESIGN/design from final/10.0 to release/10.0

* commit '6bd603222ff0b22e2f9dc6b21c71d553292c54a1':
  REPORT-54529 插件兼容问题
  REPORT-54454 设置边距时后，封面图边框显示有偏移

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