Merge pull request #2700 in DESIGN/design from final/10.0 to persist/10.0

* commit 'cdfbf7c0b636cc357a8f140c829a905682e2dbd9':
  REPORT-39952 【产品验收】【JDK11设计器】150%时 插件管理显示过大
  REPORT-41895 设计面板-SQL输入框的光标，闪烁时会留下一个小点 【问题原因】光标的长度比背景高亮要长，超出部分不会闪烁，因此留下小点 【改动思路】减小光标的竖直height
  CHART-16364 对富文本自定义内容进行解码
  增加改动标记
  REPORT-41450 【JDK11冒烟】最新的release，设计器里有部分文本框显示不全 【问题原因】windows环境下，因为缩放会造成绘制问题，bug截图中左侧字体变大了覆盖了右侧组件的左边框 【改动思路】在左侧Label和右侧组件之间增加Gap；另外修改ToolKit导包问题
  CHART-16282 地图、力学气泡图、甘特图富文本参数兼容
  CHART-16330 修改甘特图、框架图条件属性界面

designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@@ -11,6 +11,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.ilable.ActionLabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -90,9 +91,9 @@ public class JDBCDefPane extends JPanel {
     private IntegerEditor DBCP_MAX_WAIT = new IntegerEditor();
     private UITextField DBCP_VALIDATION_QUERY = new UITextField();
 
-    private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")});
+    private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
-    private UIComboBox DBCP_TESTONRETURN = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")});
+    private UIComboBox DBCP_TESTONRETURN = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
-    private UIComboBox DBCP_TESTWHILEIDLE = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")});
+    private UIComboBox DBCP_TESTWHILEIDLE = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
 
     private IntegerEditor DBCP_TIMEBETWEENEVICTIONRUNSMILLS = new IntegerEditor();
     private IntegerEditor DBCP_NUMTESTSPEREVICTIONRUN = new IntegerEditor();
@@ -120,13 +121,13 @@ public class JDBCDefPane extends JPanel {
         userNameTextField.setName(USER_NAME);
         passwordTextField = new UIPasswordFieldWithFixedLength(15);
         dbtypeButton = new UIButton(".");
-        dbtypeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_Get_Default_URL"));
+        dbtypeButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Click_Get_Default_URL"));
         dbtypeButton.addActionListener(dbtypeButtonActionListener);
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         JPanel dbtypePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        dbtypePane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":")));
+        dbtypePane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Database") + ":")));
         JPanel dbtypeComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         Component[][] dbtypeComComponents = {{dbtypeComboBox}};
         double[] dbtypeRowSize = {p};
@@ -134,10 +135,10 @@ public class JDBCDefPane extends JPanel {
         dbtypeComPane = TableLayoutHelper.createTableLayoutPane(dbtypeComComponents, dbtypeRowSize, dbtypeColumnSize);
 
         JPanel driverPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        driverPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Driver") + ":"));
+        driverPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Driver") + ":"));
         // 选择ODBC数据源的时候的提示链接
         JPanel odbcTipsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        odbcTipsLink = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")) {
+        odbcTipsLink = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")) {
             @Override
             public void paintComponent(Graphics _gfx) {
                 super.paintComponent(_gfx);
@@ -146,7 +147,7 @@ public class JDBCDefPane extends JPanel {
             }
         };
         odbcTipsPane.add(odbcTipsLink);
-        odbcTipsLink.setPreferredSize(new Dimension(GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")), odbcTipsLink.getPreferredSize().height));
+        odbcTipsLink.setPreferredSize(new Dimension(GraphHelper.getWidth(Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")), odbcTipsLink.getPreferredSize().height));
         odbcTipsLink.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent evt) {
                 String url = CloudCenter.getInstance().acquireUrlByKind("odbc.help");
@@ -167,26 +168,27 @@ public class JDBCDefPane extends JPanel {
         urlComPane = TableLayoutHelper.createCommonTableLayoutPane(urlComComponents, urlRowSize, urlColumnSize, 4);
 
         JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        userPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName") + ":"));
+        userPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName") + ":"));
         JPanel userComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        Component[][] userComComponents = {{userNameTextField, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":"), passwordTextField}};
+        Component[][] userComComponents = {{userNameTextField, new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password") + ":"), passwordTextField}};
         double[] userRowSize = {p};
         double[] userColumnSize = {f, p, f};
         userComPane = TableLayoutHelper.createCommonTableLayoutPane(userComComponents, userRowSize, userColumnSize, 4);
 
         JPanel passwordPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        passwordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":"));
+        passwordPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password") + ":"));
 
         Component[][] components = {{dbtypePane, dbtypeComPane}, {driverPane, driverComboBoxAndTips}, {urlPane, urlComPane}, {userPane, userComPane},};
 
         double[] rowSize = {p, p, p, p};
         double[] columnSize = {p, f, 22};
-        JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 6);
+        // REPORT-41450 Windows环境的jdk11下dpi为125%时会因为缩放导致显示问题，因此加个水平gap值
+        JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 6, 6);
         innerthis.add(centerPanel);
         JPanel southPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         innerthis.add(southPanel);
         southPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 4, 20));
-        ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
+        ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
         southPanel.add(actionLabel, BorderLayout.EAST);
         actionLabel.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent evt) {
@@ -331,7 +333,7 @@ public class JDBCDefPane extends JPanel {
                     if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), ("Access"))) {
                         // ben:这个能不能换种处理方案- -
                         JFileChooser filechooser = new JFileChooser();
-                        filechooser.setDialogTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"));
+                        filechooser.setDialogTitle(Toolkit.i18nText("Fine-Design_Basic_Open"));
                         filechooser.setMultiSelectionEnabled(false);
                         filechooser.addChoosableFileFilter(new ChooseFileFilter(new String[]{"accdb", "mdb"}, "Microsoft Office Access"));
                         int result = filechooser.showOpenDialog(DesignerContext.getDesignerFrame());
@@ -373,19 +375,19 @@ public class JDBCDefPane extends JPanel {
             double[] rowSize = {f, f, f, f, f, f, f, f, f, f, f, f};
             double[] columnSize = {f, f};
             Component[][] comps = {
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.RIGHT), DBCP_MAX_WAIT},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.RIGHT), DBCP_MAX_WAIT},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
                             DBCP_TIMEBETWEENEVICTIONRUNSMILLS},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
