Merge pull request #2910 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '092282f8a13d1277d9f72537d39254ab4d850716':
  CHART-16939 条件属性标签宽高问题
  REPORT-42734 && REPORT-42730 聚合报表block块命名校验
  REPORT-42734 && REPORT-42730 聚合报表block块命名校验

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

@@ -270,7 +270,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 } else if (content.getSelectedIndex() == RICH_EDITOR_INDEX) {
                     return editorPanel.getPreferredSize();
                 } else {
-                    return new Dimension(commonPanel.getPreferredSize().width, htmlLabelPane.getPreferredSize().height);
+                    return new Dimension(editorPanel.getPreferredSize().width, htmlLabelPane.getPreferredSize().height);
                 }
             }
         };

designer-realize/src/main/java/com/fr/poly/PolyBlockProperPane.java

@@ -40,6 +40,10 @@ public class PolyBlockProperPane extends DockingView {
 		polyBlockProperTable.populate(designer);
 	}
 
+	public void update(){
+		polyBlockProperTable.update();
+	}
+
 	@Override
 	public String getViewTitle() {
 		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Property_Table");

designer-realize/src/main/java/com/fr/poly/PolyBlockProperTable.java

@@ -1,17 +1,24 @@
 package com.fr.poly;
 
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.widget.BasicPropertyPane;
 import com.fr.design.widget.WidgetBoundsPaneFactory;
 
+import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
 import com.fr.poly.group.PolyBoundsGroup;
 import com.fr.report.poly.TemplateBlock;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
 
-import javax.swing.*;
-import java.awt.*;
 
 public class PolyBlockProperTable extends JPanel {
 	private PolyDesigner designer;
@@ -104,7 +111,12 @@ public class PolyBlockProperTable extends JPanel {
 		if (isPopulating || block == null) {
 			return;
 		}
-		block.setBlockName(blockPropertyPane.getWidgetNameField().getText());
+		if (blockPropertyPane.getWidgetNameField() != null) {
+			String toSetWidgetName = blockPropertyPane.getWidgetNameField().getText();
+			if (isBlockNameValid(toSetWidgetName, block.getBlockName())) {
+				block.setBlockName(toSetWidgetName);
+			}
+		}
 		PolyBoundsGroup boundsgroup = new PolyBoundsGroup(block, designer.getTarget());
 		boundsgroup.setValue(x.getValue(), 0, 1);
 		boundsgroup.setValue(y.getValue(), 1, 1);
@@ -112,4 +124,23 @@ public class PolyBlockProperTable extends JPanel {
 		boundsgroup.setValue(height.getValue(), 3, 1);
 		firePropertyEdit();
 	}
+
+	/**
+	 *校验一下要设置的名称，不能为空，不能重名
+	 *
+	 */
+	private boolean isBlockNameValid(String toSetWidgetName, String currentWidgetName) {
+		if (toSetWidgetName == null || toSetWidgetName.isEmpty()) {
+			blockPropertyPane.getWidgetNameField().setText(currentWidgetName);
+			return false;
+		}
+		for (int i = 0; i < this.designer.getTarget().getBlockCount(); i++) {
+			if (!ComparatorUtils.equals(currentWidgetName, toSetWidgetName) && ComparatorUtils.equals(toSetWidgetName, this.designer.getTarget().getBlock(i).getBlockName())) {
+				blockPropertyPane.getWidgetNameField().setText(currentWidgetName);
+				FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Rename_Failure"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"), FineJOptionPane.ERROR_MESSAGE, IOUtils.readIcon("com/fr/design/form/images/joption_failure.png"));
+				return false;
+			}
+		}
+		return true;
+	}
 }

designer-realize/src/main/java/com/fr/poly/PolyDesigner.java

@@ -623,6 +623,9 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
             // 在停止编辑的时候，要把编辑器的值赋值给显示器
             TemplateBlock block = selection.getValue();
             selection.setValue(block);
+            if (isChooseBlock()){
+                ((PolyBlockProperPane) this.getEastDownPane()).update();
+            }
             this.removeEditor(selection.getEditor());
             selection = null;
             this.repaint();