diff --git a/src/components/queryBuilder/ColumnSelect.vue b/src/components/queryBuilder/ColumnSelect.vue index 1f9c7a7..7113f6b 100644 --- a/src/components/queryBuilder/ColumnSelect.vue +++ b/src/components/queryBuilder/ColumnSelect.vue @@ -10,7 +10,7 @@ *

tm.tableName == this.table); }, + columns() { + return this.activeTable?.columns?.filter((c) => !this.foreignColumns?.includes(c.column)); + }, foreignColumns() { return this.activeTable?.relations.map((r) => r.column); }, diff --git a/src/serverCom.ts b/src/serverCom.ts index e33717e..6f1a6a8 100644 --- a/src/serverCom.ts +++ b/src/serverCom.ts @@ -38,7 +38,7 @@ http.interceptors.response.use( return response; }, async (error) => { - if (!error.config.url.includes("/admin") || !error.config.url.includes("/user")) { + if (!error.config.url.includes("/admin") && !error.config.url.includes("/user")) { return Promise.reject(error); }