diff --git a/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java b/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
index ff62c6fb8..600f9721e 100644
--- a/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
@@ -42,11 +42,15 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
                 populate(tds);
             }
         };
-        BasicDialog reportTableDataDialog = tableDataPane.showLargeWindow(SwingUtilities.getWindowAncestor(this.getEditingComponent()), null);
+        final BasicDialog reportTableDataDialog = tableDataPane.showLargeWindow(SwingUtilities.getWindowAncestor(this.getEditingComponent()), null);
         reportTableDataDialog.addDialogActionListener(new DialogActionAdapter() {
 
             @Override
             public void doOk() {
+                if (!tableDataPane.isNamePermitted()) {
+                    reportTableDataDialog.setDoOKSucceed(false);
+                    return;
+                }
                 DesignModelAdapter.getCurrentModelAdapter().renameTableData(tableDataPane.getDsNameChangedMap());
                 tableDataPane.update(tds);
                 TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
index deef91f0c..84591579e 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
@@ -77,17 +77,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
             }
 
             protected void renameConnection(final String oldName, final String newName) {
-                Configurations.update(new Worker() {
-                    @Override
-                    public void run() {
-                        tableDataConfig.renameTableData(oldName, newName);
-                    }
-
-                    @Override
-                    public Class<? extends Configuration>[] targets() {
-                        return new Class[]{TableDataConfig.class, ProcedureConfig.class};
-                    }
-                });
+                tableDataConfig.renameTableData(oldName, newName);
             }
         };
         final BasicDialog globalTableDataDialog = globalTableDataPane.showLargeWindow(designerFrame, null);
diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
index 45b3ac6a2..e8bc8e39a 100644
--- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
@@ -137,6 +137,8 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
                 nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
                 dg.setButtonEnabled(false);
             }
