Browse Source

Merge branch 'release/11.0' of https://code.fineres.com/scm/~harrison/design into release/11.0

release/11.0
Harrison 2 years ago
parent
commit
f3d7bf7f1f
  1. 24
      designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
  2. 5
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
  3. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java

24
designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@ -0,0 +1,24 @@
package com.fr.design.file;
/**
* @author shine
* @version 10.0
* Created by shine on 2022/11/25
* fvs plugin jartime升级到2022-12-2之后就可以删了
*/
@Deprecated
public class MutilTempalteTabPane {
public static MutilTempalteTabPane getInstance() {
return new MutilTempalteTabPane();
}
public void setIsCloseCurrent(boolean b) {
MultiTemplateTabPane.getInstance().setIsCloseCurrent(b);
}
public void activePrevTemplateAfterClose() {
MultiTemplateTabPane.getInstance().activePrevTemplateAfterClose();
}
}

5
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@ -156,6 +156,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
private DefaultCompletionProvider completionProvider; private DefaultCompletionProvider completionProvider;
private static final Map<String, String> PARAM_PREFIX_MAP = new HashMap<>(); private static final Map<String, String> PARAM_PREFIX_MAP = new HashMap<>();
public static final int DESCRIPTION_TEXT_AREA_ROW = 16, DESCRIPTION_TEXT_AREA_COLUMN = 27;
public FormulaPane() { public FormulaPane() {
initComponents(); initComponents();
} }
@ -1194,8 +1196,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
private void initDescriptionTextArea() { private void initDescriptionTextArea() {
// Description // Description
descriptionTextArea = new UITextArea(); descriptionTextArea = new UITextArea(DESCRIPTION_TEXT_AREA_ROW,DESCRIPTION_TEXT_AREA_COLUMN);
descriptionTextArea.setBackground(Color.white); descriptionTextArea.setBackground(Color.white);
descriptionTextArea.setLineWrap(true); descriptionTextArea.setLineWrap(true);
descriptionTextArea.setWrapStyleWord(true); descriptionTextArea.setWrapStyleWord(true);

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java

@ -161,7 +161,9 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
public void clearAllBoxList(){ public void clearAllBoxList(){
field.clear(); field.clear();
seriesDataPane.getTable().clear(); seriesDataPane.getTable().clear();
seriesDataPane.getTable().updateUI(); seriesDataPane.validate();
seriesDataPane.repaint();
seriesDataPane.revalidate();
} }
private void fireStop() { private void fireStop() {

Loading…
Cancel
Save