From b96c46baa9f8d8a79794cefe6c3c54e1410ccc8e Mon Sep 17 00:00:00 2001 From: wang_rui Date: Wed, 30 Jul 2025 18:02:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(project):=20=E5=85=B3=E9=97=AD=E5=A4=9A?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=8A=9F=E8=83=BD=E5=90=8E=E4=BB=8D=E7=84=B6?= =?UTF-8?q?=E9=81=8D=E5=8E=86=E7=A7=9F=E6=88=B7=E5=88=97=E8=A1=A8=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/_builtin/login/modules/pwd-login.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue index 8af8916f..d42e7472 100644 --- a/src/views/_builtin/login/modules/pwd-login.vue +++ b/src/views/_builtin/login/modules/pwd-login.vue @@ -53,12 +53,14 @@ async function handleFetchTenantList() { const { data, error } = await fetchTenantList(); if (error) return; tenantEnabled.value = data.tenantEnabled; - tenantOption.value = data.voList.map(tenant => { - return { - label: tenant.companyName, - value: tenant.tenantId - }; - }); + if (data.tenantEnabled) { + tenantOption.value = data.voList.map(tenant => { + return { + label: tenant.companyName, + value: tenant.tenantId + }; + }); + } endTenantLoading(); } From 52318c106dfcc16bf3f82d66c2da366c838d1e5b Mon Sep 17 00:00:00 2001 From: AN <1983933789@qq.com> Date: Thu, 31 Jul 2025 13:30:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(projects):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/config/modules/config-search.vue | 9 ++++++--- src/views/system/oss/modules/oss-search.vue | 9 ++++++--- src/views/system/role/modules/role-auth-user-drawer.vue | 9 ++++++--- src/views/system/role/modules/role-search.vue | 9 ++++++--- src/views/system/user/modules/user-search.vue | 9 ++++++--- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/views/system/config/modules/config-search.vue b/src/views/system/config/modules/config-search.vue index 0241b491..7e3688ab 100644 --- a/src/views/system/config/modules/config-search.vue +++ b/src/views/system/config/modules/config-search.vue @@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null); const model = defineModel('model', { required: true }); function onDateRangeCreateTimeUpdate(value: [string, string] | null) { - if (value?.length) { - model.value.params!.beginTime = value[0]; - model.value.params!.endTime = value[1]; + const params = model.value.params!; + if (value && value.length === 2) { + [params.beginTime, params.endTime] = value; + } else { + params.beginTime = undefined; + params.endTime = undefined; } } diff --git a/src/views/system/oss/modules/oss-search.vue b/src/views/system/oss/modules/oss-search.vue index f13f5f8a..f0f3f041 100644 --- a/src/views/system/oss/modules/oss-search.vue +++ b/src/views/system/oss/modules/oss-search.vue @@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null); const model = defineModel('model', { required: true }); function onDateRangeCreateTimeUpdate(value: [string, string] | null) { - if (value?.length) { - model.value.params!.beginCreateTime = value[0]; - model.value.params!.endCreateTime = value[1]; + const params = model.value.params!; + if (value && value.length === 2) { + [params.beginTime, params.endTime] = value; + } else { + params.beginTime = undefined; + params.endTime = undefined; } } diff --git a/src/views/system/role/modules/role-auth-user-drawer.vue b/src/views/system/role/modules/role-auth-user-drawer.vue index 6bb9e890..882e8f54 100644 --- a/src/views/system/role/modules/role-auth-user-drawer.vue +++ b/src/views/system/role/modules/role-auth-user-drawer.vue @@ -168,9 +168,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null); const datePickerRef = ref>(); function onDateRangeCreateTimeUpdate(value: [string, string] | null) { - if (value?.length) { - searchParams.params!.beginTime = value[0]; - searchParams.params!.endTime = value[1]; + const params = searchParams.params!; + if (value && value.length === 2) { + [params.beginTime, params.endTime] = value; + } else { + params.beginTime = undefined; + params.endTime = undefined; } } diff --git a/src/views/system/role/modules/role-search.vue b/src/views/system/role/modules/role-search.vue index 395ae278..0bea6a26 100644 --- a/src/views/system/role/modules/role-search.vue +++ b/src/views/system/role/modules/role-search.vue @@ -24,9 +24,12 @@ const model = defineModel('model', { required: true const { options: sysNormalDisableOptions } = useDict('sys_normal_disable', false); function onDateRangeCreateTimeUpdate(value: [string, string] | null) { - if (value?.length) { - model.value.params!.beginTime = `${value[0]} 00:00:00`; - model.value.params!.endTime = `${value[1]} 23:59:59`; + const params = model.value.params!; + if (value && value.length === 2) { + [params.beginTime, params.endTime] = value; + } else { + params.beginTime = undefined; + params.endTime = undefined; } } diff --git a/src/views/system/user/modules/user-search.vue b/src/views/system/user/modules/user-search.vue index f9476ade..5475953d 100644 --- a/src/views/system/user/modules/user-search.vue +++ b/src/views/system/user/modules/user-search.vue @@ -24,9 +24,12 @@ const datePickerRef = ref>(); const model = defineModel('model', { required: true }); function onDateRangeCreateTimeUpdate(value: [string, string] | null) { - if (value?.length) { - model.value.params!.beginTime = value[0]; - model.value.params!.endTime = value[1]; + const params = model.value.params!; + if (value && value.length === 2) { + [params.beginTime, params.endTime] = value; + } else { + params.beginTime = undefined; + params.endTime = undefined; } }