-                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":", SwingConstants.RIGHT),
+                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":", SwingConstants.RIGHT),
                             DBCP_MINEVICTABLEIDLETIMEMILLIS}};
 
             JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);
@@ -395,7 +397,7 @@ public class JDBCDefPane extends JPanel {
 
         @Override
         protected String title4PopupWindow() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr");
+            return Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr");
         }
     }
 

designer-base/src/main/java/com/fr/design/extra/ShopDialog.java

@@ -2,6 +2,7 @@ package com.fr.design.extra;
 
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
+import com.fr.design.jdk.JdkVersion;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.StableUtils;
 
@@ -12,7 +13,6 @@ import java.awt.*;
  * Created by vito on 16/4/18.
  */
 public class ShopDialog extends UIDialog {
-    private static final Dimension DEFAULT_SHOP = new Dimension(900, 700);
 
     public ShopDialog(Frame frame, BasicPane pane) {
         super(frame);
@@ -22,11 +22,21 @@ public class ShopDialog extends UIDialog {
         JPanel panel = (JPanel) getContentPane();
         panel.setLayout(new BorderLayout());
         add(pane, BorderLayout.CENTER);
-        setSize(DEFAULT_SHOP);
+        setSize(createDefaultDimension());
         GUICoreUtils.centerWindow(this);
         setResizable(false);
     }
 
+    private Dimension createDefaultDimension() {
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        // jdk11 分辨率较低 缩放较大时 屏幕高度小于或接近设定的高度 需要调整下
+        if  (JdkVersion.GE_9.support() && screenSize.height - 700 < 50) {
+            return new Dimension(900, screenSize.height - 100);
+        } else {
+            return new Dimension(900, 700);
+        }
+    }
+
     @Override
     public void checkValid() throws Exception {
         // do nothing

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java

@@ -458,7 +458,8 @@ public class ConfigurableCaret extends DefaultCaret {
 						Graphics2D g2 = (Graphics2D) g;
 						g2.setStroke(new BasicStroke(2));
 						// 向右再移动一个位置 避免光标太接近文字内容
-						g2.draw(new Line2D.Float(r.x + 1, r.y, r.x + 1, r.y + r.height));
+						// REPORT-41895 光标上方超出背景高亮的部分不会闪烁，会形成一个停留的小点，因此将光标的超出部分截去
+						g2.draw(new Line2D.Float(r.x + 1, r.y + 1, r.x + 1, r.y + r.height));
 						break;
 
 				} // End of switch (style).

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/other/VanChartGanttConditionPane.java

@@ -13,11 +13,11 @@ import com.fr.plugin.chart.gantt.attr.AttrGanttTooltip;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
 import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.PlotFactory;
-import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipNoCheckPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
+import com.fr.van.chart.gantt.designer.style.label.VanChartGanttLabelConditionPane;
 
 import java.awt.Dimension;
 
@@ -42,7 +42,7 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
         if (!PlotFactory.largeDataModel(plot)) {
-            classPaneMap.put(AttrGanttLabel.class, new VanChartLabelConditionPane(this, plot));
+            classPaneMap.put(AttrGanttLabel.class, new VanChartGanttLabelConditionPane(this, plot));
         }
         classPaneMap.put(AttrGanttTooltip.class, new VanChartTooltipConditionPane(this, plot) {
 

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/label/VanChartGanttLabelConditionPane.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.gantt.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
+
+public class VanChartGanttLabelConditionPane extends VanChartLabelConditionPane {
+
+    public VanChartGanttLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) {
+        super(conditionAttributesPane, plot);
+    }
+
+    protected VanChartPlotLabelPane createLabelPane() {
+        return new VanChartGanttPlotLabelNoCheckPane(getPlot(), null);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/label/VanChartGanttPlotLabelNoCheckPane.java

@@ -0,0 +1,25 @@
+package com.fr.van.chart.gantt.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import java.awt.BorderLayout;
+
+public class VanChartGanttPlotLabelNoCheckPane extends VanChartGanttPlotLabelPane {
+
+    public VanChartGanttPlotLabelNoCheckPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void addComponents() {
+        this.setLayout(new BorderLayout());
+        this.add(getLabelPane(), BorderLayout.CENTER);
+    }
+
+    public void populate(AttrLabel attr) {
+        super.populate(attr);
+        getLabelShowCheckBox().setSelected(true);
+        getLabelPane().setVisible(true);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/other/VanChartStructureConditionPane.java

@@ -11,10 +11,10 @@ import com.fr.plugin.chart.base.AttrTooltip;
 import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.other.condition.item.VanChartFloatColorConditionPane;
-import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartStructureNodeConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
+import com.fr.van.chart.structure.desinger.style.VanChartStructureLabelConditionPane;
 
 import java.awt.Dimension;
 
@@ -47,7 +47,7 @@ public class VanChartStructureConditionPane extends DataSeriesConditionPane {
     protected void addBasicAction() {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrTooltip.class, new VanChartTooltipConditionPane(this, plot));
-        classPaneMap.put(AttrLabel.class, new VanChartLabelConditionPane(this, plot));
+        classPaneMap.put(AttrLabel.class, new VanChartStructureLabelConditionPane(this, plot));
         classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         classPaneMap.put(AttrNode.class, new VanChartStructureNodeConditionPane(this));
     }

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelConditionPane.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.structure.desinger.style;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
+
+public class VanChartStructureLabelConditionPane extends VanChartLabelConditionPane {
+
+    public VanChartStructureLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) {
+        super(conditionAttributesPane, plot);
+    }
+
+    protected VanChartPlotLabelPane createLabelPane() {
+        return new VanChartStructurePlotLabelNoCheckPane(getPlot(), null);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructurePlotLabelNoCheckPane.java

@@ -0,0 +1,25 @@
+package com.fr.van.chart.structure.desinger.style;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import java.awt.BorderLayout;
+
+public class VanChartStructurePlotLabelNoCheckPane extends VanChartStructurePlotLabelPane {
+
+    public VanChartStructurePlotLabelNoCheckPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void addComponents() {
+        this.setLayout(new BorderLayout());
+        this.add(getLabelPane(), BorderLayout.CENTER);
+    }
+
+    public void populate(AttrLabel attr) {
+        super.populate(attr);
+        getLabelShowCheckBox().setSelected(true);
+        getLabelPane().setVisible(true);
+    }
+}

designer-chart/src/main/resources/com/fr/design/editor/script/editor.js

@@ -156,7 +156,7 @@
 
             return {
                 isAuto: this.model.isAuto,
-                content: BI.NicEditor.htmlDecode(value)
+                content: value
             };
         },
 

designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.js

@@ -30,7 +30,6 @@
                 items: this.model.items,
                 chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
                 behaviors: {},
-                width: 200,
                 layouts: [{
                     type: "bi.vertical"
                 }],
@@ -68,7 +67,8 @@
                     }]
                 },
                 popup: {
-                    el: searchPopup
+                    el: searchPopup,
+                    minWidth: 150
                 },
                 ref: function (_ref) {
                     self.combo = _ref;