Pull request #10942: REPORT-82895 【11.0.11延期】单元格重复冻结优化 增加重复判断,优化面板

Merge in DESIGN/design from ~DESTINY.LIN/design:feature/x to feature/x

* commit '1d234a2c6b0f3f8cfc8d9e8a0b41cf36a7af7ea2':
  REPORT-82895 【11.0.11延期】单元格重复冻结优化 增加重复判断,优化面板

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

@@ -4,6 +4,7 @@ import com.fr.design.gui.ilable.UILabel;
 import javax.swing.SwingConstants;
 
 
+import com.fr.design.i18n.Toolkit;
 import com.fr.stable.FT;
 import com.fr.stable.StableUtils;
 
@@ -21,8 +22,14 @@ public class FreezePagePane extends FreezeAndRepeatPane {
 	public FreezePagePane(boolean isNumber, boolean foot) {
 		this.foot = foot;
 		this.isNumber = isNumber;
-		start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" 1" : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" A", SwingConstants.CENTER);
-		end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), SwingConstants.CENTER);
+		if (foot) {
+			start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" 1" : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" A", SwingConstants.CENTER);
+			end = new UILabel();
+		} else {
+			start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" 1" : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" A", SwingConstants.CENTER);
+			end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), SwingConstants.CENTER);
+		}
+
 		super.initComponent();
 	}
 
@@ -33,17 +40,18 @@ public class FreezePagePane extends FreezeAndRepeatPane {
 
 	@Override
 	public void populateBean(FT ob) {
-		if (isNumber) {
-			((UILabel) end).setText(String.valueOf(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"));
-		} else {
-			((UILabel) end).setText(StableUtils.convertIntToABC(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"));
-		}
 		if (foot) {
 			if (isNumber) {
 				((UILabel) start).setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+String.valueOf(ob.getFrom() + 1));
 			} else {
 				((UILabel) start).setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+StableUtils.convertIntToABC(ob.getFrom() + 1));
 			}
+		} else {
+			if (isNumber) {
+				((UILabel) end).setText(String.valueOf(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"));
+			} else {
+				((UILabel) end).setText(StableUtils.convertIntToABC(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"));
+			}
 		}
 	}
 
@@ -58,6 +66,11 @@ public class FreezePagePane extends FreezeAndRepeatPane {
 
 	@Override
 	public String getLabeshow() {
-		return isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Row_To") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_To");
+		if (foot) {
+			return isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Last_Row") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Last_Col");
+		} else {
+			return isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Row_To") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_To");
+		}
+
 	}
 }