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