Browse Source

Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0

feature/10.0
kuangshuai 4 years ago
parent
commit
01f120587a
  1. 5
      designer-base/src/main/java/com/fr/design/style/color/ColorButton.java
  2. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/ColorPickerPaneWithMaxMin.java
  3. 2
      designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java

5
designer-base/src/main/java/com/fr/design/style/color/ColorButton.java

@ -126,6 +126,11 @@ public class ColorButton extends AbstractSelectBox<Color> {
public void setVisible(boolean b) { public void setVisible(boolean b) {
super.setVisible(b); super.setVisible(b);
} }
@Override
protected boolean selectRealTime() {
return false;
}
}; };
colorPane.addChangeListener(new ChangeListener() { colorPane.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/ColorPickerPaneWithMaxMin.java

@ -93,9 +93,9 @@ public class ColorPickerPaneWithMaxMin extends ColorPickerPaneWithFormula {
private void setTextState(TinyFormulaPane tinyFormulaPane, int index, int maxIndex, String value) { private void setTextState(TinyFormulaPane tinyFormulaPane, int index, int maxIndex, String value) {
boolean enable = false; boolean enable = false;
if (index == 0) { if (index == 0) {
value = "∞"; value = "=∞";
} else if (index == maxIndex) { } else if (index == maxIndex) {
value = "-∞"; value = "=-∞";
} else { } else {
enable = true; enable = true;
} }

2
designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java

@ -1,5 +1,6 @@
package com.fr.van.chart.gauge; package com.fr.van.chart.gauge;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.base.GradientStyle; import com.fr.chart.base.GradientStyle;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
@ -46,6 +47,7 @@ public class VanChartGaugeBeautyPane extends VanChartBeautyPane {
}; };
gradientBarPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); gradientBarPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
colorGradient.updateColor(ChartConstants.GRADIENT_END, ChartConstants.GRADIENT_START);
return gradientBarPane; return gradientBarPane;
} }

Loading…
Cancel
Save