0

public/mg/kylx365_db_admin.html

@@ -315,6 +315,12 @@
             background: #F5F5F5;
             border-color: #CCCCCC;
         }
+        
+        .btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+            pointer-events: none;
+        }
 
         .toast {
             position: fixed;
@@ -633,8 +639,9 @@
                         <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('INNER JOIN ON')" :disabled="!hasWhere">INNER JOIN ON</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('HAVING')" :disabled="!hasGroupBy">HAVING</button>
                             <button type="button" class="btn btn-default" @click="insertSqlClause('ORDER BY')">ORDER BY</button>
                             <select class="btn btn-default" v-model="selectedLimit" @change="updateQueryLimit"
                                 style="margin-left: 8px;">
@@ -782,7 +789,14 @@
                 currentColumn: null
             },
             computed: {
-                
+                // 检查SQL查询中是否包含WHERE子句
+                hasWhere() {
+                    return this.sqlQuery && this.sqlQuery.toUpperCase().includes('WHERE');
+                },
+                // 检查SQL查询中是否包含GROUP BY子句
+                hasGroupBy() {
+                    return this.sqlQuery && this.sqlQuery.toUpperCase().includes('GROUP BY');
+                }
             },
             mounted() {
                 this.loadTables();
@@ -1478,6 +1492,7 @@
                     const sqlParts = {
                         select: -1,
                         from: -1,
+                        join: -1,
                         where: -1,
                         groupBy: -1,
                         having: -1,
@@ -1488,6 +1503,7 @@
                     // 查找各个子句的位置
                     sqlParts.select = sqlUpper.indexOf('SELECT');
                     sqlParts.from = sqlUpper.indexOf('FROM', sqlParts.select);
+                    sqlParts.join = sqlUpper.indexOf('JOIN', sqlParts.from);
                     sqlParts.where = sqlUpper.indexOf('WHERE', sqlParts.from);
                     sqlParts.groupBy = sqlUpper.indexOf('GROUP BY', sqlParts.from);
                     sqlParts.having = sqlUpper.indexOf('HAVING', sqlParts.from);
@@ -1504,6 +1520,38 @@
                     let insertBefore = '';
                     
                     switch (clauseUpper) {
+                        case 'INNER JOIN ON':
+                            // INNER JOIN ON应该在FROM之后，WHERE/GROUP BY/HAVING/ORDER BY之前
+                            if (sqlParts.from > -1) {
+                                // 找到FROM子句后的位置
+                                const fromEndPos = this.findClauseEndPosition(sqlUpper, sqlParts.from);
+                                insertPosition = fromEndPos;
+                                
+                                // 如果已经有其他JOIN子句，找到最后一个JOIN的位置
+                                if (sqlParts.join > -1) {
+                                    const lastJoinPos = sqlUpper.lastIndexOf('JOIN', sqlParts.where > -1 ? sqlParts.where : sqlUpper.length);
+                                    if (lastJoinPos > -1) {
+                                        insertPosition = this.findClauseEndPosition(sqlUpper, lastJoinPos);
+                                    }
+                                }
+                                
+                                // 如果有WHERE子句，确保在WHERE之前有换行
+                                if (sqlParts.where > -1) {
+                                    const beforeWhere = this.sqlQuery.substring(0, sqlParts.where).trimEnd();
+                                    const afterWhere = this.sqlQuery.substring(sqlParts.where);
+                                    if (!beforeWhere.endsWith('\n')) {
+                                        this.sqlQuery = beforeWhere + '\n' + afterWhere;
+                                        // 更新WHERE位置
+                                        sqlParts.where = beforeWhere.length + 1;
+                                    }
+                                }
+                            } else {
+                                // 如果没有FROM子句，显示错误提示
+                                this.showToastMessage('INNER JOIN ON子句必须在FROM子句之后', 'error');
+                                return;
+                            }
+                            break;
+                            
                         case 'WHERE':
                             // WHERE应该在FROM之后，GROUP BY/HAVING/ORDER BY/LIMIT之前
                             if (sqlParts.from > -1) {