Merge remote-tracking branch 'origin/final/10.0' into final/10.0

designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java

@@ -7,6 +7,13 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataMaxFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataMedianFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataMinFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataNumberFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataOutlierFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataQ1Format;
+import com.fr.plugin.chart.base.format.AttrTooltipDataQ3Format;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
 import com.fr.plugin.chart.box.attr.AttrBoxTooltipContent;
@@ -48,6 +55,9 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private JPanel dataNumberPane;
     private JPanel dataOutlierPane;
 
+    private JPanel richTextNumberPane;
+    private JPanel richTextOutlierPane;
+
     public VanChartBoxTooltipContentPane(VanChartStylePane parent, JPanel showOnPane, boolean isDetailed) {
         super(parent, showOnPane);
         checkFormatVisible(isDetailed);
@@ -145,6 +155,16 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return commonPanel;
     }
 
+    protected JPanel createRichFormatPanel() {
+        JPanel richFormatPanel = new JPanel(new BorderLayout());
+
+        richFormatPanel.add(createRichTextCateAndSeriesPane(), BorderLayout.NORTH);
+        richFormatPanel.add(createRichTextDataNumberPane(), BorderLayout.CENTER);
+        richFormatPanel.add(createRichTextDataDetailPane(), BorderLayout.SOUTH);
+
+        return richFormatPanel;
+    }
+
     protected Component[][] getRichTextComponents() {
         return new Component[][]{
                 new Component[]{getRichTextCategoryNameFormatPane(), null},
@@ -229,6 +249,72 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return detailPane;
     }
 
+    private JPanel createRichTextCateAndSeriesPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p, p};
+
+        Component[][] cateAndSeries = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{null, getRichTextCategoryNameFormatPane()},
+                new Component[]{null, getRichTextSeriesNameFormatPane()}
+        };
+
+        return TableLayoutHelper.createTableLayoutPane(cateAndSeries, rowSize, columnSize);
+    }
+
+    private JPanel createRichTextDataNumberPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p};
+
+        Component[][] dataNumber = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{null, richTextNumber},
+        };
+
+        richTextNumberPane = TableLayoutHelper.createTableLayoutPane(dataNumber, rowSize, columnSize);
+
+        return richTextNumberPane;
+    }
+
+    private JPanel createRichTextDataDetailPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+
+        JPanel detailPane = new JPanel(new BorderLayout());
+
+        Component[][] richTextDetail = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{null, richTextMax},
+                new Component[]{new UILabel(getLabelContentTitle()), richTextQ3},
+                new Component[]{null, richTextMedian},
+                new Component[]{null, richTextQ1},
+                new Component[]{null, richTextMin}
+        };
+
+        Component[][] dataOutlier = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{null, richTextOutlier},
+        };
+
+        richTextOutlierPane = TableLayoutHelper.createTableLayoutPane(dataOutlier, new double[]{p, p}, columnSize);
+
+        detailPane.add(TableLayoutHelper.createTableLayoutPane(richTextDetail, new double[]{p, p, p, p, p, p}, columnSize), BorderLayout.NORTH);
+        detailPane.add(richTextOutlierPane, BorderLayout.CENTER);
+
+        return detailPane;
+    }
+
     public boolean isDirty() {
         return getCategoryNameFormatPane().isDirty()
                 || getSeriesNameFormatPane().isDirty()
@@ -291,26 +377,48 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         if (attrTooltipContent instanceof AttrBoxTooltipContent) {
             AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
 
-            VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+            VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = getFormatPaneGroup();
+            AttrTooltipFormat[] formatGroup = getFormatGroup(boxTooltipContent);
+
+            populateRichTextFormat(formatPaneGroup, formatGroup);
+            populateRichText(attrTooltipContent.getRichTextAttr());
+
+            checkRichEditorState(attrTooltipContent);
+        }
+    }
+
+    private VanChartFormatPaneWithoutCheckBox[] getFormatPaneGroup() {
+        if (detailed) {
+            return new VanChartFormatPaneWithoutCheckBox[]{
                     richTextNumber, richTextMax, richTextQ3, richTextMedian,
                     richTextQ1, richTextMin, richTextOutlier
             };
+        }
 
-            AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
-                    boxTooltipContent.getRichTextNumber(),
-                    boxTooltipContent.getRichTextMax(),
-                    boxTooltipContent.getRichTextQ3(),
-                    boxTooltipContent.getRichTextMedian(),
-                    boxTooltipContent.getRichTextQ1(),
-                    boxTooltipContent.getRichTextMin(),
-                    boxTooltipContent.getRichTextOutlier()
+        return new VanChartFormatPaneWithoutCheckBox[]{
+                richTextMax, richTextQ3, richTextMedian, richTextQ1, richTextMin
         };
+    }
 
