Browse Source

Merge pull request #29 in CHART/design from ~MANGO/m_design:feature/9.0 to feature/9.0

* commit 'ab93803d25684fdda431d084b6b3921878e5f217':
  CHART-1882   堆积和坐标轴界面bug
  去掉import *
superman 8 years ago
parent
commit
73ebdccd4d
  1. 8
      designer/src/com/fr/start/Designer.java
  2. 3
      designer_base/src/com/fr/design/actions/core/ActionFactory.java
  3. 13
      designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java

8
designer/src/com/fr/start/Designer.java

@ -45,9 +45,13 @@ import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.xml.XMLTools;
import javax.swing.*;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.border.MatteBorder;
import java.awt.*;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;

3
designer_base/src/com/fr/design/actions/core/ActionFactory.java

@ -9,7 +9,8 @@ import com.fr.design.menu.MenuKeySet;
import com.fr.design.selection.QuickEditor;
import com.fr.general.FRLogger;
import javax.swing.*;
import javax.swing.Action;
import javax.swing.KeyStroke;
import java.awt.event.KeyEvent;
import java.lang.reflect.Constructor;
import java.util.ArrayList;

13
designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java

@ -21,11 +21,20 @@ import com.fr.general.Inter;
import com.fr.stable.CoreGraphHelper;
import com.fr.stable.StringUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import javax.swing.BorderFactory;
import javax.swing.JFileChooser;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.ButtonGroup;
import java.awt.Image;
import java.awt.Dimension;
import java.awt.Component;
import java.awt.GridLayout;
/**
* Created by mengao on 2017/11/23.

Loading…
Cancel
Save