Pull request #5499: REPORT-57706 && REPORT-57694 新自适应-报表块列宽设置66.66.但展示为66像素；新自适应-报表块设置行高为3000后直接隐藏行了（行高变为0）

Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0

* commit '1beaddc1e5fcc17280242d1467aa1301a76a840f':
  REPORT-57582【FRX】新自适应影响，设计器打开cpt，单元格很小
  REPORT-57706 && REPORT-57694 新自适应-报表块列宽设置66.66.但展示为66像素；新自适应-报表块设置行高为3000后直接隐藏行了（行高变为0）

designer-base/src/main/java/com/fr/design/gui/frpane/UnitInputPane.java

@@ -10,6 +10,7 @@ import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.gui.itextfield.UINumberField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.GeneralUtils;
 import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 
@@ -27,7 +28,8 @@ import java.math.BigDecimal;
  * For input Number.
  */
 public abstract class UnitInputPane extends BasicPane {
-    private static final double NUM_POINT =  0.000001;
+	private static final double MAX_NUM = 3000.0D;
+	private static final double NUM_POINT =  0.000001;
 	private int scale = -1;
 	String title;
 
@@ -46,7 +48,7 @@ public abstract class UnitInputPane extends BasicPane {
 		centerPane.add(titleLabel);
 
 		// Denny：在对话框中加入JSpinner对象
-		numberFieldSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, 999, 1));
+		numberFieldSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, MAX_NUM, 1));
 		GUICoreUtils.setColumnForSpinner(numberFieldSpinner, 24);
 		numberFieldSpinner.setPreferredSize(new Dimension(60, 20));
 		numberFieldSpinner.setMinimumSize(new Dimension(60, 20));
@@ -71,17 +73,17 @@ public abstract class UnitInputPane extends BasicPane {
 
 	public void populate(float floatValue) {
 		popValue = floatValue;
-		numberFieldSpinner.setModel(new SpinnerNumberModel(0.00, 0.00, 999.00, 0.01));
+		numberFieldSpinner.setModel(new SpinnerNumberModel(0.00, 0.00, MAX_NUM, 0.01));
 
 		JFormattedTextField temp = GUICoreUtils.getSpinnerTextField(numberFieldSpinner);
 		addChangeListener(temp);
-		BigDecimal de = new BigDecimal(floatValue + "");
+		BigDecimal de = new BigDecimal(GeneralUtils.objectToString(floatValue));
 		if (scale > 0) {
 			floatValue = de.setScale(scale, BigDecimal.ROUND_DOWN).floatValue();
 		} else {
 			floatValue = de.floatValue();
 		}
-        //选中多列, 并且列宽不完全一致的话, 就不显示值了.
+		//选中多列, 并且列宽不完全一致的话, 就不显示值了.
 		temp.setText(AssistUtils.equals(floatValue, 0) ? StringUtils.EMPTY : Utils.convertNumberStringToString(new Float(floatValue)));
 
 		// denny:默认应该为选中，方便用户修改
@@ -99,8 +101,8 @@ public abstract class UnitInputPane extends BasicPane {
 	public double update() throws ValueNotChangeException {
 		// 值没变就不改
 		if (!changed) {
-            throw vncExp;
-        }
+			throw vncExp;
+		}
 		// Denny: get numberFieldSpinner 的 TextField
 		JFormattedTextField temp = GUICoreUtils.getSpinnerTextField(numberFieldSpinner);
 
@@ -108,7 +110,8 @@ public abstract class UnitInputPane extends BasicPane {
 			if (temp.getText().length() == 0) {
 				return 0;
 			}
-			BigDecimal de = new BigDecimal(temp.getText());
+
+			BigDecimal de = new BigDecimal(GeneralUtils.objectToString(temp.getValue()));
 			if (scale > 0) {
 				return de.setScale(scale, BigDecimal.ROUND_DOWN).floatValue();
 			} else {
@@ -176,4 +179,4 @@ public abstract class UnitInputPane extends BasicPane {
 			// 鼠标按键在组件上单击时
 		}
 	};
-}
+}

designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java

@@ -39,6 +39,7 @@ public class TemplateTool {
         @Override
         public void on(Event event, JTemplate jTemplate) {
             if (!(jTemplate instanceof JForm)) {
+                JFormType.OLD_TYPE.switchUIMode();
                 return;
             }
             JFormType currentType = JFormType.OLD_TYPE;

designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java

@@ -157,7 +157,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
                 dragType = GridUtils.DRAG_CELL_SIZE;
                 isDragPermited = true;
                 dragIndex = index;
-                showToolTip(evt, createToolTipString(sizeList.get(dragIndex).toPixD(resolution), sizeList.getRangeValue(0, dragIndex + 1).toPixD(resolution)));
+                showToolTip(evt, createToolTipString(sizeList.get(dragIndex), sizeList.getRangeValue(0, dragIndex + 1)));
                 return true;
             }
             if (between(evt, tmpSize1, tmpSize2)) {
@@ -301,21 +301,18 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
 
     protected abstract void resetGridSelectionBySelect(int index, ElementCasePane ePane);
 
-    private String createToolTipString(double doubleValue, double totalDoubleValue) {
+    private String createToolTipString(UNIT unitValue, UNIT totalUnitValue) {
         int unitType = DesignerEnvManager.getEnvManager().getReportLengthUnit();
-//        int resolution = ScreenResolution.getScreenResolution();
-        FU ulen = FU.valueOfPix((int) doubleValue, resolution);
-        FU tulen = FU.valueOfPix((int) totalDoubleValue, resolution);
         ReportLengthUNITProvider lengthUNIT = DesignerUIModeConfig.getInstance().parseLengthUNIT(unitType);
         String unit = lengthUNIT.unitText();
-        double len = lengthUNIT.unit2Value4Scale(ulen);
-        double tlen = lengthUNIT.unit2Value4Scale(tulen);
+        double len = lengthUNIT.unit2Value4Scale(unitValue);
+        double tlen = lengthUNIT.unit2Value4Scale(totalUnitValue);
         StringBuilder sb = new StringBuilder();
         sb.append(String.format("%.2f", new Double(len)))
                 .append('/').append(String.format("%.2f", new Double(tlen)))
                 .append(unit).append('(')
-                .append((int)(doubleValue)).append('/')
-                .append((int)(totalDoubleValue))
+                .append((int)(unitValue.toPixD(resolution))).append('/')
+                .append((int)(totalUnitValue.toPixD(resolution)))
                 .append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px"))
                 .append(')');
         return sb.toString();
@@ -416,7 +413,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
 
             DynamicUnitList sizeList = getSizeList(report);
 //            int resolution = ScreenResolution.getScreenResolution();
-            this.setToolTipText2(this.createToolTipString(sizeList.get(dragIndex).toPixD(resolution), sizeList.getRangeValue(0, dragIndex + 1).toPixD(resolution)));
+            this.setToolTipText2(this.createToolTipString(sizeList.get(dragIndex), sizeList.getRangeValue(0, dragIndex + 1)));
         }
 
         ePane.repaint();