Merge branch 'NetEase:master' into master

ShawHee · Dec 13, 2023 · dd55dbe · dd55dbe
2 parents 44e10d0 + 24dbeed
commit dd55dbe
Show file tree

Hide file tree

Showing 197 changed files with 4,085 additions and 4,497 deletions.
diff --git a/ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue b/ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue
@@ -240,7 +240,8 @@ export default defineComponent({
         }))
         if (state.databaseList.length && !isSearch) {
           const index = state.databaseList.findIndex(ele => ele.id === storageCataDBTable.database)
-          state.database = index > -1 ? storageCataDBTable.database : (route.query?.db)?.toString() || state.databaseList[0].id || ''
+          // ISSUE 2413: If the current catalog is not the one in the query, the first db is selected by default.
+          state.database = index > -1 ? storageCataDBTable.database : state.curCatalog === (route.query?.catalog)?.toString() ? ((route.query?.db)?.toString() || state.databaseList[0].id || '') : state.databaseList[0].id || ''
           getAllTableList()
         }
       }).finally(() => {

diff --git a/ams/dashboard/src/main/resources/static/css/app.d88750cc.css b/ams/dashboard/src/main/resources/static/css/app.d88750cc.css
diff --git a/ams/dashboard/src/main/resources/static/css/app.e88a00e5.css b/ams/dashboard/src/main/resources/static/css/app.e88a00e5.css
diff --git a/...es/static/css/chunk-65d125fa.47f42312.css → ...es/static/css/chunk-02607735.47f42312.css b/...es/static/css/chunk-65d125fa.47f42312.css → ...es/static/css/chunk-02607735.47f42312.css