-            populateRichTextFormat(formatPaneGroup, formatGroup);
-            populateRichText(attrTooltipContent.getRichTextAttr());
+    private AttrTooltipFormat[] getFormatGroup(AttrBoxTooltipContent boxTooltipContent) {
+        AttrTooltipDataNumberFormat richTextNumber = boxTooltipContent.getRichTextNumber();
+        AttrTooltipDataMaxFormat richTextMaxFormat = boxTooltipContent.getRichTextMax();
+        AttrTooltipDataQ3Format richTextQ3Format = boxTooltipContent.getRichTextQ3();
+        AttrTooltipDataMedianFormat richTextMedianFormat = boxTooltipContent.getRichTextMedian();
+        AttrTooltipDataQ1Format richTextQ1Format = boxTooltipContent.getRichTextQ1();
+        AttrTooltipDataMinFormat richTextMinFormat = boxTooltipContent.getRichTextMin();
+        AttrTooltipDataOutlierFormat richTextOutlierFormat = boxTooltipContent.getRichTextOutlier();
 
-            checkRichEditorState(attrTooltipContent);
+        if (detailed) {
+            return new AttrTooltipFormat[]{
+                    richTextNumber, richTextMaxFormat, richTextQ3Format, richTextMedianFormat,
+                    richTextQ1Format, richTextMinFormat, richTextOutlierFormat
+            };
         }
+
+        return new AttrTooltipFormat[]{
+                richTextMaxFormat, richTextQ3Format, richTextMedianFormat, richTextQ1Format, richTextMinFormat
+        };
     }
 
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
@@ -354,5 +462,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
 
         dataNumberPane.setVisible(detailed);
         dataOutlierPane.setVisible(detailed);
+
+        richTextNumberPane.setVisible(detailed);
+        richTextOutlierPane.setVisible(detailed);
     }
 }

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

@@ -5,6 +5,8 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.plugin.chart.base.AttrLabelDetail;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.van.chart.designer.component.VanChartLabelContentPane;
+import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
 
@@ -14,6 +16,34 @@ public class VanChartColumnPlotLabelDetailPane extends VanChartPlotLabelDetailPa
         super(plot, parent);
     }
 
+    protected void initToolTipContentPane(Plot plot) {
+        VanChartLabelContentPane dataLabelContentPane = new VanChartLabelContentPane(getParentPane(), VanChartColumnPlotLabelDetailPane.this) {
+            protected void checkCardPane() {
+                super.checkCardPane();
+                checkOrientationPane();
+            }
+        };
+
+        setDataLabelContentPane(dataLabelContentPane);
+    }
+
+    private void checkOrientationPane() {
+        VanChartLabelContentPane dataLabelContentPane = (VanChartLabelContentPane) getDataLabelContentPane();
+        UIButtonGroup<Integer> content = dataLabelContentPane.getContent();
+        UIButtonGroup<Integer> orientation = getOrientation();
+
+        if (content == null || orientation == null) {
+            return;
+        }
+
+        if (content.getSelectedIndex() == VanChartTooltipContentPane.RICH_EDITOR_INDEX) {
+            orientation.setSelectedIndex(HORIZONTAL_INDEX);
+            orientation.setEnabled(false);
+        } else {
+            orientation.setEnabled(true);
+        }
+    }
+
     protected boolean hasLabelOrientationPane() {
         return !((VanChartColumnPlot) this.getPlot()).isBar();
     }

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/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java

@@ -1,5 +1,7 @@
 package com.fr.van.chart.designer.component;
 
+import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.type.TextAlign;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -15,4 +17,8 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
     protected VanChartHtmlLabelPane createHtmlLabelPane() {
         return new VanChartHtmlLabelPaneWithBackGroundLabel();
     }
+
+    protected AttrTooltipContent createAttrTooltip() {
+        return new AttrTooltipContent(TextAlign.CENTER);
+    }
 }

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

