Skip to content

fix: 分页排序样式调整 #1821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2023
Merged

fix: 分页排序样式调整 #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions frontend/src/views/container/container/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ const paginationConfig = reactive({
currentPage: 1,
pageSize: 10,
total: 0,
orderBy: 'created_at',
order: 'null',
});
const searchName = ref();
const dialogUpgradeRef = ref();
Expand Down Expand Up @@ -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();
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/views/cronjob/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ const paginationConfig = reactive({
currentPage: 1,
pageSize: 10,
total: 0,
orderBy: 'created_at',
order: 'null',
});
const searchName = ref();

Expand All @@ -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)
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/views/database/mysql/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ const paginationConfig = reactive({
pageSize: 10,
total: 0,
from: 'local',
orderBy: 'created_at',
order: 'null',
});
const searchName = ref();

Expand Down Expand Up @@ -301,13 +303,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 || [];
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/views/database/mysql/remote/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || [];
Expand Down