Browse Source

CHART-18055 修改新增字段汇总方式默认值

feature/big-screen
Qinghui.Liu 4 years ago
parent
commit
2a56160bbc
  1. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldButton.java
  2. 2
      designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html

4
designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldButton.java

@ -2,11 +2,11 @@ package com.fr.van.chart.designer.component.richText;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.data.util.function.DataFunction; import com.fr.data.util.function.DataFunction;
import com.fr.data.util.function.NoneFunction;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.gui.ibutton.UIToggleButton;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.plugin.chart.base.FirstFunction;
import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat; import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat;
import com.fr.plugin.chart.base.format.AttrTooltipFormat; import com.fr.plugin.chart.base.format.AttrTooltipFormat;
import com.fr.plugin.chart.base.format.IntervalTimeFormat; import com.fr.plugin.chart.base.format.IntervalTimeFormat;
@ -40,7 +40,7 @@ public class VanChartFieldButton extends JPanel {
private UIToggleButton fieldButton; private UIToggleButton fieldButton;
private UIButton addButton; private UIButton addButton;
private DataFunction dataFunction = new NoneFunction(); private DataFunction dataFunction = new FirstFunction();
public VanChartFieldButton(String fieldName, AttrTooltipFormat format, VanChartFieldListener listener) { public VanChartFieldButton(String fieldName, AttrTooltipFormat format, VanChartFieldListener listener) {
this(fieldName, format, false, false, listener); this(fieldName, format, false, false, listener);

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

@ -44,7 +44,7 @@
var getInitContent = function (params, initParams, align) { var getInitContent = function (params, initParams, align) {
var editorService = BI.Services.getService("bi.service.design.chart.common.editor"); var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
var paramGroup = params.split("-"); var paramGroup = params.split("|");
content = ""; content = "";

Loading…
Cancel
Save