|
|
@ -47,7 +47,7 @@ import java.awt.event.ActionEvent; |
|
|
|
import java.awt.event.ActionListener; |
|
|
|
import java.awt.event.ActionListener; |
|
|
|
import java.awt.event.MouseAdapter; |
|
|
|
import java.awt.event.MouseAdapter; |
|
|
|
import java.awt.event.MouseEvent; |
|
|
|
import java.awt.event.MouseEvent; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.LinkedHashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
|
@ -450,7 +450,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent |
|
|
|
String[] fieldNames = getRichTextFieldNames(); |
|
|
|
String[] fieldNames = getRichTextFieldNames(); |
|
|
|
AttrTooltipFormat[] fieldFormats = getRichTextFieldFormats(); |
|
|
|
AttrTooltipFormat[] fieldFormats = getRichTextFieldFormats(); |
|
|
|
|
|
|
|
|
|
|
|
Map<String, String> params = new HashMap<>(); |
|
|
|
Map<String, String> params = new LinkedHashMap<>(); |
|
|
|
|
|
|
|
|
|
|
|
for (int i = 0, len = fieldNames.length; i < len; i++) { |
|
|
|
for (int i = 0, len = fieldNames.length; i < len; i++) { |
|
|
|
params.put(fieldNames[i], fieldFormats[i].getJs()); |
|
|
|
params.put(fieldNames[i], fieldFormats[i].getJs()); |
|
|
@ -691,21 +691,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent |
|
|
|
checkRichEditorState(attrTooltipContent); |
|
|
|
checkRichEditorState(attrTooltipContent); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected void populateRichTextFormat(VanChartFormatPaneWithCheckBox[] formatPaneGroup, AttrTooltipFormat[] formatGroup) { |
|
|
|
|
|
|
|
for (int i = 0, len = formatPaneGroup.length; i < len; i++) { |
|
|
|
|
|
|
|
VanChartFormatPaneWithCheckBox formatPane = formatPaneGroup[i]; |
|
|
|
|
|
|
|
AttrTooltipFormat format = formatGroup[i]; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (formatPane != null && format != null) { |
|
|
|
|
|
|
|
formatPane.populate(format); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 填充面板时,更新富文本编辑器参数
|
|
|
|
|
|
|
|
AttrTooltipRichText richText = this.richTextTooltipContent.getRichTextAttr(); |
|
|
|
|
|
|
|
formatPane.updateFormatParams(richText.getParams(), format.getJs()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
protected void populateRichText(AttrTooltipRichText tooltipRichText) { |
|
|
|
protected void populateRichText(AttrTooltipRichText tooltipRichText) { |
|
|
|
if (tooltipRichText != null) { |
|
|
|
if (tooltipRichText != null) { |
|
|
|
updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto()); |
|
|
|
updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto()); |
|
|
@ -728,7 +713,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent |
|
|
|
updateLabelType(attrTooltipContent); |
|
|
|
updateLabelType(attrTooltipContent); |
|
|
|
updateFormatPane(attrTooltipContent); |
|
|
|
updateFormatPane(attrTooltipContent); |
|
|
|
if (supportRichEditor()) { |
|
|
|
if (supportRichEditor()) { |
|
|
|
// updateRichEditor(attrTooltipContent);
|
|
|
|
|
|
|
|
updateTooltipFormat(attrTooltipContent, this.richTextTooltipContent); |
|
|
|
updateTooltipFormat(attrTooltipContent, this.richTextTooltipContent); |
|
|
|
updateTooltipRichText(attrTooltipContent); |
|
|
|
updateTooltipRichText(attrTooltipContent); |
|
|
|
} |
|
|
|
} |
|
|
|