Pull request #2605: CHART-16154 & CHART-16194 & CHART-16148 解决组合图中标签背景颜色触发更新导致的属性储存错误、删除搜索框、切换自动时，不修改对齐方式

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

* commit 'c966fc11fc0bddbaa3d477dd306782a53585eef9':
  CHART-16148 解决组合图中标签颜色颜色触发更新导致的属性储存错误
  CHART-16154 & CHART-16194 删除搜索框、切换自动时，不修改对齐方式

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

@@ -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: [{