修改9.0bug

designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -341,8 +341,10 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
         DesignTableDataManager.addDsChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {
                 AbstractChartAttrPane attrPane = paneList.get(tabsHeaderIconPane.getSelectedIndex());
+                if (attrPane.isShowing()) {
                     attrPane.refreshChartDataPane(collection);
                 }
+            }
         });
     }
 }

designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java

@@ -27,12 +27,11 @@ public class VanChartFillStylePane extends ChartFillStylePane {
 
         };
         return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize);
-
     }
     @Override
     public Dimension getPreferredSize() {
         if(styleSelectBox.getSelectedIndex() != styleSelectBox.getItemCount() - 1) {
-            return new Dimension(styleSelectBox.getPreferredSize().width, 30);
+            return new Dimension(styleSelectBox.getPreferredSize().width, 26);
         }
         return super.getPreferredSize();
     }

designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java

@@ -236,8 +236,6 @@ public class HyperlinkMapFactory {
         startTime.setEnabled(false);
         ConstantsEditor endTime = new ConstantsEditor(Inter.getLocText("Plugin-ChartF_End_Time"), new Formula("END_TIME"));
         endTime.setEnabled(false);
-        ConstantsEditor duration = new ConstantsEditor(Inter.getLocText("Plugin-ChartF_Duration_Time"), new Formula("DURATION"));
-        duration.setEnabled(false);
         ConstantsEditor progress = new ConstantsEditor(Inter.getLocText("Plugin-ChartF_Process"), new Formula("PROGRESS"));
         progress.setEnabled(false);
 
@@ -246,7 +244,6 @@ public class HyperlinkMapFactory {
         lists.add(series);
         lists.add(startTime);
         lists.add(endTime);
-        lists.add(duration);
         lists.add(progress);
 
         return lists;

designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java

@@ -57,7 +57,7 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll
             protected void initLayout() {
                 this.setLayout(new BorderLayout(0,6));
                 JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_type"),jcb);
-                northPane.setBorder(BorderFactory.createEmptyBorder(0,10,10,10));
+                northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
                 this.add(northPane, BorderLayout.NORTH);
                 this.add(cardPane, BorderLayout.CENTER);
 

designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/VanChartAxisButtonPane.java

@@ -16,7 +16,11 @@ import com.fr.plugin.chart.designer.style.axis.VanChartAxisPane;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
@@ -53,7 +57,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         this.add(eastPane, BorderLayout.EAST);
 
         buttonPane = new JPanel();
-        buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 0));
+        buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 0));
         this.add(buttonPane, BorderLayout.CENTER);
 
         addButton.addActionListener(addListener);

designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -29,6 +29,7 @@ import com.fr.plugin.chart.custom.style.VanChartCustomStylePane;
 import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.designer.component.VanChartAreaSeriesFillColorPane;
 import com.fr.plugin.chart.designer.component.VanChartBeautyPane;
+import com.fr.plugin.chart.designer.component.VanChartFillStylePane;
 import com.fr.plugin.chart.designer.component.VanChartLineTypePane;
 import com.fr.plugin.chart.designer.component.VanChartMarkerPane;
 import com.fr.plugin.chart.designer.component.VanChartTrendLinePane;
@@ -98,7 +99,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
      */
     protected ChartFillStylePane getFillStylePane() {
         //如果是自定義組合圖，則不創建填充界面
-        return parentPane instanceof VanChartCustomStylePane ? null : new ChartFillStylePane();
+        return parentPane instanceof VanChartCustomStylePane ? null : new VanChartFillStylePane();
     }
 
     //风格

designer_chart/src/com/fr/plugin/chart/designer/type/AbstractVanChartTypePane.java

@@ -14,9 +14,9 @@ import com.fr.general.Background;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.js.NameJavaScriptGroup;
+import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.base.VanChartZoom;
-import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.vanchart.VanChart;
 
 import javax.swing.*;
@@ -56,6 +56,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{
     //适用一种图表只有一种类型的
     public void populateBean(Chart chart) {
         typeDemo.get(0).isPressing = true;
+        lastTypeIndex = 0;
         checkDemosBackground();
     }