0

public/mg/kylx365_db_admin.html

@@ -632,6 +632,7 @@
                     <div class="sql-editor-left">
                         <textarea class="sql-textarea" v-model="sqlQuery" placeholder="输入SQL查询语句..."></textarea>
                         <div class="btn-group" style="justify-content: flex-start;">
+                            <button type="button" class="btn btn-default" @click="insertSqlClause('WHERE')">WHERE</button>
                             <button type="button" class="btn btn-default" @click="insertSqlClause('GROUP BY')">GROUP BY</button>
                             <button type="button" class="btn btn-default" @click="insertSqlClause('HAVING')">HAVING</button>
                             <button type="button" class="btn btn-default" @click="insertSqlClause('ORDER BY')">ORDER BY</button>
@@ -1179,13 +1180,17 @@
                         this.sqlQuery = this.sqlQuery.replace(limitRegex, `LIMIT ${this.selectedLimit}${this.sqlQuery.endsWith(';') ? ';' : ''}`);
                     } else {
                         // 如果没有LIMIT子句，添加到末尾
+                        // 确保前面有换行符
+                        const hasNewlineBefore = this.sqlQuery.trimEnd().endsWith('\n');
+                        const prefix = hasNewlineBefore ? '' : '\n';
+                        
                         // 检查SQL是否以分号结尾
                         if (this.sqlQuery.trim().endsWith(';')) {
                             // 在分号前添加LIMIT
-                            this.sqlQuery = this.sqlQuery.replace(/;\s*$/, `\nLIMIT ${this.selectedLimit};`);
+                            this.sqlQuery = this.sqlQuery.replace(/;\s*$/, `${prefix}LIMIT ${this.selectedLimit};`);
                         } else {
                             // 直接在末尾添加LIMIT
-                            this.sqlQuery = this.sqlQuery.trim() + `\nLIMIT ${this.selectedLimit};`;
+                            this.sqlQuery = this.sqlQuery.trim() + `${prefix}LIMIT ${this.selectedLimit};`;
                         }
                     }
 
@@ -1499,6 +1504,51 @@
                     let insertBefore = '';
                     
                     switch (clauseUpper) {
+                        case 'WHERE':
+                            // WHERE应该在FROM之后，GROUP BY/HAVING/ORDER BY/LIMIT之前
+                            if (sqlParts.from > -1) {
+                                // 找到FROM子句后的位置
+                                const fromEndPos = this.findClauseEndPosition(sqlUpper, sqlParts.from);
+                                insertPosition = fromEndPos;
+                                
+                                // 如果有LIMIT子句，先处理换行
+                                if (sqlParts.limit > -1) {
+                                    // 检查LIMIT前是否有换行
+                                    const limitLineStart = this.sqlQuery.lastIndexOf('\n', sqlParts.limit);
+                                    if (limitLineStart === -1 || limitLineStart < fromEndPos) {
+                                        // 在LIMIT前插入换行符
+                                        const beforeLimit = this.sqlQuery.substring(0, sqlParts.limit).trimEnd();
+                                        const afterLimit = this.sqlQuery.substring(sqlParts.limit);
+                                        this.sqlQuery = beforeLimit + '\n' + afterLimit;
+                                        // 更新LIMIT位置
+                                        sqlParts.limit = beforeLimit.length + 1;
+                                    }
+                                }
+                            } else if (sqlParts.groupBy > -1) {
+                                // 如果没有FROM但有GROUP BY，插入在GROUP BY之前
+                                insertPosition = sqlParts.groupBy;
+                                insertBefore = 'GROUP BY';
+                            } else if (sqlParts.having > -1) {
+                                // 如果没有GROUP BY但有HAVING，插入在HAVING之前
+                                insertPosition = sqlParts.having;
+                                insertBefore = 'HAVING';
+                            } else if (sqlParts.orderBy > -1) {
+                                // 如果没有HAVING但有ORDER BY，插入在ORDER BY之前
+                                insertPosition = sqlParts.orderBy;
+                                insertBefore = 'ORDER BY';
+                            } else if (sqlParts.limit > -1) {
+                                // 如果只有LIMIT，插入在LIMIT之前
+                                insertPosition = sqlParts.limit;
+                                insertBefore = 'LIMIT';
+                            } else {
+                                // 如果没有以上子句，插入在查询末尾（可能有分号）
+                                insertPosition = this.sqlQuery.length;
+                                if (this.sqlQuery.trim().endsWith(';')) {
+                                    insertPosition = this.sqlQuery.lastIndexOf(';');
+                                }
+                            }
+                            break;
+                            
                         case 'GROUP BY':
                             // GROUP BY应该在WHERE之后，HAVING/ORDER BY/LIMIT之前
                             if (sqlParts.where > -1) {
@@ -1578,21 +1628,46 @@
                         let newQuery = '';
                         if (insertBefore) {
                             // 在特定子句之前插入
-                            const beforeInsert = this.sqlQuery.substring(0, insertPosition);
+                            const beforeInsert = this.sqlQuery.substring(0, insertPosition).trimEnd();
                             const afterInsert = this.sqlQuery.substring(insertPosition);
                             
+                            // 确保只有一个换行符
+                            const hasNewline = beforeInsert.endsWith('\n');
+                            const prefix = hasNewline ? '' : '\n';
+                            
                             // 添加换行符和子句
-                            newQuery = beforeInsert + '\n' + clause + ' ' + afterInsert;
+                            newQuery = beforeInsert + prefix + clause + ' ' + afterInsert;
                         } else {
                             // 在子句末尾插入
-                            const beforeInsert = this.sqlQuery.substring(0, insertPosition);
+                            const beforeInsert = this.sqlQuery.substring(0, insertPosition).trimEnd();
                             const afterInsert = this.sqlQuery.substring(insertPosition);
                             
+                            // 确保只有一个换行符
+                            const hasNewline = beforeInsert.endsWith('\n');
+                            const prefix = hasNewline ? '' : '\n';
+                            
                             // 添加换行符和子句
-                            newQuery = beforeInsert + '\n' + clause + ' ' + afterInsert;
+                            newQuery = beforeInsert + prefix + clause + ' ' + afterInsert;
                         }
                         
                         this.sqlQuery = newQuery;
+                        
+                        // 对所有子句，确保LIMIT在新行
+                        // 查找LIMIT位置（可能已改变）
+                        const newSqlUpper = this.sqlQuery.toUpperCase();
+                        const newLimitPos = newSqlUpper.indexOf('LIMIT');
+                        
+                        if (newLimitPos > -1) {
+                            // 检查LIMIT前是否有换行
+                            const beforeLimit = this.sqlQuery.substring(0, newLimitPos).trimEnd();
+                            const afterLimit = this.sqlQuery.substring(newLimitPos);
+                            
+                            // 确保LIMIT前有换行
+                            if (!beforeLimit.endsWith('\n')) {
+                                this.sqlQuery = beforeLimit + '\n' + afterLimit;
+                            }
+                        }
+                        
                         this.showToastMessage(`已插入 "${clause}" 子句到查询`, 'success');
                         
                         // 设置光标位置到插入的子句之后