Merge pull request #1178 from DB-wang2/master

修改快捷键绕过表单验证问题
hhyo · Sep 16, 2021 · f24d059 · f24d059
2 parents 4583f48 + ea48891
commit f24d059
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/common/static/ace/ace-init.js b/common/static/ace/ace-init.js
@@ -40,7 +40,7 @@ editor.commands.addCommand({
     exec: function (editor) {
         let pathname = window.location.pathname;
         if (pathname === "/sqlquery/") {
-            sqlquery();
+            dosqlquery()
         }
     }
 });

diff --git a/sql/templates/sqlquery.html b/sql/templates/sqlquery.html
@@ -622,11 +622,7 @@ <h4 class="modal-title text-danger">收藏语句</h4>
 
         //先做表单验证，验证成功再成功提交查询请求
         $("#btn-sqlquery").click(function () {
-                if (sqlquery_validate()) {
-                    $('input[type=button]').addClass('disabled');
-                    $('input[type=button]').prop('disabled', true);
-                    sqlquery();
-                }
+                dosqlquery();
             }
         );
 
@@ -913,6 +909,14 @@ <h4 class="modal-title text-danger">收藏语句</h4>
                 }
             });
         }
+
+        function dosqlquery() {
+            if (sqlquery_validate()) {
+                $('input[type=button]').addClass('disabled');
+                $('input[type=button]').prop('disabled', true);
+                sqlquery();
+            }
+        }
     </script>
     <!-- common -->
     <script>