From f70759c06a814a09ac9190627a4a3b69dcdad76e Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 15 Oct 2020 12:08:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CHART-16154=20&=20CHART-16194=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=90=9C=E7=B4=A2=E6=A1=86=E3=80=81=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=97=B6=EF=BC=8C=E4=B8=8D=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/editor/script/editor.js     |  2 +-
 .../script/insertcombo/combo.insert_param.js  | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
index 26d58f495..2d8bc97a8 100644
--- a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
+++ b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
@@ -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, "");
diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.js b/designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.js
index 7efb49c0c..36c02feda 100644
--- a/designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.js
+++ b/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: [{

From 66430137dbb02b7504066082dbde18a3468ffe1a Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 15 Oct 2020 12:24:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?CHART-16148=20=E8=A7=A3=E5=86=B3=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E5=9B=BE=E4=B8=AD=E6=A0=87=E7=AD=BE=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=A7=A6=E5=8F=91=E6=9B=B4=E6=96=B0=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E5=B1=9E=E6=80=A7=E5=82=A8=E5=AD=98=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/style/VanChartCustomPlotLabelTabPane.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomPlotLabelTabPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomPlotLabelTabPane.java
index 5461b220f..04b94ef5c 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomPlotLabelTabPane.java
+++ b/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);
             }