diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java
index fb19c89d7..3b025ae1f 100644
--- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java
@@ -7,9 +7,9 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.fun.JavaScriptActionProvider;
 import com.fr.design.gui.frpane.UIComboBoxPane;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.form.ui.WebContentUtils;
-
 import com.fr.js.JavaScript;
 
 import javax.swing.BorderFactory;
@@ -46,7 +46,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
         Set<JavaScriptActionProvider> javaScriptActionProviders = ExtraDesignClassManager.getInstance().getArray(JavaScriptActionProvider.XML_TAG);
         if (javaScriptActionProviders != null) {
             for (JavaScriptActionProvider jsp : javaScriptActionProviders) {
-               if(jsp.isSupportType()){
+                if(jsp.accept(DesignerContext.getDesignerFrame().getSelectedJTemplate())){
                     paneList.add(jsp.getJavaScriptActionPane(this));
                 }
             }
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
index aa6bbf1a0..e42707a62 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
@@ -6,13 +6,14 @@ import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.Component;
-import java.awt.FlowLayout;
+import java.awt.BorderLayout;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -49,16 +50,17 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {f, COMPONENT_WIDTH};
+        double[] columnSize = {ChartDataPane.LABEL_WIDTH, COMPONENT_WIDTH};
         double[] rowSize = new double[len + (hasCustomFieldPane() ? 2 : 0)];
         Arrays.fill(rowSize, p);
 
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 6);
 
-        this.setLayout(new FlowLayout());
-        this.add(panel);
-        this.add(addSouthPane());
+        this.setLayout(new BorderLayout(0,6));
+        this.add(panel, BorderLayout.NORTH);
+        this.add(addSouthPane(),  BorderLayout.CENTER);
+
+        this.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 8));
     }
 
     protected JPanel addSouthPane() {