修改9.0问题

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java

@@ -147,7 +147,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
      * @return 标题
      */
 	public String title4PopupWindow() {
-		return Inter.getLocText("FR-Hyperlink_ChartHyperlink");
+		return Inter.getLocText("Plugin-ChartF_Hyperlink");
 	}
 
 }

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -45,7 +45,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
         ChartCollection cc = createChartCollection();
 		
 		chartComponent = new ChartComponent();
-		chartComponent.setPreferredSize(new Dimension(200, 170));// 在单元格弹出时 需要调整保证属性表的大小.
+		chartComponent.setPreferredSize(new Dimension(300, 170));// 在单元格弹出时 需要调整保证属性表的大小.
 		chartComponent.setSupportEdit(false);
 		chartComponent.populate(cc);
 		

designer_chart/src/com/fr/design/mainframe/chart/gui/UIEditLabel.java

@@ -16,7 +16,11 @@ import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.AWTEventListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 /**
  * Created by IntelliJ IDEA.
@@ -126,7 +130,7 @@ public class UIEditLabel extends JPanel implements UIObserver{
              */
             public void mouseExited(MouseEvent e) {
                 showLabel.setToolTipText(getTooltip());
-                UIEditLabel.this.setBackground(UIConstants.NORMAL_BACKGROUND);
+                UIEditLabel.this.setBackground(UIConstants.SELECT_TAB);
             }
 
         });
