From 5bfb638cfc89c97f4ad77fc434cbcdf31a03e630 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Mon, 10 Jun 2024 19:15:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.0.0):=20=E4=BF=AE=E5=A4=8D=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E8=B7=B3=E8=BD=AC=E5=8F=82=E6=95=B0=E8=B5=8B=E5=80=BC?=
 =?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/job/batch/index.vue      | 14 +++++++++++---
 src/views/retry/log/index.vue      | 14 +++++++++++---
 src/views/workflow/batch/index.vue | 14 +++++++++++---
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index ead9755..8026c45 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -20,8 +20,6 @@ const detailData = ref<Api.JobBatch.JobBatch | null>();
 /** 详情页可见状态 */
 const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
 
-const taskBatchStatus = history.state.taskBatchStatus;
-
 const { columnChecks, columns, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetJobBatchList,
   apiParams: {
@@ -29,7 +27,7 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
     size: 10,
     groupName: null,
     jobName: null,
-    taskBatchStatus
+    taskBatchStatus: null
   },
   columns: () => [
     {
@@ -190,6 +188,16 @@ watch(
   },
   { immediate: true }
 );
+
+function initParams() {
+  const taskBatchStatus = history.state.taskBatchStatus;
+  if (taskBatchStatus) {
+    searchParams.taskBatchStatus = taskBatchStatus;
+    getData();
+  }
+}
+
+initParams();
 </script>
 
 <template>
diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue
index 516314d..bc07353 100644
--- a/src/views/retry/log/index.vue
+++ b/src/views/retry/log/index.vue
@@ -18,8 +18,6 @@ const detailData = ref<Api.RetryLog.RetryLog | null>();
 /** 详情页可见状态 */
 const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
 
-const retryStatus = history.state.retryStatus;
-
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchRetryLogPageList,
   apiParams: {
@@ -32,7 +30,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     sceneName: null,
     idempotentId: null,
     bizNo: null,
-    retryStatus
+    retryStatus: null
   },
   columns: () => [
     {
@@ -170,6 +168,16 @@ async function loadRetryInfo(row: Api.RetryLog.RetryLog) {
   const res = await fetchRetryLogById(row.id!);
   detailData.value = (res.data as Api.RetryLog.RetryLog) || null;
 }
+
+function initParams() {
+  const retryStatus = history.state.retryStatus;
+  if (retryStatus) {
+    searchParams.retryStatus = retryStatus;
+    getData();
+  }
+}
+
+initParams();
 </script>
 
 <template>
diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue
index c72e573..1451507 100644
--- a/src/views/workflow/batch/index.vue
+++ b/src/views/workflow/batch/index.vue
@@ -16,8 +16,6 @@ const workflowId =
 
 const appStore = useAppStore();
 
-const taskBatchStatus = history.state.taskBatchStatus;
-
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetWorkflowBatchList,
   apiParams: {
@@ -27,7 +25,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     // the value can not be undefined, otherwise the property in Form will not be reactive
     workflowId,
     groupName: null,
-    taskBatchStatus
+    taskBatchStatus: null
   },
   columns: () => [
     {
@@ -157,6 +155,16 @@ async function handleStop(id: string) {
 function detail(id: string) {
   router.push({ path: '/workflow/form/batch', query: { id } });
 }
+
+function initParams() {
+  const taskBatchStatus = history.state.taskBatchStatus;
+  if (taskBatchStatus) {
+    searchParams.taskBatchStatus = taskBatchStatus;
+    getData();
+  }
+}
+
+initParams();
 </script>
 
 <template>