Merge pull request #1707 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit 'e369617ff81982637be89583acadf2ddf7229f3d': MOBILE-8032 【移动端】设计器》图表自适应》提示文字显示不全 MOBILE-8070 【移动端】设计器》图表自适应》设置好的组件，重新查看时提示文字不对
7 years ago · 8871627d2f
2 changed files with 19 additions and 2 deletions
--- a/designer_base/src/com/fr/design/gui/ilable/UILabel.java
+++ b/designer_base/src/com/fr/design/gui/ilable/UILabel.java
@ -1,9 +1,15 @@
 package com.fr.design.gui.ilable;

 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.stable.StringUtils;

-import javax.swing.*;
-import java.awt.*;
+import javax.swing.Icon;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;

 /**
 * Created by IntelliJ IDEA.
@ -13,6 +19,7 @@ import java.awt.*;
 * Time: 下午3:15
 */
 public class UILabel extends JLabel {
+	private static final int HTML_SHIFT_HEIGHT = 3;

 	public UILabel(String text, Icon image, int horizontalAlignment) {
 		super(text, image, horizontalAlignment);
@ -46,6 +53,15 @@ public class UILabel extends JLabel {
 		super();
 	}

+	@Override
+	public Dimension getPreferredSize() {
+		Dimension preferredSize = super.getPreferredSize();
+		// （Windows 下）使用 html 时，文字内容会略微向下偏移，导致文字底部被截断，所以适当增加 UILabel 的高度
+		if (StringUtils.isNotEmpty(getText()) && getText().startsWith("<html>")) {
+			return new Dimension(preferredSize.width, preferredSize.height + HTML_SHIFT_HEIGHT);
+		}
+		return preferredSize;
+	}

 	public static void main(String[] args) {
 //        UILabel label =  new UILabel("shishi",SwingConstants.LEFT);
--- a/designer_form/src/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
@ -157,6 +157,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane{
        BaseChartEditor chartEditor = (BaseChartEditor)xCreator.toData();
        ChartMobileFitAttrStateProvider zoomOutAttr = chartEditor.getMobileAttr().getZoomOutAttr();
        this.zoomOutComboBox.setSelectedItem(new Item(zoomOutAttr.description(), zoomOutAttr));
+        updateTipLabel();

        // 数据 populate 完成后，再设置监听
        this.bindListeners2Widgets();