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 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);
}
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 = "|||||||||||||||||
||
|
";
+ var HTML_ONLY_STYLE_TAG = "|||||||||||||||||
";
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: [{