From 90b3de2fcfc5da170e08ad96339a73fd90bd8aa0 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Fri, 4 Aug 2017 09:31:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=BD=B1=E5=93=8D=E6=A8=A1=E6=9D=BF=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java
index a275d3d5d..28d71f988 100644
--- a/designer_base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java
@@ -121,7 +121,10 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
             return;
         }
         long saveTime = System.currentTimeMillis();  // 保存模板的时间点
-        tic.collectInfo(template, this, openTime, saveTime);
+        try {
+            tic.collectInfo(template, this, openTime, saveTime);
+        } catch (Throwable th) {  // 不管收集过程中出现任何异常，都不应该影响模版保存
+        }
         openTime = saveTime;  // 更新 openTime，准备下一次计算
     }
 

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 2/2] =?UTF-8?q?REPORT-4296=20frm=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=8F=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9B=BE=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 929e10110..bfc7406de 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;