From e485f680c7cc3b6d4e551b76c629a63608efadb2 Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Thu, 17 Jul 2025 16:00:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(projects):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=87=E6=9C=9F=E4=B8=8D=E5=BC=B9=E7=AA=97?=
 =?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/service/request/index.ts | 48 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/service/request/index.ts b/src/service/request/index.ts
index 88ae1b91..12ce410c 100644
--- a/src/service/request/index.ts
+++ b/src/service/request/index.ts
@@ -77,36 +77,34 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
       // when the backend response code is in `modalLogoutCodes`, it means the user will be logged out by displaying a modal
       const modalLogoutCodes = import.meta.env.VITE_SERVICE_MODAL_LOGOUT_CODES?.split(',') || [];
       if (modalLogoutCodes.includes(responseCode) && isLogin) {
-        const isExist = request.state.errMsgStack.includes(response.data.msg);
+        const isExist = request.state.errMsgStack && request.state.errMsgStack.includes(response.data.msg);
         if (isExist) {
           return null;
         }
-
-        if (!window.location.pathname?.startsWith('/login')) {
-          request.state.errMsgStack = [...(request.state.errMsgStack || []), response.data.msg];
-
-          // prevent the user from refreshing the page
-          window.addEventListener('beforeunload', handleLogout);
-
-          window.$dialog?.warning({
-            title: '系统提示',
-            content: '登录状态已过期，您可以继续留在该页面，或者重新登录',
-            positiveText: '重新登录',
-            negativeText: '取消',
-            maskClosable: false,
-            closeOnEsc: false,
-            onPositiveClick() {
-              logoutAndCleanup();
-            },
-            onClose() {
-              window.removeEventListener('beforeunload', handleLogout);
-              request.state.errMsgStack = request.state.errMsgStack.filter(msg => msg !== response.data.msg);
-            }
-          });
-          request.cancelAllRequest();
+        if (window.location.pathname?.startsWith('/login')) {
+          logoutAndCleanup();
           return null;
         }
-        logoutAndCleanup();
+        request.state.errMsgStack = [...(request.state.errMsgStack || []), response.data.msg];
+        // prevent the user from refreshing the page
+        window.addEventListener('beforeunload', handleLogout);
+
+        window.$dialog?.warning({
+          title: '系统提示',
+          content: '登录状态已过期，您可以继续留在该页面，或者重新登录',
+          positiveText: '重新登录',
+          negativeText: '取消',
+          maskClosable: false,
+          closeOnEsc: false,
+          onPositiveClick() {
+            logoutAndCleanup();
+          },
+          onClose() {
+            window.removeEventListener('beforeunload', handleLogout);
+            request.state.errMsgStack = request.state.errMsgStack.filter(msg => msg !== response.data.msg);
+          }
+        });
+        request.cancelAllRequest();
         return null;
       }
 

From cc29ea85c16ac9e10319e5f2b99bade1e724c4ed Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Thu, 17 Jul 2025 21:44:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style(projects):=20=E6=90=9C=E7=B4=A2FormIt?=
 =?UTF-8?q?em=E5=8D=A0=E6=AF=94=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/online/modules/online-search.vue    |  6 +++---
 src/views/system/config/modules/config-search.vue     |  4 ++--
 src/views/system/dict/modules/dict-data-search.vue    |  7 +++----
 .../tenant-package/modules/tenant-package-search.vue  | 11 ++++++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/monitor/online/modules/online-search.vue b/src/views/monitor/online/modules/online-search.vue
index 4cbedac1..de013ef3 100644
--- a/src/views/monitor/online/modules/online-search.vue
+++ b/src/views/monitor/online/modules/online-search.vue
@@ -34,13 +34,13 @@ async function search() {
       <NCollapseItem :title="$t('common.search')" name="user-search">
         <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
           <NGrid responsive="screen" item-responsive>
-            <NFormItemGi span="24 s:12 m:6" label="IP地址" path="ipaddr" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:8" label="IP地址" path="ipaddr" class="pr-24px">
               <NInput v-model:value="model.ipaddr" placeholder="请输入IP地址" />
             </NFormItemGi>
-            <NFormItemGi span="24 s:12 m:6" label="用户账号" path="userName" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:8" label="用户账号" path="userName" class="pr-24px">
               <NInput v-model:value="model.userName" placeholder="请输入用户账号" />
             </NFormItemGi>
-            <NFormItemGi span="24" class="pr-24px">
+            <NFormItemGi span="24 s:24 m:8" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
                   <template #icon>
diff --git a/src/views/system/config/modules/config-search.vue b/src/views/system/config/modules/config-search.vue
index e75b10e3..0241b491 100644
--- a/src/views/system/config/modules/config-search.vue
+++ b/src/views/system/config/modules/config-search.vue
@@ -77,7 +77,7 @@ async function search() {
                 clearable
               />
             </NFormItemGi>
-            <NFormItemGi span="24 s:12 m:12" label="创建时间" path="createTime" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:6" label="创建时间" path="createTime" class="pr-24px">
               <NDatePicker
                 v-model:formatted-value="dateRangeCreateTime"
                 type="datetimerange"
@@ -86,7 +86,7 @@ async function search() {
                 @update:formatted-value="onDateRangeCreateTimeUpdate"
               />
             </NFormItemGi>
-            <NFormItemGi span="24 s:12 m:12" class="pr-24px">
+            <NFormItemGi span="24" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
                   <template #icon>
diff --git a/src/views/system/dict/modules/dict-data-search.vue b/src/views/system/dict/modules/dict-data-search.vue
index e1ea2451..aae1f131 100644
--- a/src/views/system/dict/modules/dict-data-search.vue
+++ b/src/views/system/dict/modules/dict-data-search.vue
@@ -33,17 +33,16 @@ async function search() {
     <NCollapse>
       <NCollapseItem :title="$t('common.search')" name="user-search">
         <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
-          <NGrid responsive="self" item-responsive>
+          <NGrid responsive="screen" item-responsive>
             <NFormItemGi
-              :show-feedback="false"
-              span="12"
+              span="24 s:12 m:12"
               :label="$t('page.system.dict.data.label')"
               path="dictLabel"
               class="pr-24px"
             >
               <NInput v-model:value="model.dictLabel" :placeholder="$t('page.system.dict.form.dictLabel.required')" />
             </NFormItemGi>
-            <NFormItemGi :show-feedback="false" span="12" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:12" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
                   <template #icon>
diff --git a/src/views/system/tenant-package/modules/tenant-package-search.vue b/src/views/system/tenant-package/modules/tenant-package-search.vue
index 910aa6e8..c57967c5 100644
--- a/src/views/system/tenant-package/modules/tenant-package-search.vue
+++ b/src/views/system/tenant-package/modules/tenant-package-search.vue
@@ -38,7 +38,7 @@ async function search() {
         <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
           <NGrid responsive="screen" item-responsive>
             <NFormItemGi
-              span="8"
+              span="24 s:12 m:8"
               :label="$t('page.system.tenantPackage.packageName')"
               path="packageName"
               class="pr-24px"
@@ -48,7 +48,12 @@ async function search() {
                 :placeholder="$t('page.system.tenantPackage.form.packageName.required')"
               />
             </NFormItemGi>
-            <NFormItemGi span="8" :label="$t('page.system.tenantPackage.status')" path="status" class="pr-24px">
+            <NFormItemGi
+              span="24 s:12 m:8"
+              :label="$t('page.system.tenantPackage.status')"
+              path="status"
+              class="pr-24px"
+            >
               <NSelect
                 v-model:value="model.status"
                 :placeholder="$t('page.system.tenantPackage.form.status.required')"
@@ -56,7 +61,7 @@ async function search() {
                 clearable
               />
             </NFormItemGi>
-            <NFormItemGi span="8" class="pr-24px">
+            <NFormItemGi span="24 s:24 m:8" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
                   <template #icon>

From b6c7b1b383481ecd56fccd36eba65e1942f0d91d Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Fri, 18 Jul 2025 23:13:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(projects):=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/api/workflow.api.d.ts                 |  2 +-
 src/views/workflow/leave/index.vue                |  3 ++-
 src/views/workflow/leave/modules/leave-search.vue | 10 +++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/typings/api/workflow.api.d.ts b/src/typings/api/workflow.api.d.ts
index 9f809abc..0c4e9c4b 100644
--- a/src/typings/api/workflow.api.d.ts
+++ b/src/typings/api/workflow.api.d.ts
@@ -40,7 +40,7 @@ declare namespace Api {
 
     /** leave search params */
     type LeaveSearchParams = CommonType.RecordNullable<
-      Pick<Api.Workflow.Leave, 'leaveDays'> & Api.Common.CommonSearchParams
+      { startLeaveDays: number; endLeaveDays: number } & Api.Common.CommonSearchParams
     >;
 
     /** leave operate params */
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 0c3bdbe2..ac5cec45 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -43,7 +43,8 @@ const {
     pageSize: 10,
     // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
     // the value can not be undefined, otherwise the property in Form will not be reactive
-    leaveDays: null,
+    startLeaveDays: null,
+    endLeaveDays: null,
     params: {}
   },
   columns: () => [
diff --git a/src/views/workflow/leave/modules/leave-search.vue b/src/views/workflow/leave/modules/leave-search.vue
index 417fb8f2..6184d80f 100644
--- a/src/views/workflow/leave/modules/leave-search.vue
+++ b/src/views/workflow/leave/modules/leave-search.vue
@@ -35,10 +35,14 @@ async function search() {
       <NCollapseItem :title="$t('common.search')" name="user-search">
         <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
           <NGrid responsive="screen" item-responsive>
-            <NFormItemGi span="24 s:12 m:6" label="请假天数" path="leaveDays" class="pr-24px">
-              <NInputNumber v-model:value="model.leaveDays" placeholder="请输入请假天数" />
+            <NFormItemGi span="24 s:12 m:16" label="请假天数" path="startLeaveDays" class="pr-24px">
+              <NSpace align="center" class="w-full">
+                <NInputNumber v-model:value="model.startLeaveDays" placeholder="开始天数" />
+                <span class="mx-2">至</span>
+                <NInputNumber v-model:value="model.endLeaveDays" placeholder="结束天数" />
+              </NSpace>
             </NFormItemGi>
-            <NFormItemGi span="24" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:8" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
                   <template #icon>