From 0c79b531631a51954882f5410faf20aab89f5a46 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 4 Sep 2017 14:19:43 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4296=20frm=E6=8E=A7=E4=BB=B6=E6=A0=8F?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/FormParaWidgetPane.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
index 929e10110a..bfc7406dea 100644
--- a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
@@ -286,7 +286,9 @@ public class FormParaWidgetPane extends JPanel {
 
     private int calculateWidgetWindowRowNum() {
         //向上取整
-        int rowNum = (int) Math.ceil((double) predifinedwidgeList.size() / (double) preWidgetShowMaxNum);
+        int eastRowNum = (int) Math.ceil((double) predifinedwidgeList.size() / (double) preWidgetShowMaxNum);
+        int westRowNum = (int) Math.ceil((double) loadWidgetOptions().length / (double) commonWidgetNum);
+        int rowNum = Math.max(eastRowNum, westRowNum);
         rowNum = Math.max(rowNum, 2);
         rowNum = Math.min(rowNum, preWidgetShowMaxRow);
         return rowNum;