|
|
|
@ -293,7 +293,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
|
|
|
|
|
DateEditor dateEditor = (DateEditor)minValueField.getCurrentEditor(); |
|
|
|
|
String dateString = dateEditor.getUIDatePickerFormat().format(datetmp); |
|
|
|
|
timeAxis.setCustomMinValue(StringUtils.isNotEmpty(dateString)); |
|
|
|
|
timeAxis.setMinValue(BaseFormula.createFormulaBuilder().build(dateString)); |
|
|
|
|
timeAxis.setMinValue(createDataFormula(dateString)); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
timeAxis.setCustomMinValue(false); |
|
|
|
@ -308,7 +308,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
|
|
|
|
|
DateEditor dateEditor = (DateEditor)maxValueField.getCurrentEditor(); |
|
|
|
|
String dateString = dateEditor.getUIDatePickerFormat().format(datetmp); |
|
|
|
|
timeAxis.setCustomMaxValue(StringUtils.isNotEmpty(dateString)); |
|
|
|
|
timeAxis.setMaxValue(BaseFormula.createFormulaBuilder().build(dateString)); |
|
|
|
|
timeAxis.setMaxValue(createDataFormula(dateString)); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
timeAxis.setCustomMaxValue(false); |
|
|
|
@ -332,6 +332,11 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
|
|
|
|
|
checkBoxUse(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private BaseFormula createDataFormula(String dateString) { |
|
|
|
|
String formulaString = "\"" + dateString + "\""; |
|
|
|
|
return BaseFormula.createFormulaBuilder().build(formulaString); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public void populate(VanChartTimeAxis timeAxis){ |
|
|
|
|
// 最小值
|
|
|
|
|
if (timeAxis.isCustomMinValue() && timeAxis.getMinValue() != null) { |
|
|
|
|