Merge branch 'master' of github.com:youlaitech/vue3-element-admin

This commit is contained in:
hxr
2024-06-28 08:04:51 +08:00
6 changed files with 27 additions and 8 deletions

View File

@@ -18,8 +18,10 @@ const contentConfig: IContentConfig<UserPageQuery> = {
indexAction: function (params) {
if ("createAt" in params) {
const createAt = params.createAt as string[];
params.startTime = createAt[0];
params.endTime = createAt[1];
if (createAt?.length > 1) {
params.startTime = createAt[0];
params.endTime = createAt[1];
}
delete params.createAt;
}
return UserAPI.getPage(params);

View File

@@ -84,8 +84,10 @@ const selectConfig: ISelectConfig = {
indexAction: function (params) {
if ("createAt" in params) {
const createAt = params.createAt as string[];
params.startTime = createAt[0];
params.endTime = createAt[1];
if (createAt?.length > 1) {
params.startTime = createAt[0];
params.endTime = createAt[1];
}
delete params.createAt;
}
return UserAPI.getPage(params);

View File

@@ -311,6 +311,9 @@ watch(dateTimeRange, (newVal) => {
if (newVal) {
queryParams.startTime = newVal[0];
queryParams.endTime = newVal[1];
} else {
queryParams.startTime = undefined;
queryParams.endTime = undefined;
}
});