Browse Source

单元格数据源公式没有335$

master
fr_shine 8 years ago
parent
commit
12a8f10b11
  1. 6
      designer_base/src/com/fr/design/formula/TinyFormulaPane.java
  2. 7
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java
  3. 5
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

6
designer_base/src/com/fr/design/formula/TinyFormulaPane.java

@ -56,7 +56,7 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
@Override @Override
public void doOk() { public void doOk() {
Formula fm = formulaPane.update(); Formula fm = formulaPane.update();
if (fm.getContent().length() <= 1) { if (dealEmpty() && fm.getContent().length() <= 1) {
formulaTextField.setText("$$$"); formulaTextField.setText("$$$");
} else { } else {
formulaTextField.setText(fm.getContent()); formulaTextField.setText(fm.getContent());
@ -69,6 +69,10 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
initLayout(); initLayout();
} }
protected boolean dealEmpty() {
return true;
}
protected void initLayout() { protected void initLayout() {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;

7
designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java

@ -3,8 +3,8 @@ package com.fr.design.mainframe.chart.gui.data.report;
import com.fr.base.Formula; import com.fr.base.Formula;
import com.fr.base.Utils; import com.fr.base.Utils;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.design.constants.UIConstants;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.constants.UIConstants;
import com.fr.design.event.UIObserverListener; import com.fr.design.event.UIObserverListener;
import com.fr.design.formula.TinyFormulaPane; import com.fr.design.formula.TinyFormulaPane;
import com.fr.design.gui.frpane.UICorrelationPane; import com.fr.design.gui.frpane.UICorrelationPane;
@ -155,6 +155,11 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane<ChartC
seriesPane.stopCellEditing(); seriesPane.stopCellEditing();
seriesPane.fireTargetChanged(); seriesPane.fireTargetChanged();
} }
@Override
protected boolean dealEmpty() {
return false;
}
}; };
editorComponent.setBackground(UIConstants.FLESH_BLUE); editorComponent.setBackground(UIConstants.FLESH_BLUE);

5
designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@ -56,6 +56,11 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
this.add(formulaTextFieldButton, BorderLayout.EAST); this.add(formulaTextFieldButton, BorderLayout.EAST);
} }
@Override
protected boolean dealEmpty() {
return false;
}
public void okEvent() { public void okEvent() {
checkBoxUse(); checkBoxUse();
} }

Loading…
Cancel
Save