@@ -10,7 +10,7 @@ import java.awt.Frame;
 
 public class VanChartRichEditorDialog extends BasicDialog {
 
-    public static final Dimension DEFAULT = new Dimension(660, 600);
+    public static final Dimension DEFAULT = new Dimension(960, 600);
 
     public VanChartRichEditorDialog(Frame parent, BasicPane pane) {
         super(parent, pane);

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

@@ -2,6 +2,7 @@ package com.fr.van.chart.designer.component;
 
 import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipRichText;
+import com.fr.plugin.chart.type.TextAlign;
 import com.fr.stable.StringUtils;
 import com.teamdev.jxbrowser.chromium.Browser;
 import com.teamdev.jxbrowser.chromium.JSValue;
@@ -71,12 +72,18 @@ public class VanChartRichEditorPane {
 
         String content = richText.getContent();
         String initParams = StringUtils.EMPTY;
+        String align = StringUtils.EMPTY;
 
         if (content.contains("data-id") && !content.contains("class")) {
             initParams = richText.getInitParamsContent();
+
+            String left = TextAlign.LEFT.getAlign();
+            String center = TextAlign.CENTER.getAlign();
+
+            align = content.contains(left) ? left : center;
         }
 
-        return new RichEditorModel(content, richText.isAuto(), paramsStr.toString(), initParams);
+        return new RichEditorModel(content, richText.isAuto(), paramsStr.toString(), initParams, align);
     }
 
     public static class RichEditorModel {
@@ -84,12 +91,14 @@ public class VanChartRichEditorPane {
         private boolean auto;
         private String params;
         private String initParams;
+        private String align;
 
-        public RichEditorModel(String content, boolean auto, String params, String initParams) {
+        public RichEditorModel(String content, boolean auto, String params, String initParams, String align) {
             this.content = content;
             this.auto = auto;
             this.params = params;
             this.initParams = initParams;
+            this.align = align;
         }
 
         public String getContent() {
@@ -123,5 +132,13 @@ public class VanChartRichEditorPane {
         public void setInitParams(String initParams) {
             this.initParams = initParams;
         }
+
+        public String getAlign() {
+            return align;
+        }
+
+        public void setAlign(String align) {
+            this.align = align;
+        }
     }
 }

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

@@ -57,10 +57,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     private static final int TEXT_ATTR_AUTO_INDEX = 0;
     private static final int TEXT_ATTR_CUSTOM_INDEX = 1;
     // 标签内容button
-    private static final int COMMON_INDEX = 0;
-    private static final int RICH_EDITOR_INDEX = 1;
-    private static final int CUSTOM_INDEX_WITH_RICH_EDITOR = 2;
-    private static final int CUSTOM_INDEX_WITHOUT_RICH_EDITOR = 1;
+    public static final int COMMON_INDEX = 0;
+    public static final int RICH_EDITOR_INDEX = 1;
+    public static final int CUSTOM_INDEX_WITH_RICH_EDITOR = 2;
+    public static final int CUSTOM_INDEX_WITHOUT_RICH_EDITOR = 1;
 
     private UIButtonGroup<Integer> content;
 
@@ -202,6 +202,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         this.richTextChangedPercentFormatPane = richTextChangedPercentFormatPane;
     }
 
+    public UIButtonGroup<Integer> getContent() {
+        return content;
+    }
+
     public AttrTooltipRichText getRichTextAttr() {
         return richText;
     }
@@ -384,17 +388,22 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         double[] columnSize = {f, e};
         double[] rowSize = {p, p, p};
 
-        JPanel formatContent = TableLayoutHelper.createTableLayoutPane(getRichTextComponents(), getRowSize(p), new double[]{f, p});
-
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content_Style")), createRichEditorButton()},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Use_Format")), formatContent}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Use_Format")), createRichFormatPanel()}
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
+    protected JPanel createRichFormatPanel() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        return TableLayoutHelper.createTableLayoutPane(getRichTextComponents(), getRowSize(p), new double[]{f, p});
+    }
+
     private JComponent createRichEditorButton() {
         UIButton contentTextArea = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Rich_Text_Edit"));
 
@@ -508,7 +517,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
 
-    private void checkCardPane() {
+    protected void checkCardPane() {
         if (supportRichEditor()) {
             checkCardPaneWithRichEditor();
         } else {

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java

@@ -4,6 +4,7 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipNameFormat;
+import com.fr.plugin.chart.type.TextAlign;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
@@ -82,7 +83,7 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
     }
 
     protected AttrTooltipContent createAttrTooltip() {
-        AttrTooltipContent attrTooltipContent = new AttrTooltipContent();
+        AttrTooltipContent attrTooltipContent = new AttrTooltipContent(TextAlign.CENTER);
 
         attrTooltipContent.getCategoryFormat().setEnable(false);
         attrTooltipContent.getRichTextCategoryFormat().setEnable(false);

designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.map.designer.style.label;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipAreaNameFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipMapValueFormat;
+import com.fr.plugin.chart.type.TextAlign;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithoutCheckBox;
@@ -42,7 +43,7 @@ public class VanChartMapLabelContentPane extends VanChartLabelContentPane {
 
     @Override
     protected AttrTooltipContent createAttrTooltip() {
-        AttrTooltipContent content = new AttrTooltipContent();
+        AttrTooltipContent content = new AttrTooltipContent(TextAlign.CENTER);
         content.setCategoryFormat(new AttrTooltipAreaNameFormat());
         content.setValueFormat(new AttrTooltipMapValueFormat());
         content.setRichTextCategoryFormat(new AttrTooltipAreaNameFormat());

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.multilayer.style;
 
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
+import com.fr.plugin.chart.type.TextAlign;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
@@ -36,7 +37,7 @@ public class VanChartMultiPieLabelContentPane extends VanChartLabelContentPane {
     }
 
     protected AttrTooltipContent createAttrTooltip() {
-        AttrTooltipContent content = new AttrTooltipContent();
+        AttrTooltipContent content = new AttrTooltipContent(TextAlign.CENTER);
         content.setCategoryFormat(new AttrTooltipMultiLevelNameFormat());
         content.setRichTextCategoryFormat(new AttrTooltipMultiLevelNameFormat());
         return content;

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

@@ -4,6 +4,7 @@ package com.fr.van.chart.structure.desinger.style;
 import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
+import com.fr.plugin.chart.type.TextAlign;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
@@ -60,7 +61,7 @@ public class VanChartStructureLabelContentPane extends VanChartLabelContentPane
 
     @Override
     protected AttrTooltipContent createAttrTooltip() {
-        AttrTooltipContent attrTooltipContent = new AttrTooltipContent();
+        AttrTooltipContent attrTooltipContent = new AttrTooltipContent(TextAlign.CENTER);
         attrTooltipContent.setCategoryFormat(new AttrTooltipMultiLevelNameFormat());
         return attrTooltipContent;
     }

designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html

@@ -41,6 +41,7 @@
         var isAuto = Pool.data.isAuto();
         var params = Pool.data.getParams();
         var initParams = Pool.data.getInitParams();
+        var align = Pool.data.getAlign();
 
         var getDimensionIds = function (params) {
             var result = [];
@@ -58,7 +59,7 @@
             return result;
         }
 
-        var getInitContent = function (params, initParams) {
+        var getInitContent = function (params, initParams, align) {
             var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
             var paramGroup = params.split("-");
 
@@ -68,7 +69,7 @@
                 var [key, value] = paramGroup[i].split(":");
 
                 if (initParams.indexOf(value) > -1) {
-                    content += '<p style="text-align: center;">' + editorService.getEditorParamImage(key) + '<br></p>';
+                    content += '<p style="text-align:' + align + ';">' + editorService.getEditorParamImage(key) + '<br></p>';
                 }
             }
 
@@ -78,7 +79,7 @@
         var dimensionIds = getDimensionIds(params);
 
         if (initParams) {
-            content = getInitContent(params, initParams);
+            content = getInitContent(params, initParams, align);
         }
 
         var rich_editor = BI.createWidget({
@@ -118,16 +119,21 @@
             var isAuto = Pool.data.isAuto();
             var params = Pool.data.getParams();
             var initParams = Pool.data.getInitParams();
+            var align = Pool.data.getAlign();
 
             if (initParams) {
-                content = getInitContent(params, initParams);
+                content = getInitContent(params, initParams, align);
             }
 
+            rich_editor.editor.bindToolbar(rich_editor.bar);
+
             rich_editor.setValue({
                 content: content,
                 isAuto: isAuto,
                 dimensionIds: getDimensionIds(params)
             });
+
+            rich_editor.setFocus();
         }
 
         Pool.update = function () {

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

@@ -27,7 +27,6 @@
             this.editor = BI.createWidget({
                 type: "bi.nic_editor",
                 $value: "chart-common-editor",
-                height: 365,
                 cls: "editor bi-border bi-focus-shadow " + (o.textAlign === "center" ? "editor-center-text" : ""),
                 listeners: [{
                     eventName: BI.NicEditor.EVENT_FOCUS,
@@ -194,7 +193,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: 5,
+                tgap: 10,
                 bgap: 10,
-                items: [{
-                    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]
+                items: [this.adapter]
             };
 
             return {
                 type: "bi.combo",
                 direction: "bottom,left",
-                isNeedAdjustWidth: false,
+                isNeedAdjustWidth: true,
                 el: {
                     type: "bi.vertical_adapt",
                     items: [{