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

* commit 'b50d9666113da3dcc96891f59262dfcc70bc60d1':
  CHART-16148 解决组合图中标签颜色颜色触发更新导致的属性储存错误
  CHART-16154 & CHART-16194 删除搜索框、切换自动时，不修改对齐方式
  REPORT-38872 修改下变量名
  REPORT-38872 设计器https证书密码明文存储
  REPORT-41333 【冒烟】全局参数添加两个参数p1p2，将p2重命名为p1，不会有参数名重复的提醒
  REPORT-41333 【冒烟】全局参数添加两个参数p1p2，将p2重命名为p1，不会有参数名重复的提醒
  CHART-15187 箱型图面板截断
  CHART-16188 柱形图条件属性中增加文本方向button
  CHART-16171 对富文本内容进行decode
  REPORT-39629 组件块显示标题时问号按钮点不到
  REPORT-41135 【冒烟】第一次预览数据模板数据集，加载弹窗不消失 【问题原因】这个加载弹窗是个AutoProgressBar进度条，之前的逻辑中，进度条在SwingWorker线程中start并且close，而与进度条显示更新相关的逻辑在EDT中，所以有时候会出现SwingWorker中AutoProgressBar先close掉了，但是AutoProgressBar中还在继续对进度条进行赋值操作，又因为没有设置ProgressMonitor的millsToDecideToPopup，导致赋值操作会进入某个判断分支并使弹窗再度弹出，弹出后就不会自动关闭了 【改动方案】将close操作放入EDT线程中执行(顺便修复一些导包问题与过时方法)

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -418,21 +418,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.isHttps = isHttps;
     }
 
-
-    public String getCertificatePath() {
-        return certificatePath;
-    }
-
-
     public void setCertificatePath(String certificatePath) {
         this.certificatePath = certificatePath;
     }
 
-
-    public String getCertificatePass() {
-        return certificatePass;
-    }
-
     public void setCertificatePass(String certificatePass) {
         this.certificatePass = certificatePass;
     }
