From 6ed5136d18bc2092059ceb68884a04ccd9e97ee2 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 16 Jun 2024 21:55:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E6=89=B9=E6=AC=A1=E3=80=81=E9=87=8D=E8=AF=95=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E3=80=81=E9=87=8D=E8=AF=95=E6=97=A5=E5=BF=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/api.d.ts                                       | 7 ++++---
 src/views/retry/dead-letter/index.vue                      | 4 +++-
 src/views/retry/dead-letter/modules/dead-letter-search.vue | 3 +++
 src/views/retry/log/index.vue                              | 4 +++-
 src/views/retry/log/modules/retry-log-search.vue           | 3 +++
 src/views/workflow/batch/index.vue                         | 4 +++-
 src/views/workflow/batch/modules/workflow-batch-search.vue | 3 +++
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 9cc03cf..40ea80d 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -703,7 +703,7 @@ declare namespace Api {
         Api.RetryDeadLetter.DeadLetter,
         'id' | 'uniqueId' | 'groupName' | 'sceneName' | 'idempotentId' | 'bizNo' | 'taskType' | 'createDt'
       > &
-        CommonSearchParams
+        CommonSearchParams & { beginDate: number; endDate: number }
     >;
 
     /** DeadLetter list */
@@ -1115,7 +1115,8 @@ declare namespace Api {
 
     /** workflowBatch search params */
     type WorkflowBatchSearchParams = CommonType.RecordNullable<
-      Pick<Api.WorkflowBatch.WorkflowBatch, 'workflowId' | 'groupName' | 'taskBatchStatus'> & CommonSearchParams
+      Pick<Api.WorkflowBatch.WorkflowBatch, 'workflowId' | 'groupName' | 'taskBatchStatus'> &
+        CommonSearchParams & { beginDate: number; endDate: number }
     >;
 
     /** workflowBatch list */
@@ -1165,7 +1166,7 @@ declare namespace Api {
     /** retryLog search params */
     type RetryLogSearchParams = CommonType.RecordNullable<
       Pick<Api.RetryLog.RetryLog, 'uniqueId' | 'groupName' | 'sceneName' | 'idempotentId' | 'bizNo' | 'retryStatus'> &
-        CommonSearchParams
+        CommonSearchParams & { beginDate: number; endDate: number }
     >;
 
     /** retryLog list */
diff --git a/src/views/retry/dead-letter/index.vue b/src/views/retry/dead-letter/index.vue
index 83ed710..c0a80e3 100644
--- a/src/views/retry/dead-letter/index.vue
+++ b/src/views/retry/dead-letter/index.vue
@@ -30,7 +30,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     page: 1,
     size: 10,
     groupName: null,
-    sceneName: null
+    sceneName: null,
+    beginDate: null,
+    endDate: null
     // 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
   },
diff --git a/src/views/retry/dead-letter/modules/dead-letter-search.vue b/src/views/retry/dead-letter/modules/dead-letter-search.vue
index 2bdbb1b..65d3eb4 100644
--- a/src/views/retry/dead-letter/modules/dead-letter-search.vue
+++ b/src/views/retry/dead-letter/modules/dead-letter-search.vue
@@ -33,6 +33,9 @@ function search() {
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
       <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
     </NFormItemGi>
+    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
+      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    </NFormItemGi>
   </SearchForm>
 </template>
 
diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue
index 9aca5d9..b947e29 100644
--- a/src/views/retry/log/index.vue
+++ b/src/views/retry/log/index.vue
@@ -31,7 +31,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     sceneName: null,
     idempotentId: null,
     bizNo: null,
-    retryStatus: null
+    retryStatus: null,
+    beginDate: null,
+    endDate: null
   },
   searchParams: {
     retryStatus
diff --git a/src/views/retry/log/modules/retry-log-search.vue b/src/views/retry/log/modules/retry-log-search.vue
index f779999..c69fd69 100644
--- a/src/views/retry/log/modules/retry-log-search.vue
+++ b/src/views/retry/log/modules/retry-log-search.vue
@@ -52,6 +52,9 @@ function search() {
         clearable
       />
     </NFormItemGi>
+    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
+      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    </NFormItemGi>
   </SearchForm>
 </template>
 
diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue
index 8a4bbfc..c621287 100644
--- a/src/views/workflow/batch/index.vue
+++ b/src/views/workflow/batch/index.vue
@@ -22,7 +22,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     // the value can not be undefined, otherwise the property in Form will not be reactive
     workflowId: null,
     groupName: null,
-    taskBatchStatus: null
+    taskBatchStatus: null,
+    beginDate: null,
+    endDate: null
   },
   searchParams: {
     workflowId,
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 7dfe2f3..1c5f2c1 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -67,6 +67,9 @@ groupNameUpdate('');
     >
       <TaskBatchStatus v-model:value="model.taskBatchStatus" />
     </NFormItemGi>
+    <NFormItemGi span="24 s:24 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="createTime" class="pr-24px">
+      <DatetimeRange v-model:begin-date="model.beginDate" v-model:end-date="model.endDate" />
+    </NFormItemGi>
   </SearchForm>
 </template>