Merge pull request #1224 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '7bcafd3a2189d4ffe67dab63ef27838887b5e303':
  REPORT-19102 【文本控件】电话-自定义规则设置后，规则未保存成功，且下拉框出现空白选项
  REPORT-23090 模板-重复与冻结设置，缺少一列字
  REPORT-19102 【文本控件】电话-自定义规则设置后，规则未保存成功，且下拉框出现空白选项

designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java

@@ -110,7 +110,10 @@ public class CellWidgetPropertyPane extends BasicPane {
             if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去
                 tplEC.addCellElement(cellElement);
             } else {
-                cellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
+                TemplateCellElement newCellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
+                if (newCellElement != null) {
+                    cellElement = newCellElement;
+                }
             }
             setCellWidget(cellWidget, cellElement);
         } else {

designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

@@ -69,6 +69,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Row_Form")));
         repeatTitleRowPane = new RepeatRowPane();
         soverlapRowStartPane.add(repeatTitleRowPane);
+        soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row")));
 
         return soverlapRowStartPane;
     }
@@ -85,6 +86,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         // 重复打印标题的结束列
         repeatTitleColPane = new RepeatColPane();
         soverlapColStartPane.add(repeatTitleColPane);
+        soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column")));
 
         return soverlapColStartPane;
     }
@@ -100,6 +102,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Row_Form")));
         repeatFinisRowPane = new RepeatRowPane();
         foverlapRowStartPane.add(repeatFinisRowPane);
+        foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row")));
 
         return foverlapRowStartPane;
     }
@@ -115,6 +118,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Column_Form")));
         repeatFinisColPane = new RepeatColPane();
         foverlapColStartPane.add(repeatFinisColPane);
+        foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column")));
 
         return foverlapColStartPane;
     }