Pull request #2454: CHART-15975 富文本编辑器populate时更新参数

Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0

* commit '3e82d2737858d9bb1618c7e301400f028f0e630a':
  CHART-15975 富文本编辑器populate时更新参数

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

@@ -5,6 +5,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 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.AttrTooltipFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
@@ -276,6 +277,7 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        setRichTextAttr(new AttrTooltipRichText());
         Map<String, String> params = getRichTextAttr().getParams();
 
         AttrTooltipCategoryFormat categoryFormat = attrTooltipContent.getRichTextCategoryFormat();

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

@@ -195,6 +195,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return richText;
     }
 
+    public void setRichTextAttr(AttrTooltipRichText richText) {
+        this.richText = richText;
+    }
+
     private JPanel createLabelContentPane() {
         initDetailPane();
         initCenterPane();
@@ -583,6 +587,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 attrTooltipContent.getRichTextChangedPercentFormat()
         };
 
+        richText = new AttrTooltipRichText();
         populateRichTextFormat(formatPaneGroup, formatGroup);
         populateRichText(attrTooltipContent.getRichTextAttr());
     }

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.gantt.designer.style.tooltip;
 
 import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipEndTimeFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipProcessesFormat;
@@ -136,6 +137,8 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
 
     protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
         if(attrTooltipContent instanceof AttrGanttTooltipContent){
+            setRichTextAttr(new AttrTooltipRichText());
+
             AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
             Map<String, String> params = getRichTextAttr().getParams();
 

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

@@ -41,19 +41,24 @@
         var isAuto = Pool.data.isAuto();
         var params = Pool.data.getParams();
 
-        var dimensionIds = [];
+        var getDimensionIds = function (params) {
+            var result = [];
+            var paramGroup = params.split("-");
 
-        var paramGroup = params.split("-");
+            for (var i = 0, len = paramGroup.length; i < len; i++) {
+                var [key, value] = paramGroup[i].split(":");
+                var param = {};
 
-        for (var i = 0, len = paramGroup.length; i < len; i++) {
-            var [key, value] = paramGroup[i].split(":");
-            var param = {};
+                param[key] = value;
 
-            param[key] = value;
+                result.push(param);
+            }
 
-            dimensionIds.push(param);
+            return result;
         }
 
+        var dimensionIds = getDimensionIds(params);
+
         var rich_editor = BI.createWidget({
             type: "bi.design.chart.common.editor",
             element: "body",
@@ -86,8 +91,12 @@
             }
         });
 
-        Pool.dispatch = function(){
-            rich_editor.setValue({content: Pool.data.getContent(), isAuto: Pool.data.isAuto()});
+        Pool.dispatch = function () {
+            rich_editor.setValue({
+                content: Pool.data.getContent(),
+                isAuto: Pool.data.isAuto(),
+                dimensionIds: getDimensionIds(Pool.data.getParams())
+            });
         }
 
         Pool.update = function () {

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

@@ -170,6 +170,9 @@
                 this.store.changeIsAuto(obj.isAuto);
                 this.fontStyleGroup.setValue(obj.isAuto);
             }
+            if (BI.contains(keys, "dimensionIds")) {
+                this.store.changeDimensionIds(obj.dimensionIds);
+            }
         },
 
         _formatContent: function (content) {

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

@@ -42,6 +42,10 @@
                 this.model.isAuto = isAuto;
             },
 
+            changeDimensionIds: function (dimensionIds) {
+                this.model.dimensionIds = dimensionIds;
+            },
+
             setEditorBlurState: function (isBlur) {
                 this.model.isEditorBlur = isBlur;
             }

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

@@ -16,13 +16,16 @@
                 this.addParam(this.model.param, editorService.encode);
                 this.combo.hideView();
                 // this._restorePosition();
+            },
+            items: function () {
+                this.adapter.populate(this.model.items);
             }
         },
 
         render: function () {
             var self = this;
 
-            var adapter = BI.createWidget({
+            this.adapter = BI.createWidget({
                 type: "bi.button_group",
                 items: this.model.items,
                 chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
@@ -47,7 +50,7 @@
                 bgap: 10,
                 items: [{
                     type: "bi.searcher",
-                    adapter: adapter,
+                    adapter: this.adapter,
                     width: 210,
                     height: 24,
                     listeners: [{
@@ -56,7 +59,7 @@
                             self.store.changeParam(this.getValue()[0]);
                         }
                     }]
-                }, adapter]
+                }, this.adapter]
             };
 
             return {