+        } else if (!BasicTableDataUtils.checkName(tempName)) {
+            dg.setButtonEnabled(false);
         } else {
             nPanel.setShowText(StringUtils.BLANK);
             dg.setButtonEnabled(true);
diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataUtils.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataUtils.java
new file mode 100644
index 000000000..27724450b
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataUtils.java
@@ -0,0 +1,36 @@
+package com.fr.design.data;
+
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.stable.StringUtils;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/4/27
+ */
+public abstract class BasicTableDataUtils {
+
+    private static final int LEN = 2;
+
+
+    public static boolean checkName(String name) {
+        if (isInValidName(name)) {
+            FineJOptionPane.showMessageDialog(null,
+                                              Toolkit.i18nText("Fine-Design_Basic_DataSet_Rename_Warning", name),
+                                              Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                                              FineJOptionPane.WARNING_MESSAGE);
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean isInValidName(String name) {
+        String[] values = name.split("\\.");
+        if (values.length == LEN) {
+            return (StringUtils.isNotEmpty(values[0]) && StringUtils.isNotEmpty(values[1]))
+                    || (StringUtils.isEmpty(values[0]) && StringUtils.isNotEmpty(values[1]));
+        }
+        return false;
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java
index b480e168c..79c160489 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java
@@ -59,4 +59,8 @@ public class ReportTableDataPane extends LoadingBasicPane {
     public Map<String, String> getDsNameChangedMap() {
         return tdPane.getDsNameChangedMap();
     }
+
+    public boolean isNamePermitted() {
+        return tdPane.isNamePermitted();
+    }
 }
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
index 35f6077b8..1dd1f00aa 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
@@ -4,6 +4,7 @@ import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
 import com.fr.data.api.StoreProcedureAssist;
 import com.fr.data.impl.storeproc.StoreProcedure;
+import com.fr.design.data.BasicTableDataUtils;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.controlpane.JListControlPane;
@@ -48,6 +49,14 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                 allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
                 String tempName = getEditingName();
                 Object editingType = getEditingType();
+
+                if (!BasicTableDataUtils.checkName(tempName)) {
+                    isNamePermitted = false;
+                    nameableList.stopEditing();
+                    setIllegalIndex(editingIndex);
+                    return;
+                }
+
                 if (StringUtils.isEmpty(tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java
index 6a3b707ab..ba5d42bd8 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java
@@ -25,7 +25,7 @@ import java.util.Date;
 
 
 public class EmbeddedTableDataDefinedPane extends BasicPane{
-	
+	private static final int MIN_CELL_WIDTH = 30;
 	private EmbeddedTableData tableData;
 	private JTable dataJTable;
 	private UIButton add;
@@ -64,7 +64,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
     	// 行号显示
         TableColumn tableColumn = dataJTable.getColumnModel().getColumn(0);
         tableColumn.setCellRenderer(new CellRenderer());
-        tableColumn.setMaxWidth(dataJTable.getColumnCount());
+        tableColumn.setMaxWidth(Math.max(dataJTable.getColumnCount(), MIN_CELL_WIDTH));
         
         // 控制按钮
         add = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
index afefe7264..8b47b222d 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
@@ -34,6 +34,7 @@ import java.util.Date;
 
 
 public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableData> {
+	private static final int MIN_CELL_WIDTH = 30;
 	private JTable dataJTable ;
 	private JScrollPane scrollPane;
 	private UILabel coordinatelabel;
@@ -220,7 +221,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
 		// 行号显示,每次dateJTable的表结构发生变化时都要调用
 		TableColumn tableColumn = dataJTable.getColumnModel().getColumn(0);
 		tableColumn.setCellRenderer(new CellRenderer());
-		tableColumn.setMaxWidth(dataJTable.getColumnCount());
+		tableColumn.setMaxWidth(Math.max(dataJTable.getColumnCount(), MIN_CELL_WIDTH));
 	}
 
 	private class DoubleRenderer extends DefaultTableCellRenderer {
diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
index a885c5188..8f2021c69 100644
--- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
@@ -123,8 +123,11 @@ public abstract class UIDialog extends JDialog {
         // transfer focus to CurrentEditor
         inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "dialogOK");
         actionMap.put("dialogOK", new AbstractAction() {
-
+            @Override
             public void actionPerformed(ActionEvent evt) {
+                if (!okButton.isEnabled()) {
+                    return;
+                }
                 doOK();
             }
         });
diff --git a/designer-base/src/test/java/com/fr/design/data/BasicTableDataUtilsTest.java b/designer-base/src/test/java/com/fr/design/data/BasicTableDataUtilsTest.java
new file mode 100644
index 000000000..acd47a3c1
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/data/BasicTableDataUtilsTest.java
@@ -0,0 +1,44 @@
+package com.fr.design.data;
+
+import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/4/27
+ */
+public class BasicTableDataUtilsTest extends TestCase {
+
+    @Test
+    public void testIsInValidName() {
+
+        boolean result1 = BasicTableDataUtils.isInValidName("a.b");
+        boolean result2 = BasicTableDataUtils.isInValidName("a.b.c");
+        boolean result3 = BasicTableDataUtils.isInValidName("a..b");
+        boolean result4 = BasicTableDataUtils.isInValidName("a.");
+        boolean result5 = BasicTableDataUtils.isInValidName("a.b.");
+        boolean result6 = BasicTableDataUtils.isInValidName("abc");
+        boolean result7 = BasicTableDataUtils.isInValidName(".abc");
+        boolean result8 = BasicTableDataUtils.isInValidName(".ab.c");
+        boolean result9 = BasicTableDataUtils.isInValidName("ab.c.");
+        boolean result10 = BasicTableDataUtils.isInValidName(".abc.");
+        boolean result11 = BasicTableDataUtils.isInValidName(".ab.c.");
+        boolean result12 = BasicTableDataUtils.isInValidName("..");
+
+        Assert.assertTrue(result1);
+        Assert.assertFalse(result2);
+        Assert.assertFalse(result3);
+        Assert.assertFalse(result4);
+        Assert.assertTrue(result5);
+        Assert.assertFalse(result6);
+        Assert.assertTrue(result7);
+        Assert.assertFalse(result8);
+        Assert.assertTrue(result9);
+        Assert.assertTrue(result10);
+        Assert.assertFalse(result11);
+        Assert.assertFalse(result12);
+    }
+
+}
\ No newline at end of file