diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
index 4a153bfaa..66674f166 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
@@ -294,6 +294,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
                 tmp = tmp + "...";
                 tabledataName = new UILabel(tmp);
             }
+            tabledataName.setToolTipText(name);
             UILabel iconLabel = new UILabel(icon);
             chekbox.addActionListener(tableDataCheckboxListener);
             iconLabel.addMouseListener(chooseTableDataListener);
diff --git a/designer-base/src/main/java/com/fr/design/gui/autocomplete/AbstractCompletionProvider.java b/designer-base/src/main/java/com/fr/design/gui/autocomplete/AbstractCompletionProvider.java
index a03e3d8b0..ceacb715c 100644
--- a/designer-base/src/main/java/com/fr/design/gui/autocomplete/AbstractCompletionProvider.java
+++ b/designer-base/src/main/java/com/fr/design/gui/autocomplete/AbstractCompletionProvider.java
@@ -8,12 +8,14 @@
  */
 package com.fr.design.gui.autocomplete;
 
+import com.fr.stable.StringUtils;
+
+import javax.swing.text.JTextComponent;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import javax.swing.text.JTextComponent;
 
 
 /**
@@ -186,7 +188,9 @@ public abstract class AbstractCompletionProvider
 
 			while (index<completions.size()) {
 				Completion c = completions.get(index);
-				if (Util.startsWithIgnoreCase(c.getInputText(), text)) {
+				String inputText = c.getInputText();
+				//当输入文本和补全项相等时,不再添加到补全项到窗口中
+				if (Util.startsWithIgnoreCase(inputText, text) && !StringUtils.equals(inputText, text)) {
 					retVal.add(c);
 					index++;
 				}
diff --git a/designer-base/src/main/java/com/fr/design/gui/autocomplete/FormulaPaneAutoCompletion.java b/designer-base/src/main/java/com/fr/design/gui/autocomplete/FormulaPaneAutoCompletion.java
index cd37fd9bc..289bbb13a 100644
--- a/designer-base/src/main/java/com/fr/design/gui/autocomplete/FormulaPaneAutoCompletion.java
+++ b/designer-base/src/main/java/com/fr/design/gui/autocomplete/FormulaPaneAutoCompletion.java
@@ -1,12 +1,10 @@
 package com.fr.design.gui.autocomplete;
 
 import com.fr.design.formula.FormulaPane;
+import com.fr.stable.StringUtils;
 
-import javax.swing.KeyStroke;
-import javax.swing.ListCellRenderer;
 import javax.swing.text.Caret;
 import javax.swing.text.JTextComponent;
-import java.awt.Window;
 
 /**
  * @author Hoky
@@ -70,9 +68,18 @@ public class FormulaPaneAutoCompletion extends AutoCompletionWithExtraRefresh {
         caret.setDot(start);
         caret.moveDot(dot);
         if (FormulaPane.containsParam(replacement)) {
-            textComp.replaceSelection(FormulaPane.getParamPrefix(replacement) + replacement);
-            int caretPosition = textComp.getCaretPosition();
-            textComp.setCaretPosition(caretPosition);
+            String selectedText = textComp.getSelectedText();
+            //找到选择文本(光标输入位置dot)进行补全
+            String text = textComp.getText().substring(0, dot);
+            int index = text.lastIndexOf(selectedText);
+            //获取replacement的前缀,replacement是不带前缀的,例如变量$$page_number,获取到的replacement是page_number
+            String paramPrefix = FormulaPane.getParamPrefix(replacement);
+            //当选择文本之前有和param前缀相同大小的字符串时,截取对比一下,如果内容相同,则前缀已经存在,不用再拼接了
+            String prefix = (index >= paramPrefix.length()) ? text.substring(index - paramPrefix.length(), index) : StringUtils.EMPTY;
+            if (!FormulaPane.getParamPrefix(replacement).equals(prefix)) {
+                replacement = paramPrefix + replacement;
+            }
+            textComp.replaceSelection(replacement);
         } else {
             textComp.replaceSelection(replacement + "()");
             int caretPosition = textComp.getCaretPosition();
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/AbstractChartStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/AbstractChartStylePane.java
index e96bcd7bb..801e7e0ab 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/AbstractChartStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/AbstractChartStylePane.java
@@ -29,11 +29,11 @@ public abstract class AbstractChartStylePane extends BasicPane {
 
     protected void initPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        double e1 = 75;
-        double e = 155;
+        double labelWidth = 90;
+        double totalWidth = 155;
         double p = TableLayout.PREFERRED;
-        double[] columnSize = {e1, e};
-        JPanel gapTableLayoutPane = TableLayoutHelper.createGapTableLayoutPane(getComponent(), getRows(p), columnSize, 20, LayoutConstants.VGAP_LARGE);
+        double[] columnSize = {labelWidth, totalWidth};
+        JPanel gapTableLayoutPane = TableLayoutHelper.createGapTableLayoutPane(getComponent(), getRows(p), columnSize, 5, LayoutConstants.VGAP_LARGE);
         gapTableLayoutPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
         UIScrollPane rightTopPane = new UIScrollPane(gapTableLayoutPane);
         rightTopPane.setBorder(BorderFactory.createEmptyBorder());
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java
index a70870a61..fb1e3660b 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java
@@ -2,7 +2,6 @@ package com.fr.design.mainframe.theme.edit.chart;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
-import com.fr.base.Utils;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.UIObserverListener;
@@ -79,11 +78,11 @@ public class ChartFontPane extends BasicPane {
     }
 
     protected JPanel getContentPane(JPanel buttonPane) {
-        double e1 = 75;
-        double e = 155;
+        double labelWidth = 90;
+        double totalWidth = 155;
         double p = TableLayout.PREFERRED;
         double[] rows = {p, p, p};
-        double[] columnSize = {e1, e};
+        double[] columnSize = {labelWidth, totalWidth};
         UILabel text = new UILabel(getUILabelText(), SwingConstants.LEFT);
         Component[][] components = {
                 new Component[]{null, null},
@@ -91,7 +90,7 @@ public class ChartFontPane extends BasicPane {
                 new Component[]{null, buttonPane}
         };
 
-        return TableLayoutHelper.createGapTableLayoutPane(components, rows, columnSize, 20, LayoutConstants.VGAP_LARGE);
+        return TableLayoutHelper.createGapTableLayoutPane(components, rows, columnSize, 5, LayoutConstants.VGAP_LARGE);
     }
 
     public String getUILabelText() {