REPORT-41479 设计器参数界面宽度无法拖动

designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

@@ -30,6 +30,7 @@ import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.FormArea;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormDesignerModeForSpecial;
+import com.fr.design.mainframe.FormDesignerUI;
 import com.fr.design.mainframe.FormParaPane;
 import com.fr.design.mainframe.FormWidgetDetailPane;
 import com.fr.design.mainframe.JTemplate;
@@ -58,6 +59,7 @@ import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.Insets;
 import java.awt.Rectangle;
+import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -467,6 +469,21 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         return ((FormParameterUI) getTarget()).getDesignSize();
     }
 
+    /**
+     * 设置其UI类为DesignerUI，负责渲染
+     */
+    @Override
+    public void updateUI() {
+        setUI(new FormDesignerUI(){
+            @Override
+            protected Rectangle getFitPaintBounds(Component component, Component parent) {
+                return new Rectangle(0, 0, parent.getSize().width, parent.getSize().height);
+            }
+
+        });
+    }
+
+
     /**
      * 设置高度
      *
@@ -722,4 +739,11 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         return new JComponent[]{new CutAction(this).createToolBarComponent(), new CopyAction(this).createToolBarComponent(), new PasteAction(this).createToolBarComponent(),
                 new FormDeleteAction(this).createToolBarComponent()};
     }
+
+    @Override
+    public boolean checkIfBeyondValidArea(MouseEvent e){
+        return false;
+    }
+
+
 }

designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@@ -166,7 +166,7 @@ public class EditingMouseListener extends MouseInputAdapter {
             // 获取焦点，以便获取热键
             designer.requestFocus();
         }
-        if (e.getButton() == MouseEvent.BUTTON1 && !beyondValidArea(e)) {
+        if (e.getButton() == MouseEvent.BUTTON1 && !designer.checkIfBeyondValidArea(e)) {
 
             Direction dir = selectionModel.getDirectionAt(e);
             if (!DesignerMode.isAuthorityEditing()) {
@@ -194,15 +194,6 @@ public class EditingMouseListener extends MouseInputAdapter {
         e.translatePoint(oldX - e.getX(), oldY - e.getY());
     }
 
-    private boolean beyondValidArea(MouseEvent e) {
-        if (e.getX() < 0 || e.getY() < 0 ||
-                e.getX() > designer.getRootComponent().getWidth() ||
-                e.getY() > (designer.getRootComponent().getHeight() + designer.getParaHeight())) {
-            return true;
-        }
-        return false;
-    }
-    
     private void offsetEventPoint(MouseEvent e){
         int x = designer.getRelativeX(e.getX());
         int y = designer.getRelativeY(e.getY());

designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@@ -1733,4 +1733,13 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         return (int) (this.getArea().getVerticalValue() / this.scale);
     }
 
+    public boolean checkIfBeyondValidArea(MouseEvent e){
+        if (e.getX() < 0 || e.getY() < 0 ||
+                e.getX() > this.getRootComponent().getWidth() ||
+                e.getY() > (this.getRootComponent().getHeight() + this.getParaHeight())) {
+            return true;
+        }
+        return false;
+    }
+
 }

designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java

@@ -424,12 +424,8 @@ public class FormDesignerUI extends ComponentUI {
         // 禁止双缓冲
         ComponentUtils.disableBuffer(component, dbcomponents);
         Graphics clipg;
-        clipg = g.create(
+        Rectangle clipgBounds = getFitPaintBounds(component, parent);
-                -designer.getHorizontalScaleValue(),
+        clipg = g.create(clipgBounds.x, clipgBounds.y, clipgBounds.width, clipgBounds.height);
-                -designer.getVerticalScaleValue() + designer.getParaHeight(),
-                component.getSize().width + designer.getHorizontalScaleValue(),
-                component.getSize().height + designer.getVerticalScaleValue());
-
         designer.paintContent(clipg);
         paintWatermark((Graphics2D) clipg);
         clipg.dispose();
@@ -439,6 +435,13 @@ public class FormDesignerUI extends ComponentUI {
         designer.resetEditorComponentBounds();
     }
 
+    protected Rectangle getFitPaintBounds(Component component, Component parent) {
+        return new Rectangle(-designer.getHorizontalScaleValue(),
+                -designer.getVerticalScaleValue() + designer.getParaHeight(),
+                component.getSize().width + designer.getHorizontalScaleValue(),
+                component.getSize().height + designer.getVerticalScaleValue());
+    }
+
     /**
      * 画参数面板
      */