diff --git a/frontend/src/views/container/container/index.vue b/frontend/src/views/container/container/index.vue index d919a3c2e..2809a3671 100644 --- a/frontend/src/views/container/container/index.vue +++ b/frontend/src/views/container/container/index.vue @@ -192,6 +192,8 @@ const paginationConfig = reactive({ currentPage: 1, pageSize: 10, total: 0, + orderBy: 'created_at', + order: 'null', }); const searchName = ref(); const dialogUpgradeRef = ref(); @@ -246,13 +248,15 @@ const dialogReNameRef = ref(); const search = async (column?: any) => { let filterItem = props.filters ? props.filters : ''; + paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy; + paginationConfig.order = column?.order ? column.order : paginationConfig.order; let params = { name: searchName.value, page: paginationConfig.currentPage, pageSize: paginationConfig.pageSize, filters: filterItem, - orderBy: column?.order ? column.prop : 'created_at', - order: column?.order ? column.order : 'null', + orderBy: paginationConfig.orderBy, + order: paginationConfig.order, }; loading.value = true; loadStats(); diff --git a/frontend/src/views/cronjob/index.vue b/frontend/src/views/cronjob/index.vue index a7d425d18..c4485ebac 100644 --- a/frontend/src/views/cronjob/index.vue +++ b/frontend/src/views/cronjob/index.vue @@ -186,6 +186,8 @@ const paginationConfig = reactive({ currentPage: 1, pageSize: 10, total: 0, + orderBy: 'created_at', + order: 'null', }); const searchName = ref(); @@ -205,12 +207,14 @@ const weekOptions = [ ]; const search = async (column?: any) => { + paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy; + paginationConfig.order = column?.order ? column.order : paginationConfig.order; let params = { info: searchName.value, page: paginationConfig.currentPage, pageSize: paginationConfig.pageSize, - orderBy: column?.order ? column.prop : 'created_at', - order: column?.order ? column.order : 'null', + orderBy: paginationConfig.orderBy, + order: paginationConfig.order, }; loading.value = true; await getCronjobPage(params) diff --git a/frontend/src/views/database/mysql/index.vue b/frontend/src/views/database/mysql/index.vue index 4b3cd1208..96a1b73de 100644 --- a/frontend/src/views/database/mysql/index.vue +++ b/frontend/src/views/database/mysql/index.vue @@ -254,6 +254,8 @@ const paginationConfig = reactive({ pageSize: 10, total: 0, from: 'local', + orderBy: 'created_at', + order: 'null', }); const searchName = ref(); @@ -302,13 +304,15 @@ const onSetting = async () => { }; const search = async (column?: any) => { + paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy; + paginationConfig.order = column?.order ? column.order : paginationConfig.order; let params = { page: paginationConfig.currentPage, pageSize: paginationConfig.pageSize, info: searchName.value, from: paginationConfig.from, - orderBy: column?.order ? column.prop : 'created_at', - order: column?.order ? column.order : 'null', + orderBy: paginationConfig.orderBy, + order: paginationConfig.order, }; const res = await searchMysqlDBs(params); data.value = res.data.items || []; diff --git a/frontend/src/views/database/mysql/remote/index.vue b/frontend/src/views/database/mysql/remote/index.vue index 49c4c240d..b65dec4b5 100644 --- a/frontend/src/views/database/mysql/remote/index.vue +++ b/frontend/src/views/database/mysql/remote/index.vue @@ -109,17 +109,21 @@ const paginationConfig = reactive({ currentPage: 1, pageSize: 10, total: 0, + orderBy: 'created_at', + order: 'null', }); const searchName = ref(); const search = async (column?: any) => { + paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy; + paginationConfig.order = column?.order ? column.order : paginationConfig.order; let params = { page: paginationConfig.currentPage, pageSize: paginationConfig.pageSize, info: searchName.value, type: 'mysql', - orderBy: column?.order ? column.prop : 'created_at', - order: column?.order ? column.order : 'null', + orderBy: paginationConfig.orderBy, + order: paginationConfig.order, }; const res = await searchRemoteDBs(params); data.value = res.data.items || [];