Merge branch 'dev' into test

src/components/FieldRules/index.js

@@ -119,11 +119,13 @@ function FieldRules() {
     }
     //字段名称搜索(中文)
     function colmeSearch(val) {
-        getColumnName(val, '', tableCname, '')
+        const formData = form.getFieldsValue();
+        getColumnName(val, '', formData.tableCname, '')
     }
     //字段名称搜索(英文)
     function coleneSearch(val) {
-        getColumnName('', val, '', tableEname)
+        const formData = form.getFieldsValue();
+        getColumnName('', val, '', formData.tableEname)
     }
     //正则式名称搜索
     function onSearch(val) {
@@ -152,7 +154,6 @@ function FieldRules() {
     }
     //删除弹窗确认
     function showDelModal(flag) {
-        console.log(selectedRowKeys.length);
         if (flag && !selectedRowKeys.length) {
             message.warning("请先选择要删除的记录~", 1);
             return;