Merge pull request #784 from actiontech/fix/issue-3193

LZS911 · web-flow · commit da26f026697e · 2025-12-31T15:20:37.000+08:00
[fix](SqlExecWorkflow): Fix the error of switching pages
diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/RetryExecuteModal/index.tsx b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/RetryExecuteModal/index.tsx
@@ -136,7 +136,7 @@ const RetryExecuteModal = () => {
   };
 
   useEffect(() => {
-    if (pageIndex && pageSize && visible) {
+    if (visible && pageIndex && pageSize) {
       tableChange(
         {
           current: pageIndex,
@@ -150,12 +150,15 @@ const RetryExecuteModal = () => {
         }
       );
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [visible, pageIndex, pageSize]);
 
+  useEffect(() => {
     if (execSqlId && !allSelectedKeys.length && visible) {
       setAllSelectedKeys([execSqlId]);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [pageIndex, pageSize, visible, tableChange, execSqlId]);
+  }, [visible, execSqlId]);
 
   const handleRetryExecute = () => {
     if (!allSelectedKeys.length) {

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ const RetryExecuteModal = () => {`
`136`	`136`	`};`
`137`	`137`
`138`	`138`	`useEffect(() => {`
`139`		`- if (pageIndex && pageSize && visible) {`
	`139`	`+ if (visible && pageIndex && pageSize) {`
`140`	`140`	`tableChange(`
`141`	`141`	`{`
`142`	`142`	`current: pageIndex,`
`@@ -150,12 +150,15 @@ const RetryExecuteModal = () => {`
`150`	`150`	`}`
`151`	`151`	`);`
`152`	`152`	`}`
	`153`	`+ // eslint-disable-next-line react-hooks/exhaustive-deps`
	`154`	`+ }, [visible, pageIndex, pageSize]);`
`153`	`155`
	`156`	`+ useEffect(() => {`
`154`	`157`	`if (execSqlId && !allSelectedKeys.length && visible) {`
`155`	`158`	`setAllSelectedKeys([execSqlId]);`
`156`	`159`	`}`
`157`	`160`	`// eslint-disable-next-line react-hooks/exhaustive-deps`
`158`		`- }, [pageIndex, pageSize, visible, tableChange, execSqlId]);`
	`161`	`+ }, [visible, execSqlId]);`
`159`	`162`
`160`	`163`	`const handleRetryExecute = () => {`
`161`	`164`	`if (!allSelectedKeys.length) {`