jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-23 23:39:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
xlsea
2025-07-31 13:55:10 +08:00
parent 710374398a 52318c106d
commit 9df8d2f55f
6 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/_builtin/login/modules/pwd-login.vue
View File

@ -53,12 +53,14 @@ async function handleFetchTenantList() {
const { data, error } = await fetchTenantList(); const { data, error } = await fetchTenantList();
if (error) return; if (error) return;
tenantEnabled.value = data.tenantEnabled; tenantEnabled.value = data.tenantEnabled;
tenantOption.value = data.voList.map(tenant => { if (data.tenantEnabled) {
return { tenantOption.value = data.voList.map(tenant => {
label: tenant.companyName, return {
value: tenant.tenantId label: tenant.companyName,
}; value: tenant.tenantId
}); };
});
}
endTenantLoading(); endTenantLoading();
} }

9
src/views/system/config/modules/config-search.vue
View File

@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
const model = defineModel<Api.System.ConfigSearchParams>('model', { required: true }); const model = defineModel<Api.System.ConfigSearchParams>('model', { required: true });
function onDateRangeCreateTimeUpdate(value: [string, string] | null) { function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) { const params = model.value.params!;
model.value.params!.beginTime = value[0]; if (value && value.length === 2) {
model.value.params!.endTime = value[1]; [params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
} }
} }

9
src/views/system/oss/modules/oss-search.vue
View File

@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
const model = defineModel<Api.System.OssSearchParams>('model', { required: true }); const model = defineModel<Api.System.OssSearchParams>('model', { required: true });
function onDateRangeCreateTimeUpdate(value: [string, string] | null) { function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) { const params = model.value.params!;
model.value.params!.beginCreateTime = value[0]; if (value && value.length === 2) {
model.value.params!.endCreateTime = value[1]; [params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
} }
} }

9
src/views/system/role/modules/role-auth-user-drawer.vue
View File

@ -168,9 +168,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
const datePickerRef = ref<InstanceType<typeof NDatePicker>>(); const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
function onDateRangeCreateTimeUpdate(value: [string, string] | null) { function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) { const params = searchParams.params!;
searchParams.params!.beginTime = value[0]; if (value && value.length === 2) {
searchParams.params!.endTime = value[1]; [params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
} }
} }

9
src/views/system/role/modules/role-search.vue
View File

@ -24,9 +24,12 @@ const model = defineModel<Api.System.RoleSearchParams>('model', { required: true
const { options: sysNormalDisableOptions } = useDict('sys_normal_disable', false); const { options: sysNormalDisableOptions } = useDict('sys_normal_disable', false);
function onDateRangeCreateTimeUpdate(value: [string, string] | null) { function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) { const params = model.value.params!;
model.value.params!.beginTime = `${value[0]} 00:00:00`; if (value && value.length === 2) {
model.value.params!.endTime = `${value[1]} 23:59:59`; [params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
} }
} }

9
src/views/system/user/modules/user-search.vue
View File

@ -24,9 +24,12 @@ const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
const model = defineModel<Api.System.UserSearchParams>('model', { required: true }); const model = defineModel<Api.System.UserSearchParams>('model', { required: true });
function onDateRangeCreateTimeUpdate(value: [string, string] | null) { function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) { const params = model.value.params!;
model.value.params!.beginTime = value[0]; if (value && value.length === 2) {
model.value.params!.endTime = value[1]; [params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
} }
} }