Merge pull request #3235 in DESIGN/design from feature/10.0 to research/10.0

* commit 'f5e4c1caa12700562a29d93c19db76e4d916cb60':
  REPORT-46421 取消勾选后 清空下内容
  命名修改
  override
  REPORT-44733【冒烟】附件表单模板的显示会有问题

designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java

@@ -150,7 +150,7 @@ public class NumberEditorValidatePane extends JPanel {
         setMaxListener = new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                errorMsgTextFieldPane.setVisible(setMaxValueCheckBox.isSelected() || setMinValueCheckBox.isSelected());
+                refreshErrorMsgTip();
                 if (setMaxValueCheckBox.isSelected()) {
                     maxValueSpinner.setEnabled(true);
                     Double value = (double) 0;
@@ -172,7 +172,7 @@ public class NumberEditorValidatePane extends JPanel {
         setMinListener = new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                errorMsgTextFieldPane.setVisible(setMaxValueCheckBox.isSelected() || setMinValueCheckBox.isSelected());
+                refreshErrorMsgTip();
                 if (setMinValueCheckBox.isSelected()) {
                     minValueSpinner.setEnabled(true);
                     Double value = (double) 0;
@@ -220,6 +220,14 @@ public class NumberEditorValidatePane extends JPanel {
         };
     }
 
+    private void refreshErrorMsgTip() {
+        boolean visible = setMaxValueCheckBox.isSelected() || setMinValueCheckBox.isSelected();
+        errorMsgTextFieldPane.setVisible(visible);
+        if (!visible) {
+            errorMsgTextField.setText(StringUtils.EMPTY);
+        }
+    }
+
     public void populate(NumberEditor e) {
         allowDecimalsCheckBox.setSelected(e.isAllowDecimals());
         if (e.isAllowDecimals()) {

designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java

@@ -569,6 +569,35 @@ public class XWAbsoluteLayout extends XLayoutContainer {
         }
     }
 
+    /**
+     * 重新调整子组件宽度
+     * @param width 宽度
+     * @param actualSize 是否按照实际大小计算
+     */
+    @Override
+    public void recalculateChildWidth(int width, boolean actualSize){
+        int componentCount = getComponentCount();
+        for (int i = 0; i < componentCount; i++) {
+            XCreator creator = (XCreator) getComponent(i);
+            creator.recalculateChildWidth(width, actualSize);
+        }
+    }
+
+    /**
+     * 重新调整子组件高度
+     * @param height 高度
+     * @param actualSize 是否按照实际大小计算
+     */
+    @Override
+    public void recalculateChildHeight(int height, boolean actualSize){
+        int componentCount = getComponentCount();
+        for (int i = 0; i < componentCount; i++) {
+            XCreator creator = (XCreator) getComponent(i);
+            creator.recalculateChildHeight(height, actualSize);
+        }
+    }
+
+
     /**
      * body大小手动调整的时候
      * 按照比例调整组件的高度