@@ -149,7 +153,7 @@ public class UIEditLabel extends JPanel implements UIObserver{
      * 设置成正常的背景
      */
     public void resetNomalrBackground(){
-        UIEditLabel.this.setBackground(UIConstants.NORMAL_BACKGROUND);
+        UIEditLabel.this.setBackground(UIConstants.SELECT_TAB);
     }
 
     private String getTooltip(){

designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java

@@ -6,7 +6,16 @@ import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.base.AttrContents;
 import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.TimeSwitchAttr;
-import com.fr.chart.chartattr.*;
+import com.fr.chart.chartattr.BubblePlot;
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.GanttPlot;
+import com.fr.chart.chartattr.GisMapPlot;
+import com.fr.chart.chartattr.MapPlot;
+import com.fr.chart.chartattr.MeterPlot;
+import com.fr.chart.chartattr.PiePlot;
+import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartattr.StockPlot;
+import com.fr.chart.chartattr.XYScatterPlot;
 import com.fr.chart.chartdata.GisMapReportDefinition;
 import com.fr.chart.chartdata.GisMapTableDefinition;
 import com.fr.chart.web.ChartHyperPoplink;
@@ -39,7 +48,16 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartOtherPane;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
-import com.fr.js.*;
+import com.fr.js.EmailJavaScript;
+import com.fr.js.FormHyperlinkProvider;
+import com.fr.js.JavaScript;
+import com.fr.js.JavaScriptImpl;
+import com.fr.js.NameJavaScript;
+import com.fr.js.NameJavaScriptGroup;
+import com.fr.js.ParameterJavaScript;
+import com.fr.js.ReportletHyperlink;
+import com.fr.js.WebHyperlink;
+import com.fr.plugin.chart.designer.component.format.FormatPaneWithOutFont;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.StableFactory;
@@ -48,7 +66,12 @@ import com.fr.third.org.hsqldb.lib.Iterator;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.text.DecimalFormat;
 import java.text.Format;
 import java.util.ArrayList;
@@ -215,7 +238,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (percentFormatPane == null) {
-                    percentFormatPane = new FormatPane();
+                    percentFormatPane = new FormatPaneWithOutFont();
                 }
 
                 DecimalFormat defaultFormat = new CoreDecimalFormat(new DecimalFormat(), "#.##%");

designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java

@@ -9,6 +9,7 @@ import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UIBubbleFloatPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -18,15 +19,20 @@ import com.fr.design.gui.style.FormatPane;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
-import com.fr.design.dialog.BasicPane;
 import com.fr.general.FRFont;
 import com.fr.general.Inter;
+import com.fr.plugin.chart.designer.component.format.FormatPaneWithOutFont;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.text.DecimalFormat;
 import java.text.Format;
 import java.util.HashMap;
@@ -226,7 +232,7 @@ public class ChartDatapointLabelPane extends BasicPane{
                     }
 
                     if(valueFormatPane == null) {
-                        valueFormatPane =  new FormatPane();
+                        valueFormatPane =  new FormatPaneWithOutFont();
                     }
                     Point comPoint = valueFormatButton.getLocationOnScreen();
                     Point arrowPoint = new Point(comPoint.x + valueFormatButton.getWidth(), comPoint.y + valueFormatButton.getHeight());
@@ -255,7 +261,7 @@ public class ChartDatapointLabelPane extends BasicPane{
                     }
 
                     if(percentFormatPane == null) {
-                        percentFormatPane =  new FormatPane();
+                        percentFormatPane =  new FormatPaneWithOutFont();
                     }
                     Point comPoint = valuePercentFormatButton.getLocationOnScreen();
                     Point arrowPoint = new Point(comPoint.x + valuePercentFormatButton.getWidth(), comPoint.y + valuePercentFormatButton.getHeight());
@@ -429,7 +435,7 @@ public class ChartDatapointLabelPane extends BasicPane{
 	protected void updatePercentFormatpane(){
 		if(isValuePercent!= null && isValuePercent.isSelected()){
             if(this.percentFormatPane == null){
-                this.percentFormatPane = new FormatPane();
+                this.percentFormatPane = new FormatPaneWithOutFont();
             }
             if(this.percentFormat == null){
                 DecimalFormat defaultFormat = new CoreDecimalFormat(new DecimalFormat("#.##%"), "#.##%");

designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java

@@ -121,6 +121,7 @@ public class VanChartHyperLinkPane extends UIListControlPane {
             return;
         }
         update((VanChartPlot) plot);
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
     }
 
     public void populate(Plot plot) {

designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java

@@ -27,6 +27,7 @@ public abstract class AbstractVanChartScrollPane<T> extends BasicScrollPane<T> {
 
         } else {
             leftcontentPane.setBounds(0, 0, width, height);
+            leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 10, original));
         }
     }
     public void reloaPane(JPanel pane){

designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java

@@ -92,7 +92,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
                         formatPane =  createFormatPane();
                     }
                     Point comPoint = formatButton.getLocationOnScreen();
-                    Point arrowPoint = new Point(comPoint.x + formatButton.getWidth(), comPoint.y + formatButton.getHeight());
+                    Point arrowPoint = new Point(comPoint.x, comPoint.y + formatButton.getHeight());
                     UIBubbleFloatPane<Style> pane = new UIBubbleFloatPane(Constants.LEFT, arrowPoint, formatPane, 258, 209) {
 
                         @Override

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

@@ -10,7 +10,6 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.RefreshMoreLabel;
@@ -86,11 +85,19 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {p, f, 20};
-        double[] rowSize = {p, p};
+        double[] column = {f, 20};
+        double[] rowSize = {p};
 
         Component[][] components = initComponent(jPanel);
-        contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
-        contentPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
+        contentPane = new JPanel(new BorderLayout());
+        contentPane.add(panel1, BorderLayout.CENTER);
+
+        Component[][] AutoTooltipComponent = initAutoTooltipComponent();
+        JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(AutoTooltipComponent, rowSize, column);
+        panel2.setBorder(BorderFactory.createEmptyBorder(10, 0,0,0));
+        contentPane.add(panel2, BorderLayout.SOUTH);
+        contentPane.setBorder(BorderFactory.createEmptyBorder(0, 72,0,0));
         content.add(moreLabelPane, BorderLayout.NORTH);
         content.add(contentPane, BorderLayout.CENTER);
         return content;
@@ -105,6 +112,13 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
 
     }
 
+    protected Component[][] initAutoTooltipComponent () {
+
+        return new Component[][]{
+                new Component[]{autoTooltip, tooltipSet},
+        };
+    }
+
     private void initTooltipSet() {
         tooltipSet = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/config.png"));
         tooltipSet.setPreferredSize(new Dimension(20, 20));

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

@@ -1,11 +1,8 @@
 package com.fr.plugin.chart.designer.other;
 
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.general.Inter;
 import com.fr.plugin.chart.base.RefreshMoreLabel;
 import com.fr.plugin.chart.vanchart.VanChart;
 
-import javax.swing.*;
 import java.awt.*;
 
 /**
@@ -17,9 +14,9 @@ public class AutoRefreshPaneWithoutTooltip extends AutoRefreshPane {
         super(chart, isLargeModel);
     }
 
-    protected Component[][] initComponent(JPanel autoTooltipPane){
+    protected Component[][] initAutoTooltipComponent () {
         return new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), getAutoRefreshTime(),new UILabel(Inter.getLocText("Chart-Time_Seconds"))}
+                new Component[]{null, null},
         };
     }