@@ -2015,11 +2004,13 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
     private void writeHttpsParas(XMLPrintWriter writer) {
         writer.startTAG(CAS_PARAS);
+        // 这边的密钥path和password没有用处了 当前已经全部储存在对应的WorkspaceConnectionInfo中
+        // 把历史遗留保存的全部置为空 防止显示明文密钥 后面删除 todo
         if (StringUtils.isNotBlank(certificatePath)) {
-            writer.attr(CAS_CERTIFICATE_PATH, certificatePath);
+            writer.attr(CAS_CERTIFICATE_PATH, StringUtils.EMPTY);
         }
         if (StringUtils.isNotBlank(certificatePass)) {
-            writer.attr(CAS_CERTIFICATE_PASSWORD, certificatePass);
+            writer.attr(CAS_CERTIFICATE_PASSWORD, StringUtils.EMPTY);
         }
         if (isHttps) {
             writer.attr("enable", true);

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@@ -15,20 +15,31 @@ import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.FineJOptionPane;
-import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.gui.itable.SortableJTable;
 import com.fr.design.gui.itable.TableSorter;
 import com.fr.design.gui.itextfield.UINumberField;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.function.TIME;
 import com.fr.general.FRFont;
 import com.fr.log.FineLoggerFactory;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.SwingWorker;
+import javax.swing.UIManager;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
@@ -81,7 +92,7 @@ public class PreviewTablePane extends BasicPane {
 
         JPanel currentPreviewPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         previewNumberPanel.add(currentPreviewPanel);
-        currentPreviewPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Current_Preview_Rows") + ":"));
+        currentPreviewPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Current_Preview_Rows") + ":"));
 
         currentRowsField = new UINumberField();
         currentPreviewPanel.add(currentRowsField);
@@ -91,7 +102,7 @@ public class PreviewTablePane extends BasicPane {
 
         JPanel maxPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         previewNumberPanel.add(maxPanel);
-        maxPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Maximum_Number_of_Preview_Rows") + ":"));
+        maxPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Maximum_Number_of_Preview_Rows") + ":"));
 
         maxPreviewNumberField = new UINumberField();
         maxPanel.add(maxPreviewNumberField);
@@ -158,7 +169,7 @@ public class PreviewTablePane extends BasicPane {
         if (this.dialog == null) {
             this.dialog = this.showWindow(new JFrame());
         }
-        progressBar = new AutoProgressBar(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
+        progressBar = new AutoProgressBar(this, Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
             public void doMonitorCanceled() {
                 if (getWorker() != null) {
                     getWorker().cancel(true);
@@ -174,7 +185,7 @@ public class PreviewTablePane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview");
+        return Toolkit.i18nText("Fine-Design_Basic_Preview");
     }
 
     private void addLoadedListener(LoadedEventListener l) {
@@ -268,7 +279,7 @@ public class PreviewTablePane extends BasicPane {
      */
     public static EmbeddedTableData previewTableData(TableData tableData, final int keyIndex, final int valueIndex) {
         PreviewTablePane previewTablePane = new PreviewTablePane();
-        previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data")));
+        previewTablePane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Data")));
         try {
             previewTablePane.populate(tableData);
             previewTablePane.resetPreviewTableColumnColor();
@@ -298,13 +309,13 @@ public class PreviewTablePane extends BasicPane {
         try {
             int choiceColumn = Integer.parseInt(columnErrMessage.trim());
             int tatalColumn = Integer.parseInt(tatolColumnErrMessage.trim());
-            columnErrMessage = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Preview_Warn_Text", choiceColumn + 1, tatalColumn);
+            columnErrMessage = Toolkit.i18nText("Fine-Design_Basic_Tabledata_Preview_Warn_Text", choiceColumn + 1, tatalColumn);
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return;
         }
         FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
+        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
     }
 
     private void populate(TableData tableData) throws Exception {
@@ -317,7 +328,7 @@ public class PreviewTablePane extends BasicPane {
     }
 
     private void previewTableDataSQL() throws Exception {
-        connectionBar = new AutoProgressBar(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) {
+        connectionBar = new AutoProgressBar(this, Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) {
             public void doMonitorCanceled() {
                 getWorker().cancel(true);
                 getDialog().setVisible(false);
@@ -365,13 +376,14 @@ public class PreviewTablePane extends BasicPane {
                     if (tableData instanceof DBTableData) {
                         boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase());
                         if (!status) {
-                            throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
+                            throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
                         }
                     }
                 } finally {
-                    connectionBar.close();
+                    // 将close操作放到EDT线程中
+                    UIUtil.invokeLaterIfNeeded(() -> connectionBar.close());
                 }
-                TableDataSource dataSource = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getTarget();
+                TableDataSource dataSource = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget();
                 previewTableData = DesignTableDataManager.previewTableDataNeedInputParameters(dataSource, tableData, (int) maxPreviewNumberField.getValue(), true, progressBar);
                 // parameterInputDialog
                 // update之后的parameters,转成一个parameterMap,用于预览TableData
@@ -396,7 +408,7 @@ public class PreviewTablePane extends BasicPane {
                     if (!(e instanceof CancellationException)) {
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
                         FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(),
-                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                                Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                     }
                     dialog.setVisible(false);
                 } finally {
@@ -425,7 +437,7 @@ public class PreviewTablePane extends BasicPane {
     public static void previewStoreData(final ProcedureDataModel storeProcedureDataModel, final int keyIndex, final int valueIndex) {
         final PreviewTablePane previewTablePane = new PreviewTablePane();
         previewTablePane.storeProcedureDataModel = storeProcedureDataModel;
-        previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data")));
+        previewTablePane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Data")));
 
         try {
             previewTablePane.populateStoreDataSQL();
@@ -456,7 +468,7 @@ public class PreviewTablePane extends BasicPane {
         for (int i = 0; i < tableSize; i++) {
             PreviewTablePane previewTablePane = new PreviewTablePane();
             previewTablePane.storeProcedureDataModel = storeProcedureDataModels[i];
-            previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data")));
+            previewTablePane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Data")));
             try {
                 previewTablePane.populateStoreDataSQL();
             } catch (Exception e) {
@@ -469,7 +481,7 @@ public class PreviewTablePane extends BasicPane {
 
             @Override
             protected String title4PopupWindow() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview");
+                return Toolkit.i18nText("Fine-Design_Basic_Preview");
             }
 
         };

designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java

@@ -7,7 +7,7 @@ import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.controlpane.NameableSelfCreator;
 import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
-import com.fr.design.gui.ilist.ModNameActionListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
@@ -18,79 +18,74 @@ import java.util.Arrays;
 import java.util.List;
 
 public class ParameterArrayPane extends JListControlPane {
-	/**
+    /**
-	 * Constructor.
+     * Constructor.
-	 */
+     */
-	public ParameterArrayPane() {
+    public ParameterArrayPane() {
-		super();
+        super();
-		this.addModNameActionListener(new ModNameActionListener() {
+        this.addModNameActionListener((index, oldName, newName) -> populateSelectedValue());
-			public void nameModed(int index, String oldName, String newName) {
+        this.addEditingListener(new PropertyChangeAdapter() {
-				populateSelectedValue();
+            public void propertyChange() {
-			}
+                Parameter[] parameters = ParameterConfig.getInstance().getGlobalParameters();
+                String[] allListNames = nameableList.getAllNames();
+                allListNames[editingIndex] = StringUtils.EMPTY;
+                String tempName = getEditingName();
+                if (StringUtils.isEmpty(tempName)) {
+                    nameableList.stopEditing();
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name"));
+                    setIllegalIndex(editingIndex);
+                    return;
+                }
+                if (!ComparatorUtils.equals(tempName, selectedName)
+                        && isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) {
+                    nameableList.stopEditing();
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this),
+                            Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name"));
+                    setIllegalIndex(editingIndex);
+                }
+            }
+        });
+    }
 
-		});
-		this.addEditingListener(new PropertyChangeAdapter() {
-			public void propertyChange() {
-				Parameter[] parameters = ParameterConfig.getInstance().getGlobalParameters();
-				String[] allListNames = nameableList.getAllNames();
-				allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
-				String tempName = getEditingName();
-				if (StringUtils.isEmpty(tempName)) {
-					nameableList.stopEditing();
-					FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name"));
-					setIllegalIndex(editingIndex);
-					return;
-				}
-				if (!ComparatorUtils.equals(tempName, selectedName)
-						&& isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) {
-					nameableList.stopEditing();
-					FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this),
-							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name"));
-					setIllegalIndex(editingIndex);
-				}
-			}
-		});
-	}
 
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Basic_Engine_Schedule_Template_Parameter");
+    }
 
-	@Override
+    /**
-	protected String title4PopupWindow() {
+     * 创建模板参数设置组件
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Schedule_Template_Parameter");
+     *
-	}
+     * @return 模板参数设置组件
-
+     */
-	/**
+    public NameableCreator[] createNameableCreators() {
-	 * 创建模板参数设置组件
+        return new NameableCreator[]{
-	 *
+                new NameableSelfCreator(Toolkit.i18nText("Fine-Design_Basic_Engine_Parameter_Name"), Parameter.class, ParameterPane.class) {
-	 * @return 模板参数设置组件
+                    public Parameter createNameable(UnrepeatedNameHelper helper) {
-	 */
+                        // 返回参数设置面板.
-	public NameableCreator[] createNameableCreators() {
+                        return new Parameter(helper.createUnrepeatedName("p"));
-		return new NameableCreator[]{
+                    }
-				new NameableSelfCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Parameter_Name"), Parameter.class, ParameterPane.class) {
-					public Parameter createNameable(UnrepeatedNameHelper helper) {
-						// 返回参数设置面板.
-						return new Parameter(helper.createUnrepeatedName("p"));
-					}
 
-					@Override
+                    @Override
-					public String createTooltip() {
+                    public String createTooltip() {
-						return null;
+                        return null;
-					}
+                    }
-				}
+                }
-		};
+        };
-	}
+    }
 
 
-	/**
+    /**
-	 * 更新参数
+     * 更新参数
      *
      * @return 更新后的参数
-	 */
+     */
-	public Parameter[] updateParameters() {
+    public Parameter[] updateParameters() {
-		// Nameable[]居然不能强转成Parameter[],一定要这么写...
+        // Nameable[]居然不能强转成Parameter[],一定要这么写...
-		Nameable[] res = this.update();
+        Nameable[] res = this.update();
-		Parameter[] res_array = new Parameter[res.length];
+        Parameter[] res_array = new Parameter[res.length];
-		java.util.Arrays.asList(res).toArray(res_array);
+        Arrays.asList(res).toArray(res_array);
 
-		return res_array;
+        return res_array;
-	}
+    }
 }

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -143,6 +143,12 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
      * https 证书路径输入框
      */
     private JPanel httpsCertFileInputPanel;
+
+    /**
+     * 当前远程工作目录是否为新创建的
+     */
+    private boolean newCreated;
+
     /**
      * 主机名，web应用，Servlet，端口监听器
      */
@@ -327,7 +333,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
             this.certPathInput.setText(certPath);
             this.certSecretKeyInput.setText(certSecretKey);
             this.rememberPwdCheckbox.setSelected(rememberPwd);
-
+            this.newCreated = ob.isNewCreated();
         } else {
             this.remoteWorkspaceURL = RemoteWorkspaceURL.createDefaultURL();
             this.usernameInput.setText(StringUtils.EMPTY);
@@ -335,6 +341,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
             this.certPathInput.setText(StringUtils.EMPTY);
             this.certSecretKeyInput.setText(StringUtils.EMPTY);
             this.rememberPwdCheckbox.setSelected(true);
+            this.newCreated = true;
         }
 
         fillRemoteEnvURLField();
@@ -366,7 +373,9 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 new String(this.certSecretKeyInput.getPassword()),
                 rememberPwd);
 
-        return RemoteDesignerWorkspaceInfo.create(connection);
+        RemoteDesignerWorkspaceInfo info = RemoteDesignerWorkspaceInfo.create(connection);
+        info.setNewCreated(newCreated);
+        return info;
     }
 
     @Override
@@ -567,9 +576,6 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
             @Override
             protected TestConnectionResult doInBackground() throws Exception {
-
-                DesignerEnvManager.getEnvManager().setCertificatePath(connection.getCertPath());
-                DesignerEnvManager.getEnvManager().setCertificatePass(connection.getCertSecretKey());
                 try {
                     return TestConnectionResult.parse(WorkContext.getConnector().testConnection(connection), connection);
                 } catch (WorkspaceAuthException ignored) {

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java

@@ -15,10 +15,10 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.util.List;
 
 public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPane {
 
@@ -66,6 +66,7 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
     private JPanel createUIComboBoxPane(UIComboBox comboBox, String title) {
         UILabel label = new UILabel(title);
         label.setPreferredSize(new Dimension(80, 20));
+        comboBox.setPreferredSize(new Dimension(100, 20));
 
         JPanel panel = new JPanel();
 

designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java

@@ -31,6 +31,7 @@ public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserv
 
         editLabel.setPreferredSize(new Dimension(80, 20));
         comboBox = new UIComboBox();
+        comboBox.setPreferredSize(new Dimension(100, 20));
 
         this.setLayout(new BorderLayout(4, 0));
         this.add(editLabel, BorderLayout.WEST);

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnConditionPane.java

@@ -49,7 +49,7 @@ public class VanChartColumnConditionPane extends DataSeriesConditionPane{
         classPaneMap.put(AttrBackground.class, new VanChartColumnSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
         classPaneMap.put(AttrBorder.class, new VanChartColumnLabelBorderPane(this));
-        classPaneMap.put(AttrLabel.class, new VanChartLabelConditionPane(this, plot));
+        classPaneMap.put(AttrLabel.class, new VanChartColumnLabelConditionPane(this, plot));
         classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         classPaneMap.put(VanChartAttrTrendLine.class, new VanChartTrendLineConditionPane(this));
         classPaneMap.put(AttrSeriesImageBackground.class, new VanChartSeriesImageBackgroundConditionPane(this));

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnLabelConditionPane.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.column;
+
+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 VanChartColumnLabelConditionPane extends VanChartLabelConditionPane {
+
+    public VanChartColumnLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) {
+        super(conditionAttributesPane, plot);
+    }
+
+    protected VanChartPlotLabelPane createLabelPane() {
+        return new VanChartColumnPlotLabelNoCheckPane(getPlot(),null);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotLabelNoCheckPane.java

@@ -0,0 +1,25 @@
+package com.fr.van.chart.column;
+
+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 VanChartColumnPlotLabelNoCheckPane extends VanChartColumnPlotLabelPane {
+
+    public VanChartColumnPlotLabelNoCheckPane(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/custom/style/VanChartCustomPlotLabelTabPane.java

@@ -83,14 +83,14 @@ public class VanChartCustomPlotLabelTabPane extends VanChartCustomPlotTabPane<Va
         List<VanChartPlot> customPlotList = plot.getCustomPlotList();
         for (int i = 0; i < paneList.size() && i < customPlotList.size(); i++) {
             ConditionAttr attrList = customPlotList.get(i).getConditionCollection().getDefaultAttr();
-            DataSeriesCondition attr = customPlotList.get(i).getAttrLabelFromConditionCollection();
-            if (attr != null) {
-                attrList.remove(attr);
-            }
 
             VanChartPlotLabelPane labelPane = (VanChartPlotLabelPane) paneList.get(i);
             AttrLabel attrLabel = labelPane.update();
 
+            DataSeriesCondition attr = customPlotList.get(i).getAttrLabelFromConditionCollection();
+            if (attr != null) {
+                attrList.remove(attr);
+            }
             if (attrLabel != null) {
                 attrList.addDataSeriesCondition(attrLabel);
             }

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

@@ -157,7 +157,7 @@
 
             return {
                 isAuto: this.model.isAuto,
-                content: value
+                content: BI.NicEditor.htmlDecode(value)
             };
         },
 
@@ -194,7 +194,7 @@
                 content = this.editor.getValue(BI.NicEditor.FormatType.ESCAPE),
                 isEqualToPlaceholder = editorService.isRichTextEqual(content, this.options.placeholder);
 
-            var HTML_ONLY_STYLE_TAG = "<font[\\s\\S]*?>|</font>|<span[\\s\\S]*?>|</span>|<b\\s+(.*?)>|<b>|</b>|<u[\\s\\S]*?>|</u>|<i\\s+(.*?)>|<i>|</i>|<strong[\\s\\S]*?>|</strong>|<em[\\s\\S]*?>|</em>|<div[\\s\\S]style(.*?)>|</div>|<p[\\s\\S]style(.*?)>|<p.[\\s\\S]*align(.*?)>|</p>";
+            var HTML_ONLY_STYLE_TAG = "<font[\\s\\S]*?>|</font>|<span[\\s\\S]*?>|</span>|<b\\s+(.*?)>|<b>|</b>|<u[\\s\\S]*?>|</u>|<i\\s+(.*?)>|<i>|</i>|<strong[\\s\\S]*?>|</strong>|<em[\\s\\S]*?>|</em>|<div[\\s\\S]style(.*?)>|</div>";
 
             if (!isEqualToPlaceholder) {
                 content = content.replaceAll(HTML_ONLY_STYLE_TAG, "");

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

@@ -30,6 +30,7 @@
                 items: this.model.items,
                 chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
                 behaviors: {},
+                width: 200,
                 layouts: [{
                     type: "bi.vertical"
                 }],
@@ -45,27 +46,15 @@
             var searchPopup = {
                 type: "bi.vertical",
                 cls: "bi-border",
-                hgap: 15,
+                tgap: 10,
-                tgap: 5,
                 bgap: 10,
-                items: [{
+                items: [this.adapter]
-                    type: "bi.searcher",
-                    adapter: this.adapter,
-                    width: 210,
-                    height: 24,
-                    listeners: [{
-                        eventName: BI.Searcher.EVENT_CHANGE,
-                        action: function () {
-                            self.store.changeParam(this.getValue()[0]);
-                        }
-                    }]
-                }, this.adapter]
             };
 
             return {
                 type: "bi.combo",
                 direction: "bottom,left",
-                isNeedAdjustWidth: false,
+                isNeedAdjustWidth: true,
                 el: {
                     type: "bi.vertical_adapt",
                     items: [{

designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@@ -384,7 +384,7 @@ public class EditingMouseListener extends MouseInputAdapter {
             if (component.getCoverPane().getComponentCount() > 1) {
                 JComponent button1 = (JComponent) component.getCoverPane().getComponent(1);
                 int minX1 = button1.getX() + getParentPositionX(component, 0) - designer.getHorizontalScaleValue();
-                int minY1 = button1.getY() + getParentPositionY(component, 0) - designer.getVerticalScaleValue();
+                int minY1 = button1.getY() + getParentPositionY(component, 0) - designer.getVerticalScaleValue() + component.getY();
                 if (e.getX() + GAP - component.getInsets().left > minX1 && e.getX() - GAP - component.getInsets().left < minX1 + button1.getWidth()) {
                     if (e.getY() + GAP - component.getInsets().top > minY1 && e.getY() - GAP - component.getInsets().top < minY1 + button1.getHeight()) {
                         designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));